Merge pull request #5726 from BitGo/COIN-3350-celo-mainnet-hardfork

feat(sdk-coin-celo): prepare celo for mainnet hardfork

Author: mullapudipruthvik

modules/sdk-coin-celo/src/lib/index.ts

@@ -1,5 +1,5 @@
 export { KeyPair, Interface } from '@bitgo/sdk-coin-eth';
-export { Transaction } from './transaction';
+export { Transaction } from '@bitgo/abstract-eth';
 export { TransactionBuilder } from './transactionBuilder';
 export { TestnetTransactionBuilder } from './testnetTransactionBuilder';
 export { TransferBuilder } from './transferBuilder';

modules/sdk-coin-celo/src/lib/resources.ts

@@ -22,5 +22,5 @@ export const mainnetCommon = EthereumCommon.custom(
     networkId: (coins.get('celo').network as EthereumNetwork).chainId,
     chainId: (coins.get('celo').network as EthereumNetwork).chainId,
   },
-  { hardfork: 'petersburg' }
+  { hardfork: 'london' }
 );

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

@@ -1,9 +1,8 @@
 import { BaseCoin as CoinConfig } from '@bitgo/statics';
 import EthereumAbi from 'ethereumjs-abi';
-import { addHexPrefix } from 'ethereumjs-util';
+import { Transaction } from '@bitgo/abstract-eth';
 import { TransactionBuilder as EthTransactionBuilder, TxData, walletSimpleConstructor } from '@bitgo/sdk-coin-eth';
 import { BuildTransactionError, TransactionType, StakingOperationTypes } from '@bitgo/sdk-core';
-import { Transaction } from './transaction';
 import { StakingBuilder } from './stakingBuilder';
 import { StakingCall } from './stakingCall';
 import { getCommon, walletSimpleByteCode } from './utils';
@@ -223,15 +222,6 @@ export class TransactionBuilder extends EthTransactionBuilder {
     return data;
   }
 
-  /**
-   * Get the final v value. Final v is described in EIP-155.
-   *
-   * @protected for internal use when the enableFinalVField flag is true.
-   */
-  protected getFinalV(): string {
-    return addHexPrefix(this._common.chainIdBN().toString(16));
-  }
-
   /**
    * The value to send along with this transaction. 0 by default
    *

modules/sdk-coin-celo/src/lib/transactionBuilder.ts

@@ -100,6 +100,8 @@ export const SEND_TX_BROADCAST =
 
 export const SEND_TOKEN_TX_BROADCAST =
   '0xf901ad02843b9aca0083b8a1a0948f977e912ef500548a0c3be6ddde9899f1199b8180b901440dcd7a6c00000000000000000000000019645032c7f1533395d44a629462e751084d3e4c000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000874069fa1eb16d44d622f2e0ca25eea172369bc1000000000000000000000000000000000000000000000000000000005ec67e28000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000041d56f9d0cba9794067046f832fab81f16e85273c966ece8e95253ea4c3023e20e015271a39af757af37c064addaf1362dc84c6d317ec33126763dd5c1e48251711c0000000000000000000000000000000000000000000000000000000000000083015e0aa03715b46cf6b38403daa2667e57b71d9956674f87c64ca04fe770cb79e747057ea05eef964d0a0cb9b86bfd066132d401da65939a8ba2d4b74f46cd368434999a8c';
+export const PROD_SEND_TOKEN_BROADCAST =
+  '0x02f901af82a4ec0281968373dca383b8a1a0948f977e912ef500548a0c3be6ddde9899f1199b8180b901440dcd7a6c00000000000000000000000019645032c7f1533395d44a629462e751084d3e4c000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000765de816845861e75a25fca122bb6898b8b1282a000000000000000000000000000000000000000000000000000000005ec67e28000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000041f62b186c6d3577e66ed3aa343242c1ec58ba09a8fc5fa93aa0a2258f04e1b410111c4814a3028638ead635ac1993eda7dde56f850fb2e4501237111c9a9bb5ce1b00000000000000000000000000000000000000000000000000000000000000c080a0a76d12beaebb9e084d392ba6104254c2480a38466dba61de76dc3d7f464967bda010b230c6a4f0dcab9cf2d4743aef578f0491cea9ac8bf9da91cc6908198c0367';
 
 export const CONTRACT_TOKEN_CUSD_ADDRESS = '0xa561131a1C8aC25925FB848bCa45A74aF61e5A38';
 

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

@@ -167,7 +167,7 @@ describe('Send transaction', function () {
       should.equal(txJson.from, undefined);
     });
 
-    it('should build txn with eip1559', async function () {
+    it('should build txn with eip1559 for tcelo', async function () {
       const txBuilder = getBuilder('tcelo') as TransactionBuilder;
       txBuilder.fee({
         fee: '1000000000',
@@ -197,6 +197,77 @@ describe('Send transaction', function () {
       should.equal(txJson.maxPriorityFeePerGas, '150');
     });
 
+    it('should build txn with eip1559 for celo', async function () {
+      const txBuilder = getBuilder('celo') as TransactionBuilder;
+      txBuilder.fee({
+        fee: '1000000000',
+        gasLimit: '12100000',
+        eip1559: {
+          maxFeePerGas: '7593123',
+          maxPriorityFeePerGas: '150',
+        },
+      });
+      txBuilder.counter(2);
+      txBuilder.type(TransactionType.Send);
+      txBuilder.contract('0x8f977e912ef500548a0c3be6ddde9899f1199b81');
+      txBuilder
+        .transfer()
+        .coin('celo')
+        .amount('1000000000')
+        .to('0x19645032c7f1533395d44a629462e751084d3e4c')
+        .expirationTime(1590066728)
+        .contractSequenceId(5)
+        .key(key);
+      txBuilder.sign({ key: testData.PRIVATE_KEY });
+      const tx = await txBuilder.build();
+      const txJson = tx.toJson();
+      should.equal(txJson.gasLimit, '12100000');
+      should.equal(txJson._type, 'EIP1559');
+      should.equal(txJson.maxFeePerGas, '7593123');
+      should.equal(txJson.maxPriorityFeePerGas, '150');
+    });
+
+    it('should build txn with eip1559 for celo token', async function () {
+      const txBuilder = getBuilder('cusd') as TransactionBuilder;
+      txBuilder.fee({
+        fee: '1000000000',
+        gasLimit: '12100000',
+        eip1559: {
+          maxFeePerGas: '7593123',
+          maxPriorityFeePerGas: '150',
+        },
+      });
+      txBuilder.counter(2);
+      txBuilder.type(TransactionType.Send);
+      txBuilder.contract('0x8f977e912ef500548a0c3be6ddde9899f1199b81');
+      txBuilder
+        .transfer()
+        .coin('cusd')
+        .amount('1000000000')
+        .to('0x19645032c7f1533395d44a629462e751084d3e4c')
+        .expirationTime(1590066728)
+        .contractSequenceId(5)
+        .key(key);
+      txBuilder.sign({ key: testData.PRIVATE_KEY });
+      const tx = await txBuilder.build();
+      const txJson = tx.toJson();
+      should.equal(txJson.gasLimit, '12100000');
+      should.equal(txJson._type, 'EIP1559');
+      should.equal(txJson.maxFeePerGas, '7593123');
+      should.equal(txJson.maxPriorityFeePerGas, '150');
+    });
+
+    it('should decode token txn', async function () {
+      const txBuilder = getBuilder('cusd') as TransactionBuilder;
+      txBuilder.from(testData.PROD_SEND_TOKEN_BROADCAST);
+      const tx = await txBuilder.build();
+      const txJson = tx.toJson();
+      should.equal(txJson.gasLimit, '12100000');
+      should.equal(txJson._type, 'EIP1559');
+      should.equal(txJson.maxFeePerGas, '7593123');
+      should.equal(txJson.maxPriorityFeePerGas, '150');
+    });
+
     it('should build legacy txn for celo', async function () {
       const txBuilder = getBuilder('celo') as TransactionBuilder;
       txBuilder.fee({
@@ -218,7 +289,7 @@ describe('Send transaction', function () {
       const txJson = tx.toJson();
       should.equal(txJson.gasLimit, '12100000');
       should.equal(txJson._type, 'Legacy');
-      should.equal(txJson.v, '0xa4ec');
+      should.equal(txJson.v, '0x0149fb');
     });
 
     it('a send token transaction without final v', async () => {