feat(jellyfish-api-core, jellyfish-transaction): added TransferDomain (…

…#2092)

<!--  Thanks for sending a pull request! -->

#### What this PR does / why we need it:
In this pr we have added 
1. TransferDomain which will create an transfer balances transaction
submitted to a connected node.
2. Updated `getTokenBalances` method to include eth address balance 
3. Update `getNewAddress` method to include eth address type option
4. Enable EVM on the node by setGov `'v0/params/feature/evm': 'true'`

#### Which issue(s) does this PR fixes?:
<!--
(Optional) Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #

#### Additional comments?:

---------

Signed-off-by: Harsh R <[email protected]>
Co-authored-by: Pierre Gee <[email protected]>
Co-authored-by: canonbrother <[email protected]>

apps/playground-api/__tests__/modules/PlaygroundModule.test.ts

@@ -182,7 +182,8 @@ it('should have gov set', async () => {
       'v0/token/17/loan_payback_fee_pct/15': '0.01',
       'v0/token/17/fixed_interval_price_id': 'TR50/USD',
       'v0/token/17/loan_minting_enabled': 'true',
-      'v0/token/17/loan_minting_interest': '3'
+      'v0/token/17/loan_minting_interest': '3',
+      'v0/params/feature/evm': 'true'
     })
   })
 

apps/playground-api/src/controllers/WalletController.ts

@@ -24,7 +24,8 @@ export class WalletController {
   async balances (): Promise<WalletBalances> {
     const balance = await this.client.wallet.getBalance()
     const account = await this.client.account.getTokenBalances({}, true, {
-      symbolLookup: false
+      symbolLookup: false,
+      includeEth: false
     })
 
     const tokens = Object.entries(account).map(([id, value]) => {

apps/playground-api/src/setups/setup.gov.ts

@@ -152,5 +152,12 @@ export class SetupGov extends PlaygroundSetup<Record<string, any>> {
       }
     })
     await this.generate(1)
+
+    await this.client.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/evm': 'true'
+      }
+    })
+    await this.generate(1)
   }
 }

apps/whale-api/docker-compose.yml

@@ -40,6 +40,8 @@ services:
       -fortcanninggreatworldheight=14
       -fortcanningepilogueheight=15
       -grandcentralheight=16
+      -grandcentralepilogueheight=17
+      -nextnetworkupgradeheight=18
       -regtest-skip-loan-collateral-validation
       -regtest-minttoken-simulate-mainnet=0
 

docs/node/CATEGORIES/05-wallet.md

@@ -237,6 +237,13 @@ Returns a new DeFi address for receiving payments. If 'label' is specified, it's
 interface wallet {
   getNewAddress (label: string = '', addressType = AddressType.BECH32): Promise<string>
 }
+
+enum AddressType {
+  LEGACY = 'legacy',
+  P2SH_SEGWIT = 'p2sh-segwit',
+  BECH32 = 'bech32',
+  ETH = 'eth',
+}
 ```
 
 ## validateAddress

docs/node/CATEGORIES/08-account.md

@@ -89,7 +89,7 @@ interface account {
   getTokenBalances (
     pagination: AccountPagination = { limit: 100 },
     indexedAmounts = false,
-    options: GetTokenBalancesOptions = { symbolLookup: false}
+    options: GetTokenBalancesOptions = { symbolLookup: false, includeEth: false},
   ): Promise<string[] | AccountAmount>
 }
 
@@ -105,6 +105,7 @@ interface AccountPagination {
 
 interface GetTokenBalancesOptions {
   symbolLookup?: boolean
+  includeEth?: boolean
 }
 ```
 
@@ -152,6 +153,32 @@ interface UTXO {
 }
 ```
 
+## transferDomain
+
+Create a transfer domain transaction submitted to a connected node.
+
+```ts title="client.account.transferDomain()"
+interface account {
+  transferDomain (payload: Array<Record<string, TransferDomainInfo>>): Promise<string>
+}
+
+interface TransferDomainInfo {
+  address: string
+  amount: string
+  domain: TransferDomainType
+}
+
+enum TransferDomainType {
+  NONE = 0,
+  /** type reserved for UTXO */
+  UTXO = 1,
+  /** type for DVM Token To EVM transfer */
+  DVM = 2,
+  /** type for EVM To DVM Token transfer */
+  EVM = 3,
+};
+```
+
 ## accountToUtxos
 
 Create an Account to UTXOS transaction submitted to a connected node.

packages/jellyfish-api-core/__tests__/category/account/getTokenBalances.test.ts

@@ -1,5 +1,6 @@
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { ContainerAdapterClient } from '../../container_adapter_client'
+import { TransferDomainType } from '../../../src/category/account'
 import waitForExpect from 'wait-for-expect'
 import BigNumber from 'bignumber.js'
 
@@ -80,7 +81,7 @@ describe('Account', () => {
 
   it('should getTokenBalances with indexedAmounts true', async () => {
     await waitForExpect(async () => {
-      const tokenBalances = await client.account.getTokenBalances({}, true, { symbolLookup: false })
+      const tokenBalances = await client.account.getTokenBalances({}, true, { symbolLookup: false, includeEth: false })
       expect(typeof tokenBalances === 'object').toStrictEqual(true)
       for (const k in tokenBalances) {
         expect(tokenBalances[k] instanceof BigNumber).toStrictEqual(true)
@@ -90,13 +91,53 @@ describe('Account', () => {
 
   it('should getTokenBalances with symbolLookup', async () => {
     await waitForExpect(async () => {
-      const tokenBalances = await client.account.getTokenBalances({}, false, { symbolLookup: true })
+      const tokenBalances = await client.account.getTokenBalances({}, false, { symbolLookup: true, includeEth: false })
       expect(tokenBalances.length).toBeGreaterThan(0)
     })
 
-    const tokenBalances = await client.account.getTokenBalances({}, false, { symbolLookup: true })
+    const tokenBalances = await client.account.getTokenBalances({}, false, { symbolLookup: true, includeEth: false })
     for (let i = 0; i < tokenBalances.length; i += 1) {
       expect(typeof tokenBalances[i]).toStrictEqual('string')
     }
   })
+
+  it('should getTokenBlaances with including eth', async () => {
+    await client.masternode.setGov({
+      ATTRIBUTES: {
+        'v0/params/feature/evm': 'true'
+      }
+    })
+    await container.generate(1)
+
+    const dvmAddr = await container.call('getnewaddress')
+    const evmAddr = await container.getNewAddress('eth', 'eth')
+
+    await container.call('utxostoaccount', [{ [dvmAddr]: '100@0' }])
+    await container.generate(1)
+
+    await client.account.transferDomain([
+      {
+        src: {
+          address: dvmAddr,
+          amount: '3@DFI',
+          domain: TransferDomainType.DVM
+        },
+        dst: {
+          address: evmAddr,
+          amount: '3@DFI',
+          domain: TransferDomainType.EVM
+        }
+      }
+    ])
+    await container.generate(1)
+
+    await waitForExpect(async () => {
+      const withoutEth = await client.account.getTokenBalances({}, false, { symbolLookup: true, includeEth: false })
+      const wo = withoutEth[0].split('@')[0]
+
+      const withEth = await client.account.getTokenBalances({}, false, { symbolLookup: true, includeEth: true })
+      const w = withEth[0].split('@')[0]
+      expect(new BigNumber(w)).toStrictEqual(new BigNumber(wo).plus(3))
+    })
+  })
 })