Merge pull request #6428 from BitGo/COIN-4742-add-flush-token-tx-builder

fix(sdk-coin-vet): fix issue in fromRawTransaction for vechain

Author: gianchandania

modules/sdk-coin-vet/src/lib/transaction/addressInitializationTransaction.ts

@@ -1,6 +1,11 @@
 import { TransactionType, InvalidTransactionError } from '@bitgo/sdk-core';
-import { getCreateForwarderParamsAndTypes, calculateForwarderV1Address } from '@bitgo/abstract-eth';
-import { BaseCoin as CoinConfig } from '@bitgo/statics';
+import {
+  getCreateForwarderParamsAndTypes,
+  calculateForwarderV1Address,
+  decodeForwarderCreationData,
+  getProxyInitcode,
+} from '@bitgo/abstract-eth';
+import { BaseCoin as CoinConfig, EthereumNetwork } from '@bitgo/statics';
 import * as ethUtil from 'ethereumjs-util';
 import EthereumAbi from 'ethereumjs-abi';
 import { Transaction as VetTransaction, Secp256k1 } from '@vechain/sdk-core';
@@ -62,7 +67,6 @@ export class AddressInitializationTransaction extends Transaction {
   /** @inheritdoc */
   async build(): Promise<void> {
     super.build();
-
     if (this._salt && this._initCode) {
       const saltBuffer = ethUtil.setLengthLeft(ethUtil.toBuffer(this._salt), 32);
 
@@ -134,6 +138,15 @@ export class AddressInitializationTransaction extends Transaction {
       // Set data from clauses
       this.contract = body.clauses[0]?.to || '0x0';
       this.transactionData = body.clauses[0]?.data || '0x0';
+      this.type = TransactionType.AddressInitialization;
+      const { baseAddress, addressCreationSalt, feeAddress } = decodeForwarderCreationData(this.transactionData);
+
+      this.baseAddress = baseAddress as string;
+      this.salt = addressCreationSalt as string;
+      this.feeAddress = feeAddress as string;
+      const forwarderImplementationAddress = (this._coinConfig.network as EthereumNetwork)
+        .forwarderImplementationAddress as string;
+      this.initCode = getProxyInitcode(forwarderImplementationAddress);
 
       // Set sender address
       if (signedTx.origin) {

modules/sdk-coin-vet/src/lib/transaction/flushTokenTransaction.ts

@@ -1,6 +1,7 @@
 import { TransactionType, InvalidTransactionError } from '@bitgo/sdk-core';
 import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import { Transaction as VetTransaction, Secp256k1 } from '@vechain/sdk-core';
+import { decodeFlushTokensData } from '@bitgo/abstract-eth';
 
 import { Transaction } from './transaction';
 import { VetTransactionData } from '../iface';
@@ -84,6 +85,9 @@ export class FlushTokenTransaction extends Transaction {
       // Set data from clauses
       this.contract = body.clauses[0]?.to || '0x0';
       this.transactionData = body.clauses[0]?.data || '0x0';
+      this.type = TransactionType.FlushTokens;
+      const { tokenAddress } = decodeFlushTokensData(this.transactionData, this.contract);
+      this.tokenAddress = tokenAddress;
 
       // Set sender address
       if (signedTx.origin) {

modules/sdk-coin-vet/src/lib/transaction/transaction.ts

@@ -398,37 +398,24 @@ export class Transaction extends BaseTransaction {
   }
 
   loadInputsAndOutputs(): void {
-    switch (this.type) {
-      case TransactionType.AddressInitialization:
-        this._type = TransactionType.AddressInitialization;
-        break;
-      case TransactionType.FlushTokens:
-        this._type = TransactionType.FlushTokens;
-        break;
-      case TransactionType.Send:
-        this._type = TransactionType.Send;
-        const totalAmount = this._recipients.reduce(
-          (accumulator, current) => accumulator.plus(current.amount),
-          new BigNumber('0')
-        );
-        this._inputs = [
-          {
-            address: this.sender,
-            value: totalAmount.toString(),
-            coin: this._coinConfig.name,
-          },
-        ];
-        this._outputs = this._recipients.map((recipient) => {
-          return {
-            address: recipient.address,
-            value: recipient.amount as string,
-            coin: this._coinConfig.name,
-          };
-        });
-        break;
-      default:
-        throw new InvalidTransactionError(`Unsupported transaction type: ${this.type}`);
-    }
+    const totalAmount = this._recipients.reduce(
+      (accumulator, current) => accumulator.plus(current.amount),
+      new BigNumber('0')
+    );
+    this._inputs = [
+      {
+        address: this.sender,
+        value: totalAmount.toString(),
+        coin: this._coinConfig.name,
+      },
+    ];
+    this._outputs = this._recipients.map((recipient) => {
+      return {
+        address: recipient.address,
+        value: recipient.amount as string,
+        coin: this._coinConfig.name,
+      };
+    });
   }
 
   fromRawTransaction(rawTransaction: string): void {

modules/sdk-coin-vet/test/resources/vet.ts

@@ -23,6 +23,8 @@ export const ADDRESS_INITIALIZATION_SIGNABLE_PAYLOAD =
 
 export const FORWARDER_ADDRESS = '0x043fde2fa0ece77c2461a9571f3b1b1c6faca120';
 
+export const FORWARDER_ADDRESS_NEW = '0x604a42898388080d56bc85f815965d1f64beb1a6';
+
 export const FLUSH_TOKEN_TRANSACTION =
   '0xf8542788014ead140e77bbc140f83df83b94043fde2fa0ece77c2461a9571f3b1b1c6faca12080a43ef133670000000000000000000000000000000000000000000000000000456e6572677981808252088082faf8c0';
 
@@ -99,6 +101,12 @@ export const BASE_ADDRESS = '0x55b00b5c807d5696197b48d4affa40bb876df240';
 
 export const FEE_ADDRESS = '0x7c87b9ffc6fd6c167c0e4fa9418720f3d659358e';
 
-export const TOKEN_ADDRESS = '0x0000000000000000000000000000456E65726779';
+export const TOKEN_ADDRESS = '0x0000000000000000000000000000456e65726779';
 
 export const SALT = '0x1';
+
+export const SERIALIZED_SIGNED_ADDRESS_INIT_TX =
+  '0xf8d927880152c906531784bd40f87ef87c9465343e18c376d2fc8c3cf10cd146d63e2e0dc9ef80b86413b2f75c00000000000000000000000055b00b5c807d5696197b48d4affa40bb876df2400000000000000000000000007c87b9ffc6fd6c167c0e4fa9418720f3d659358e00000000000000000000000000000000000000000000000000000000000000048180830249f08082faf8c0b84196577046ecbba640d8f5914a7b4cb99f9ab479359bcda5368cc9afdfb55994a0469af071cdeb4cac92caaf0be7fedf492d2215f83baa00d4abac31cf48eeddd900';
+
+export const SERIALIZED_SIGNED_FLUSH_TOKEN_TX =
+  '0xf89827880152cf455536ebc740f83df83b94604a42898388080d56bc85f815965d1f64beb1a680a43ef133670000000000000000000000000000000000000000000000000000456e657267798180830249f08082faf9c0b841b5225a0d5c63fd4ceee2fefe94759d20e37c29ebcd15fc03eb699d4af5bb210c258583f9e8e26e872751e255c2f0fe9d44d52ce65b6b76040476e285074a4b5901';

modules/sdk-coin-vet/test/transactionBuilder/addressInitializationBuilder.ts

@@ -83,6 +83,20 @@ describe('Address Initialisation Transaction', () => {
       should.equal(toJson.deployedAddress, testData.FORWARDER_ADDRESS);
       should.equal(toJson.value, '0');
     });
+
+    it('should build properly from serialized', async () => {
+      const txBuilder = factory.from(testData.SERIALIZED_SIGNED_ADDRESS_INIT_TX);
+      const signedTx = await txBuilder.build();
+      const signedtxJson = signedTx.toJson();
+      should.equal(signedtxJson.gas, 150000);
+
+      txBuilder.gas(180000);
+      const tx = await txBuilder.build();
+      const txJson = tx.toJson();
+      should.equal(txJson.to, testData.FORWARDER_FACTORY_ADDRESS);
+      should.equal(txJson.gas, 180000);
+      console.log('txJson:', txJson);
+    });
   });
 
   describe('Fail', () => {

modules/sdk-coin-vet/test/transactionBuilder/flushTokenTransactionBuilder.ts

@@ -75,6 +75,20 @@ describe('Flush Token Transaction', () => {
       should.equal(toJson.tokenAddress, testData.TOKEN_ADDRESS);
       should.equal(toJson.value, '0');
     });
+
+    it('should build properly from serialized', async () => {
+      const txBuilder = factory.from(testData.SERIALIZED_SIGNED_FLUSH_TOKEN_TX);
+      const signedTx = await txBuilder.build();
+      const signedtxJson = signedTx.toJson();
+      should.equal(signedtxJson.gas, 150000);
+
+      txBuilder.gas(180000);
+      const tx = await txBuilder.build();
+      const txJson = tx.toJson();
+      should.equal(txJson.to, testData.FORWARDER_ADDRESS_NEW);
+      should.equal(txJson.gas, 180000);
+      console.log('txJson:', txJson);
+    });
   });
 
   describe('Fail', () => {