Merge 06f3552 into 30c8cba

DeFiCh · May 13, 2022 · 485c951 · 485c951
2 parents 30c8cba + 06f3552
commit 485c951
Show file tree

Hide file tree

Showing 40 changed files with 494 additions and 604 deletions.
diff --git a/apps/whale/src/module.api/address.controller.e2e.ts b/apps/whale/src/module.api/address.controller.e2e.ts
@@ -163,8 +163,6 @@ describe('listAccountHistory', () => {
       const accountHistory = history.data[i]
       expect(typeof accountHistory.owner).toStrictEqual('string')
       expect(typeof accountHistory.block.height).toStrictEqual('number')
-      expect(typeof accountHistory.block.hash).toStrictEqual('string')
-      expect(typeof accountHistory.block.time).toStrictEqual('number')
       expect(typeof accountHistory.type).toStrictEqual('string')
       expect(typeof accountHistory.txn).toStrictEqual('number')
       expect(typeof accountHistory.txid).toStrictEqual('string')

diff --git a/apps/whale/src/module.api/address.controller.ts b/apps/whale/src/module.api/address.controller.ts
@@ -204,9 +204,7 @@ function mapAddressHistory (list: AccountHistory[]): AddressHistory[] {
       type: each.type,
       amounts: each.amounts,
       block: {
-        height: each.blockHeight,
-        hash: each.blockHash,
-        time: each.blockTime
+        height: each.blockHeight
       }
     }
   })

diff --git a/docs/node/CATEGORIES/08-account.md b/docs/node/CATEGORIES/08-account.md
@@ -219,8 +219,8 @@ enum DfTxType {
 interface AccountHistory {
   owner: string
   blockHeight: number
-  blockHash: string
-  blockTime: number
+  blockHash?: string
+  blockTime?: number
   type: string
   txn: number
   txid: string
@@ -254,8 +254,8 @@ interface account {
 interface AccountHistory {
   owner: string
   blockHeight: number
-  blockHash: string
-  blockTime: number
+  blockHash?: string
+  blockTime?: number
   type: string
   txn: number
   txid: string

diff --git a/docs/node/CATEGORIES/11-masternode.md b/docs/node/CATEGORIES/11-masternode.md
@@ -79,16 +79,19 @@ interface MasternodePagination {
 interface MasternodeInfo {
   ownerAuthAddress: string
   operatorAuthAddress: string
+  rewardAddress: string
   creationHeight: number
   resignHeight: number
   resignTx: string
-  banHeight: number
-  banTx: string
+  collateralTx: string
   state: MasternodeState
   mintedBlocks: number
   ownerIsMine: boolean
   operatorIsMine: boolean
   localMasternode: boolean
+  targetMultiplier?: number
+  targetMultipliers?: number[]
+  timelock?: number
 }
 
 interface MasternodeResult<T> {
@@ -118,16 +121,19 @@ enum MasternodeState {
 interface MasternodeInfo {
   ownerAuthAddress: string
   operatorAuthAddress: string
+  rewardAddress: string
   creationHeight: number
   resignHeight: number
   resignTx: string
-  banHeight: number
-  banTx: string
+  collateralTx: string
   state: MasternodeState
   mintedBlocks: number
   ownerIsMine: boolean
   operatorIsMine: boolean
   localMasternode: boolean
+  targetMultiplier?: number
+  targetMultipliers?: number[]
+  timelock?: number
 }
 
 interface MasternodeResult<T> {

diff --git a/docs/node/CATEGORIES/16-loan.md b/docs/node/CATEGORIES/16-loan.md
@@ -153,12 +153,7 @@ List collateral tokens.
 
 ```ts title="client.loan.listCollateralTokens()"
 interface loan {
-  listCollateralTokens (collateralToken: ListCollateralTokens = {}): Promise<CollateralTokenDetail[]>
-}
-
-interface ListCollateralTokens {
-  height?: number
-  all?: boolean
+  listCollateralTokens (): Promise<CollateralTokenDetail[]>
 }
 
 interface CollateralTokenDetail {

diff --git a/packages/jellyfish-api-core/__tests__/category/account/getAccountHistory.test.ts b/packages/jellyfish-api-core/__tests__/category/account/getAccountHistory.test.ts
@@ -43,8 +43,6 @@ describe('Account', () => {
     expect(history.txn).toStrictEqual(referenceHistory.txn)
     expect(history.txid).toStrictEqual(referenceHistory.txid)
     expect(history.type).toStrictEqual(referenceHistory.type)
-    expect(history.blockHash).toStrictEqual(referenceHistory.blockHash)
-    expect(history.blockTime).toStrictEqual(referenceHistory.blockTime)
     expect(history.amounts).toStrictEqual(referenceHistory.amounts)
     expect(addresses.includes(history.owner)).toStrictEqual(true)
   })
@@ -61,8 +59,6 @@ describe('Account', () => {
     expect(history.txn).toStrictEqual(referenceHistory.txn)
     expect(history.txid).toStrictEqual(referenceHistory.txid)
     expect(history.type).toStrictEqual(referenceHistory.type)
-    expect(history.blockHash).toStrictEqual(referenceHistory.blockHash)
-    expect(history.blockTime).toStrictEqual(referenceHistory.blockTime)
     expect(history.amounts).toStrictEqual(referenceHistory.amounts)
   })