Merge be50db7 into ce3814e

DeFiCh · Aug 30, 2023 · c0a9914 · c0a9914
2 parents ce3814e + be50db7
commit c0a9914
Show file tree

Hide file tree

Showing 7 changed files with 850 additions and 341 deletions.
diff --git a/apps/playground-api/__tests__/modules/PlaygroundModule.test.ts b/apps/playground-api/__tests__/modules/PlaygroundModule.test.ts
@@ -201,6 +201,9 @@ it('should have gov set', async () => {
       'v0/token/18/loan_minting_interest': '3',
       'v0/params/feature/icx': 'true',
       'v0/params/feature/evm': 'true',
+      'v0/transferdomain/dvm-evm/dat-enabled': 'true',
+      'v0/transferdomain/evm-dvm/dat-enabled': 'true',
+      'v0/transferdomain/evm-dvm/enabled': 'true',
       'v0/params/feature/transferdomain': 'true',
       'v0/params/foundation/members': [
         'bcrt1qyrfrpadwgw7p5eh3e9h3jmu4kwlz4prx73cqny',

diff --git a/apps/playground-api/src/setups/setup.gov.ts b/apps/playground-api/src/setups/setup.gov.ts
@@ -158,6 +158,9 @@ export class SetupGov extends PlaygroundSetup<Record<string, any>> {
         'v0/params/feature/evm': 'true',
         'v0/params/feature/transferdomain': 'true',
         'v0/transferdomain/dvm-evm/enabled': 'true',
+        'v0/transferdomain/evm-dvm/enabled': 'true',
+        'v0/transferdomain/dvm-evm/dat-enabled': 'true',
+        'v0/transferdomain/evm-dvm/dat-enabled': 'true',
         'v0/transferdomain/dvm-evm/src-formats': ['p2pkh', 'bech32'],
         'v0/transferdomain/dvm-evm/dest-formats': ['erc55'],
         'v0/transferdomain/evm-dvm/src-formats': ['erc55'],

diff --git a/apps/whale-api/docker-compose.yml b/apps/whale-api/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: "3.7"
 
 services:
   defi-blockchain:

diff --git a/packages/jellyfish-api-core/__tests__/category/account/getTokenBalances.test.ts b/packages/jellyfish-api-core/__tests__/category/account/getTokenBalances.test.ts
@@ -108,6 +108,9 @@ describe('Account', () => {
         'v0/params/feature/evm': 'true',
         'v0/params/feature/transferdomain': 'true',
         'v0/transferdomain/dvm-evm/enabled': 'true',
+        'v0/transferdomain/evm-dvm/enabled': 'true',
+        'v0/transferdomain/dvm-evm/dat-enabled': 'true',
+        'v0/transferdomain/evm-dvm/dat-enabled': 'true',
         'v0/transferdomain/dvm-evm/src-formats': ['p2pkh', 'bech32'],
         'v0/transferdomain/dvm-evm/dest-formats': ['erc55'],
         'v0/transferdomain/evm-dvm/src-formats': ['erc55'],
@@ -117,7 +120,7 @@ describe('Account', () => {
     })
     await container.generate(2)
 
-    const dvmAddr = await container.call('getnewaddress', ['', 'bech32'])
+    const dvmAddr = await container.getNewAddress('dvm', 'legacy')
     const evmAddr = await container.getNewAddress('erc55', 'erc55')
 
     await container.call('utxostoaccount', [{ [dvmAddr]: '100@0' }])