refactor(abstract-eth): move methods to abstract-eth

WIN-1012 TICKET: WIN-1012
BitGo · Nov 8, 2023 · 0646951 · 0646951
1 parent 7f579c0
commit 0646951
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/modules/abstract-eth/src/abstractEthLikeNewCoins.ts b/modules/abstract-eth/src/abstractEthLikeNewCoins.ts
@@ -106,7 +106,7 @@ export interface TransactionPrebuild extends BaseTransactionPrebuild {
     recipients: Recipient[];
   };
   recipients: TransactionRecipient[];
-  nextContractSequenceId: string;
+  nextContractSequenceId: number;
   gasPrice: number;
   gasLimit: number;
   isBatch: boolean;
@@ -556,12 +556,11 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
    * @returns {Array} operation array
    */
   getOperation(recipient: Recipient, expireTime: number, contractSequenceId: number): (string | Buffer)[][] {
-    // const network = this.getNetwork() as EthLikeNetwork;
+    const network = this.getNetwork() as EthLikeNetwork;
     return [
       ['string', 'address', 'uint256', 'bytes', 'uint256', 'uint256'],
       [
-        // network.nativeCoinOperationHashPrefix,
-        'ETHER',
+        network.nativeCoinOperationHashPrefix,
         new optionalDeps.ethUtil.BN(optionalDeps.ethUtil.stripHexPrefix(recipient.address), 16),
         recipient.amount,
         Buffer.from(optionalDeps.ethUtil.stripHexPrefix(optionalDeps.ethUtil.padToEven(recipient.data || '')), 'hex'),

diff --git a/modules/abstract-eth/src/ethLikeToken.ts b/modules/abstract-eth/src/ethLikeToken.ts
@@ -2,7 +2,7 @@
  * @prettier
  */
 import * as _ from 'lodash';
-import { coins, EthLikeTokenConfig, tokens } from '@bitgo/statics';
+import { coins, EthLikeTokenConfig, tokens, EthereumNetwork as EthLikeNetwork } from '@bitgo/statics';
 
 import { BitGoBase, CoinConstructor, NamedCoinConstructor, Wallet, Util } from '@bitgo/sdk-core';
 import { TransactionBuilder as EthLikeTransactionBuilder } from './lib';
@@ -105,12 +105,11 @@ export class EthLikeToken extends AbstractEthLikeNewCoins {
   }
 
   getOperation(recipient, expireTime, contractSequenceId) {
-    // const network = this.getNetwork() as EthLikeNetwork;
+    const network = this.getNetwork() as EthLikeNetwork;
     return [
       ['string', 'address', 'uint', 'address', 'uint', 'uint'],
       [
-        // network.tokenOperationHashPrefix,
-        'ERC20',
+        network.tokenOperationHashPrefix,
         new optionalDeps.ethUtil.BN(optionalDeps.ethUtil.stripHexPrefix(recipient.address), 16),
         recipient.amount,
         new optionalDeps.ethUtil.BN(optionalDeps.ethUtil.stripHexPrefix(this.tokenContractAddress), 16),
@@ -182,7 +181,7 @@ export class EthLikeToken extends AbstractEthLikeNewCoins {
    * @param params.broadcast if true, we will automatically submit the half-signed tx to BitGo for cosigning and broadcasting
    */
   async recoverToken(params: RecoverTokenOptions): Promise<RecoverTokenTransaction> {
-    // const network = this.getNetwork() as EthLikeNetwork;
+    const network = this.getNetwork() as EthLikeNetwork;
     if (!_.isObject(params)) {
       throw new Error(`recoverToken must be passed a params object. Got ${params} (type ${typeof params})`);
     }
@@ -283,9 +282,8 @@ export class EthLikeToken extends AbstractEthLikeNewCoins {
     // Build sendData for ethereum tx
     const operationTypes = ['string', 'address', 'uint', 'address', 'uint', 'uint'];
     const operationArgs = [
-      // "ERC20" has been added here so that ether operation hashes, signatures cannot be re-used for tokenSending
-      // network.tokenOperationHashPrefix,
-      'ERC20',
+      // Token operation has prefix has been added here so that ether operation hashes, signatures cannot be re-used for tokenSending
+      network.tokenOperationHashPrefix,
       new optionalDeps.ethUtil.BN(optionalDeps.ethUtil.stripHexPrefix(recipient.address), 16),
       recipient.amount,
       new optionalDeps.ethUtil.BN(optionalDeps.ethUtil.stripHexPrefix(params.tokenContractAddress), 16),

diff --git a/modules/sdk-coin-polygon/src/polygonToken.ts b/modules/sdk-coin-polygon/src/polygonToken.ts
@@ -3,7 +3,7 @@
  */
 import { EthLikeToken, CoinNames } from '@bitgo/abstract-eth';
 import { EthLikeTokenConfig, coins } from '@bitgo/statics';
-import { BitGoBase, CoinConstructor, NamedCoinConstructor } from '@bitgo/sdk-core';
+import { BitGoBase, CoinConstructor, MPCAlgorithm, NamedCoinConstructor } from '@bitgo/sdk-core';
 import { TransactionBuilder } from './lib';
 export { EthLikeTokenConfig };
 
@@ -29,6 +29,16 @@ export class PolygonToken extends EthLikeToken {
     return new TransactionBuilder(coins.get(this.getBaseChain()));
   }
 
+  /** @inheritDoc */
+  supportsTss(): boolean {
+    return true;
+  }
+
+  /** @inheritDoc */
+  getMPCAlgorithm(): MPCAlgorithm {
+    return 'ecdsa';
+  }
+
   getFullName(): string {
     return 'Polygon Token';
   }

diff --git a/modules/sdk-coin-polygon/test/unit/polygon.ts b/modules/sdk-coin-polygon/test/unit/polygon.ts
@@ -691,6 +691,10 @@ describe('Polygon', function () {
         isTss: true,
         gasPrice: 20000000000,
         gasLimit: 500000,
+        replayProtectionOptions: {
+          chain: 80001,
+          hardfork: 'london',
+        },
       };
 
       const transaction = (await basecoin.recover(recoveryParams)) as OfflineVaultTxInfo;