Add accountToAccount RPC

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

@@ -2,7 +2,8 @@ import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { ContainerAdapterClient } from '../container_adapter_client'
 import waitForExpect from 'wait-for-expect'
 import BigNumber from 'bignumber.js'
-import { UtxosToAccountPayload, AccountHistoryCountOptions, TxType } from '../../src/category/account'
+import { RpcApiError } from '../../src'
+import { BalanceTransferPayload, UTXO, AccountHistoryCountOptions, TxType } from '../../src/category/account'
 
 describe('masternode', () => {
   const container = new MasterNodeRegTestContainer()
@@ -485,7 +486,7 @@ describe('masternode', () => {
 
   describe('utxosToAccount', () => {
     it('should utxosToAccount', async () => {
-      const payload: UtxosToAccountPayload = {}
+      const payload: BalanceTransferPayload = {}
       // NOTE(jingyi2811): Only support sending utxos to DFI account.
       payload[await container.getNewAddress()] = '5@DFI'
       payload[await container.getNewAddress()] = '5@DFI'
@@ -496,14 +497,22 @@ describe('masternode', () => {
       expect(data.length).toStrictEqual(64)
     })
 
+    it('should not utxosToAccount for DFI coin if does not own the recipient address', async () => {
+      // NOTE(jingyi2811): Only support sending utxos to DFI account.
+      const promise = client.account.utxosToAccount({ '2Mywjs9zEU4NtLknXQJZgozaxMvPn2Bb3qz': '5@DFI' })
+
+      await expect(promise).rejects.toThrow(RpcApiError)
+      await expect(promise).rejects.toThrow('The address (2Mywjs9zEU4NtLknXQJZgozaxMvPn2Bb3qz) is not your own address')
+    })
+
     it('should utxosToAccount with utxos', async () => {
-      const payload: UtxosToAccountPayload = {}
+      const payload: BalanceTransferPayload = {}
       // NOTE(jingyi2811): Only support sending utxos to DFI account.
       payload[await container.getNewAddress()] = '5@DFI'
       payload[await container.getNewAddress()] = '5@DFI'
 
       const utxos = await container.call('listunspent')
-      const inputs = utxos.map((utxo: { txid: string, vout: number }) => {
+      const inputs: UTXO[] = utxos.map((utxo: UTXO) => {
         return {
           txid: utxo.txid,
           vout: utxo.vout

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

@@ -0,0 +1,105 @@
+import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
+import { ContainerAdapterClient } from '../../container_adapter_client'
+import { RpcApiError } from '../../../src'
+import { BalanceTransferPayload, UTXO } from '../../../src/category/account'
+
+describe('masternode', () => {
+  const container = new MasterNodeRegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+    await container.waitForWalletCoinbaseMaturity()
+    await setup()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  let from: string
+
+  async function setup (): Promise<void> {
+    from = await container.call('getnewaddress')
+    await createToken(from, 'DBTC', 200)
+
+    const to = await accountToAccount('DBTC', 5, from)
+    await accountToAccount('DBTC', 18, from, to)
+
+    await createToken(from, 'DETH', 200)
+    await accountToAccount('DETH', 46, from)
+  }
+
+  async function createToken (address: string, symbol: string, amount: number): Promise<void> {
+    const metadata = {
+      symbol,
+      name: symbol,
+      isDAT: true,
+      mintable: true,
+      tradeable: true,
+      collateralAddress: address
+    }
+    await container.waitForWalletBalanceGTE(101)
+    await container.call('createtoken', [metadata])
+    await container.generate(1)
+
+    await container.call('utxostoaccount', [{ [address]: '100@0' }])
+    await container.generate(1)
+
+    await container.call('minttokens', [`${amount.toString()}@${symbol}`])
+    await container.generate(1)
+  }
+
+  async function accountToAccount (symbol: string, amount: number, from: string, _to = ''): Promise<string> {
+    const to = _to !== '' ? _to : await container.call('getnewaddress')
+
+    await container.call('accounttoaccount', [from, { [to]: `${amount.toString()}@${symbol}` }])
+    await container.generate(1)
+
+    return to
+  }
+
+  describe('accountToAccount', () => {
+    it('should accountToAccount', async () => {
+      const payload: BalanceTransferPayload = {}
+      payload[await container.getNewAddress()] = '5@DFI'
+      payload[await container.getNewAddress()] = '5@DBTC'
+      payload[await container.getNewAddress()] = '5@DETH'
+
+      const data = await client.account.accountToAccount(from, payload)
+
+      expect(typeof data).toStrictEqual('string')
+      expect(data.length).toStrictEqual(64)
+    })
+
+    it('should not accountToAccount for DFI coin if does not own the recipient address', async () => {
+      const promise = client.account.accountToAccount(from, { '2Mywjs9zEU4NtLknXQJZgozaxMvPn2Bb3qz': '5@DFI' })
+
+      await expect(promise).rejects.toThrow(RpcApiError)
+      await expect(promise).rejects.toThrow('The address (2Mywjs9zEU4NtLknXQJZgozaxMvPn2Bb3qz) is not your own address')
+    })
+
+    it('should accountToAccount with utxos', async () => {
+      const { txid } = await container.fundAddress(from, 10)
+
+      const payload: BalanceTransferPayload = {}
+      payload[await container.getNewAddress()] = '5@DFI'
+      payload[await container.getNewAddress()] = '5@DBTC'
+      payload[await container.getNewAddress()] = '5@DETH'
+
+      const utxos = await container.call('listunspent')
+      const inputs: UTXO[] = utxos.filter((utxo: UTXO) => utxo.txid === txid).map((utxo: UTXO) => {
+        return {
+          txid: utxo.txid,
+          vout: utxo.vout
+        }
+      })
+
+      const data = await client.account.accountToAccount(from, payload, { utxos: inputs })
+
+      expect(typeof data).toStrictEqual('string')
+      expect(data.length).toStrictEqual(64)
+    })
+  })
+})

packages/jellyfish-api-core/src/category/account.ts

@@ -30,6 +30,9 @@ export enum TxType {
   SET_GOV_VARIABLE = 'G',
   AUTO_AUTH_PREP = 'A'
 }
+
+type AccountRegexType = `${string}@${string}`
+
 /**
  * Account RPCs for DeFi Blockchain
  */
@@ -244,20 +247,37 @@ export class Account {
   }
 
   /**
-   * Creates and submits to a connect node; a transfer transaction from the wallet UTXOs to a specified account.
+   * Create an UTXOs to Account transaction submitted to a connected node.
    * Optionally, specific UTXOs to spend to create that transaction.
    *
-   * @param {UtxosToAccountPayload} payload
+   * @param {BalanceTransferPayload} payload
    * @param {string} payload[address]
-   * @param {UtxosToAccountUTXO[]} [utxos=[]]
+   * @param {UTXO[]} [utxos = []]
    * @param {string} [utxos.txid]
    * @param {number} [utxos.vout]
    * @return {Promise<string>}
    */
-  async utxosToAccount (payload: UtxosToAccountPayload, utxos: UtxosToAccountUTXO[] = []): Promise<string> {
+  async utxosToAccount (payload: BalanceTransferPayload, utxos: UTXO[] = []): Promise<string> {
     return await this.client.call('utxostoaccount', [payload, utxos], 'number')
   }
 
+  /**
+   * Create an Account to Account transaction submitted to a connected node.
+   * Optionally, specific UTXOs to spend to create that transaction.
+   *
+   * @param {string} from
+   * @param {BalanceTransferPayload} payload
+   * @param {string} payload[address]
+   * @param {AccountToAccountOptions} [options]
+   * @param {UTXO[]} [options.utxos = []]
+   * @param {string} [options.utxos.txid]
+   * @param {number} [options.utxos.vout]
+   * @return {Promise<string>}
+   */
+  async accountToAccount (from: string, payload: BalanceTransferPayload, options: AccountToAccountOptions = { utxos: [] }): Promise<string> {
+    return await this.client.call('accounttoaccount', [from, payload, options.utxos], 'number')
+  }
+
   /**
    * Returns count of account history
    *
@@ -332,11 +352,15 @@ export interface AccountHistoryOptions {
   limit?: number
 }
 
-export interface UtxosToAccountPayload {
-  [key: string]: string
+export interface BalanceTransferPayload {
+  [key: string]: AccountRegexType
+}
+
+export interface AccountToAccountOptions {
+  utxos?: UTXO[]
 }
 
-export interface UtxosToAccountUTXO {
+export interface UTXO {
   txid: string
   vout: number
 }

website/docs/jellyfish/api/account.md

@@ -148,19 +148,47 @@ interface AccountHistoryOptions {
 
 ## utxosToAccount
 
-Creates and submits to a connect node; a transfer transaction from the wallet UTXOs to a specified account. 
+Create an UTXOs to Account transaction submitted to a connected node.
 Optionally, specific UTXOs to spend to create that transaction.
 
 ```ts title="client.account.utxosToAccount()"
 interface account {
-  utxosToAccount (payload: UtxosToAccountPayload, utxos: UtxosToAccountUTXO[] = []): Promise<string>
+  utxosToAccount (payload: BalanceTransferPayload, utxos: UTXO[] = []): Promise<string>
 }
 
-interface UtxosToAccountPayload {
-  [key: string]: string;
+type AccountRegexType = `${string}@${string}`
+
+interface BalanceTransferPayload {
+  [key: string]: AccountRegexType
+}
+
+interface UTXO {
+  txid: string
+  vout: number
+}
+```
+
+## accountToAccount
+
+Create an Account to Account transaction submitted to a connected node.
+Optionally, specific UTXOs to spend to create that transaction.
+
+```ts title="client.account.accountToAccount()"
+interface account {
+  accountToAccount (from: string, payload: BalanceTransferPayload, options: AccountToAccountOptions = { utxos: [] }): Promise<string>
+}
+
+type AccountRegexType = `${string}@${string}`
+
+interface BalanceTransferPayload {
+  [key: string]: AccountRegexType
+}
+
+interface AccountToAccountOptions {
+  utxos?: UTXO[]
 }
 
-interface UtxosToAccountUTXO {
+interface UTXO {
   txid: string
   vout: number
 }