DeFiCh · thedoublejay · Jun 28, 2023 · Jun 21, 2023 · Jun 21, 2023 · Jun 21, 2023
diff --git a/apps/playground-api/__tests__/modules/PlaygroundModule.test.ts b/apps/playground-api/__tests__/modules/PlaygroundModule.test.ts
@@ -183,7 +183,8 @@ it('should have gov set', async () => {
       'v0/token/17/fixed_interval_price_id': 'TR50/USD',
       'v0/token/17/loan_minting_enabled': 'true',
       'v0/token/17/loan_minting_interest': '3',
-      'v0/params/feature/evm': 'true'
+      'v0/params/feature/evm': 'true',
+      'v0/params/feature/icx': 'true'
     })
   })
 

diff --git a/apps/playground-api/src/setups/setup.gov.ts b/apps/playground-api/src/setups/setup.gov.ts
@@ -159,5 +159,12 @@ export class SetupGov extends PlaygroundSetup<Record<string, any>> {
       }
     })
     await this.generate(1)
+
+    await this.client.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
+    await this.generate(1)
   }
 }
diff --git a/apps/whale-api/docker-compose.yml b/apps/whale-api/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   defi-blockchain:
-    image: defi/defichain:master-b6fc51097
+    image: defi/defichain:master-c14a2ba13
     ports:
       - "19554:19554"
     command: >

diff --git a/packages/jellyfish-api-core/__tests__/category/account/getTokenBalances.test.ts b/packages/jellyfish-api-core/__tests__/category/account/getTokenBalances.test.ts
@@ -101,7 +101,7 @@ describe('Account', () => {
     }
   })
 
-  it('should getTokenBlaances with including eth', async () => {
+  it('should getTokenBalances with including eth', async () => {
     await client.masternode.setGov({
       ATTRIBUTES: {
         'v0/params/feature/evm': 'true'

diff --git a/packages/jellyfish-api-core/__tests__/category/account/transferDomain.test.ts b/packages/jellyfish-api-core/__tests__/category/account/transferDomain.test.ts
@@ -118,7 +118,7 @@ describe('TransferDomain', () => {
         }
       ])
       await expect(promise).rejects.toThrow(RpcApiError)
-      await expect(promise).rejects.toThrow('Src address must not be an ETH address in case of "DVM" domain')
+      await expect(promise).rejects.toThrow('Src address must be a legacy or Bech32 address in case of "DVM" domain')
     })
 
     it('(evm -> dvm) should fail if source address and source domain are not match', async () => {
@@ -175,7 +175,7 @@ describe('TransferDomain', () => {
         }
       ])
       await expect(promise).rejects.toThrow(RpcApiError)
-      await expect(promise).rejects.toThrow('Dst address must not be an ETH address in case of "DVM" domain')
+      await expect(promise).rejects.toThrow('Dst address must be a legacy or Bech32 address in case of "DVM" domain')
     })
 
     it('(dvm -> evm) should fail if address is invalid', async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/claimDFCHTLC.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/claimDFCHTLC.test.ts
@@ -29,6 +29,7 @@ describe('ICXOrderBook.claimDFCHTLC', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/closeOffer.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/closeOffer.test.ts
@@ -30,6 +30,7 @@ describe('ICXOrderBook.closeOffer', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/closeOrder.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/closeOrder.test.ts
@@ -39,6 +39,7 @@ describe('ICXOrderBook.closeOrder', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/complexTests.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/complexTests.test.ts
@@ -46,6 +46,7 @@ describe('ICX Complex test scenarios', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/createOrder.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/createOrder.test.ts
@@ -25,6 +25,7 @@ describe('ICXOrderBook.createOrder', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/getOrder.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/getOrder.test.ts
@@ -39,6 +39,7 @@ describe('ICXOrderBook.getOrder', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/icx_setup.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/icx_setup.ts
@@ -67,6 +67,15 @@ export class ICXSetup {
     await createToken(this.container, symbolBTC, createTokenOptions)
   }
 
+  async setupICXFlag (): Promise<void> {
+    await this.client.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
+    await this.container.generate(1)
+  }
+
   async initializeTokensIds (): Promise<void> {
     let tokenInfo = await this.container.call('gettoken', [symbolBTC])
     idBTC = Object.keys(tokenInfo)[0]

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/listHTLCs.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/listHTLCs.test.ts
@@ -37,6 +37,7 @@ describe('ICXOrderBook.listHTLCs', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/listOrders.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/listOrders.test.ts
@@ -39,6 +39,7 @@ describe('ICXOrderBook.listOrders', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/makeOffer.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/makeOffer.test.ts
@@ -39,6 +39,7 @@ describe('ICXOrderBook.makeOffer', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/submitDFCHTLC.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/submitDFCHTLC.test.ts
@@ -37,6 +37,7 @@ describe('ICXOrderBook.submitDFCHTLC', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/icxorderbook/submitExtHTLC.test.ts b/packages/jellyfish-api-core/__tests__/category/icxorderbook/submitExtHTLC.test.ts
@@ -37,6 +37,7 @@ describe('ICXOrderBook.submitExtHTLC', () => {
     await icxSetup.createBTCDFIPool()
     await icxSetup.addLiquidityToBTCDFIPool(1, 100)
     await icxSetup.setTakerFee(0.001)
+    await icxSetup.setupICXFlag()
   })
 
   afterAll(async () => {

diff --git a/packages/jellyfish-api-core/__tests__/category/masternode/updatemasternode.test.ts b/packages/jellyfish-api-core/__tests__/category/masternode/updatemasternode.test.ts
@@ -289,7 +289,7 @@ describe('Update Masternode', () => {
     const ownerAddress = await client.wallet.getNewAddress()
     const masternodeId = await client.masternode.createMasternode(ownerAddress)
 
-    await container.generate(1)
+    await container.generate(20)
 
     {
       const ownerAddressNew = await client.wallet.getNewAddress('', AddressType.P2SH_SEGWIT)
@@ -315,7 +315,7 @@ describe('Update Masternode', () => {
         rewardAddress
       })
       await expect(promise).rejects.toThrow(RpcApiError)
-      await expect(promise).rejects.toThrow(`rewardAddress (${rewardAddress}) does not refer to a P2PKH or P2WPKH address`)
+      await expect(promise).rejects.toThrow('Reward address must be P2PKH or P2WPKH type\', code: -32600, method: updatemasternode')
     }
   })
 
@@ -332,7 +332,7 @@ describe('Update Masternode', () => {
       })
 
       await expect(promise).rejects.toThrow(RpcApiError)
-      await expect(promise).rejects.toThrow(`RpcApiError: 'ownerAddress (${invalidAddress}) does not refer to a P2PKH or P2WPKH address', code: -8, method: updatemasternode`)
+      await expect(promise).rejects.toThrow(`ownerAddress (${invalidAddress}) does not refer to a P2PKH or P2WPKH address`)
     }
 
     {
@@ -352,7 +352,7 @@ describe('Update Masternode', () => {
       })
 
       await expect(promise).rejects.toThrow(RpcApiError)
-      await expect(promise).rejects.toThrow(`RpcApiError: 'rewardAddress (${invalidAddress}) does not refer to a P2PKH or P2WPKH address', code: -8, method: updatemasternode`)
+      await expect(promise).rejects.toThrow(`rewardAddress (${invalidAddress}) does not refer to a P2SH, P2PKH or P2WPKH address`)
     }
   })
 

diff --git a/packages/jellyfish-testing/__tests__/icxorderbook.test.ts b/packages/jellyfish-testing/__tests__/icxorderbook.test.ts
@@ -11,7 +11,11 @@ describe('ICX', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
-
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
     await testing.icxorderbook.createAccounts()
     await testing.rpc.account.utxosToAccount({ [testing.icxorderbook.accountDFI]: `${500}@${testing.icxorderbook.symbolDFI}` })
     await testing.rpc.account.utxosToAccount({ [testing.icxorderbook.accountBTC]: `${10}@${testing.icxorderbook.symbolDFI}` }) // for fee

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_claim_dfc_htlc.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_claim_dfc_htlc.test.ts
@@ -18,6 +18,11 @@ describe('claim DFC HTLC', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_close_offer.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_close_offer.test.ts
@@ -16,6 +16,11 @@ describe('close ICX offer', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_close_order.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_close_order.test.ts
@@ -16,6 +16,11 @@ describe('close ICX order', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_create_order.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_create_order.test.ts
@@ -16,6 +16,11 @@ describe('create ICX order', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to testing.container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_make_offer.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_icx_make_offer.test.ts
@@ -16,6 +16,11 @@ describe('make ICX offer', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to testing.container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_submit_dfc_htlc.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_submit_dfc_htlc.test.ts
@@ -18,6 +18,11 @@ describe('submit DFC HTLC', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_submit_ext_htlc.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_submit_ext_htlc.test.ts
@@ -18,6 +18,11 @@ describe('submit EXT HTLC', () => {
   beforeAll(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
+    await testing.rpc.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/icx': 'true'
+      }
+    })
 
     providers = await getProviders(testing.container)
     providers.setEllipticPair(WIF.asEllipticPair(GenesisKeys[0].owner.privKey)) // set it to container default

diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/varint_gt_128.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/varint_gt_128.test.ts
@@ -110,6 +110,11 @@ beforeEach(async () => {
 
   // Prep 1000 DFI Token for testing
   await testing.token.dfi({ amount: 1000 })
+  await testing.rpc.masternode.setGov({
+    ATTRIBUTES: {
+      'v0/params/feature/icx': 'true'
+    }
+  })
   await testing.generate(1)
 })
 

diff --git a/packages/testcontainers/src/containers/DeFiDContainer.ts b/packages/testcontainers/src/containers/DeFiDContainer.ts
@@ -36,7 +36,7 @@ export abstract class DeFiDContainer extends DockerContainer {
     if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
       return process.env.DEFICHAIN_DOCKER_IMAGE
     }
-    return 'defi/defichain:master-b6fc51097' // renovate.json regexManagers
+    return 'defi/defichain:master-c14a2ba13' // renovate.json regexManagers
   }
 
   public static readonly DefaultStartOptions = {

diff --git a/packages/testcontainers/src/containers/NativeChainContainer.ts b/packages/testcontainers/src/containers/NativeChainContainer.ts
@@ -29,7 +29,7 @@ export class NativeChainContainer extends GenericContainer {
     if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
       return process.env.DEFICHAIN_DOCKER_IMAGE
     }
-    return 'defi/defichain:master-b6fc51097' // renovate.json regexManagers
+    return 'defi/defichain:master-c14a2ba13' // renovate.json regexManagers
   }
 
   public static readonly PREFIX = 'defichain-testcontainers-'