In address router, add to pendings

src/api/dto/addressDTO.ts

@@ -1,20 +1,24 @@
 import { hycontoString } from "@glosfer/hyconjs-util"
 import { Account } from "../../consensus/database/account"
+import { TxDTO } from "./txDTO"
 export class AddressDTO {
-    public static addressToDTO(address: string, account: Account) {
+    public static addressToDTO(address: string, account: Account, txdtos?: TxDTO[]) {
         const addressDTO = new AddressDTO()
         addressDTO.address = address
         if (account !== undefined) {
             addressDTO.balance = hycontoString(account.balance)
             addressDTO.nonce = account.nonce
         }
+        if (txdtos !== undefined) { addressDTO.pendings = txdtos }
         return addressDTO
     }
 
     public address: string
     public balance: string
     public nonce: number
 
+    public pendings?: TxDTO[]
+
     constructor() {
         this.balance = "0"
         this.nonce = 0

src/api/model/addressModel.ts

@@ -1,22 +1,32 @@
 import { getLogger } from "log4js"
 import { Address } from "../../common/address"
+import { TxPool } from "../../common/txPool"
 import { Consensus } from "../../consensus/consensus"
 import { Account } from "../../consensus/database/account"
 import { AddressDTO } from "../dto/addressDTO"
+import { TxDTO } from "../dto/txDTO"
 import { RESPONSE_CODE, Responser } from "../router/responser"
 const logger = getLogger("AddressModel")
 
 export class AddressModel {
     private consensus: Consensus
-    constructor(consensus: Consensus) {
+    private txPool: TxPool
+    constructor(consensus: Consensus, txPool: TxPool) {
         this.consensus = consensus
+        this.txPool = txPool
     }
 
     public async getAddress(targetAddress: string) {
         try {
             if (targetAddress === undefined) { return Responser.missingParameter() }
-            const account: Account = await this.consensus.getAccount(new Address(targetAddress))
-            return AddressDTO.addressToDTO(targetAddress, account)
+            const address: Address = new Address(targetAddress)
+            const account: Account = await this.consensus.getAccount(address)
+            const { pendings, pendingAmount } = this.txPool.getAllPendingAddress(address)
+            const txdtos: TxDTO[] = []
+            for (const stx of pendings) {
+                txdtos.push(TxDTO.txToDTO(stx))
+            }
+            return AddressDTO.addressToDTO(targetAddress, account, txdtos)
         } catch (e) {
             logger.warn(`Failed to getAddress : ${e} / stack : ${e.stack}`)
             return Responser.makeJsonError(RESPONSE_CODE.BAD_REQUEST, e.toString())

src/api/server.tsx

@@ -2,7 +2,7 @@ import * as bodyParser from "body-parser"
 import * as timeout from "connect-timeout"
 import * as express from "express"
 import { getLogger } from "log4js"
-import opn = require("opn")
+const opn = require("opn")
 import { matchRoutes } from "react-router-config"
 import { userOptions } from "../main"
 import { RestManager } from "../rest/restManager"
@@ -172,7 +172,7 @@ export class HttpServer {
         this.blockModel = new BlockModel(this.hyconServer.consensus)
         this.transactionModel = new TransactionModel(this.hyconServer.consensus, this.hyconServer)
         this.walletModel = new WalletModel(this.hyconServer.consensus)
-        this.addressModel = new AddressModel(this.hyconServer.consensus)
+        this.addressModel = new AddressModel(this.hyconServer.consensus, this.hyconServer.txQueue)
         this.networkModel = new NetworkModel(this.hyconServer.consensus, this.hyconServer.network.getPeerDatabase())
     }
 }

test/database.spec.ts

@@ -1,5 +1,5 @@
 import { randomBytes } from "crypto"
-import { NotFoundError } from "level-errors"
+const NotFoundError = require("level-errors")
 import * as levelup from "levelup"
 import Long = require("long")
 import { AnyBlock, Block } from "../src/common/block"