refactor: update dependencies and improve transaction type handling in builders

TICKET: WIN-7770

Author: mohd-kashif

modules/sdk-coin-flrp/package.json

@@ -43,8 +43,8 @@
     ]
   },
   "dependencies": {
-    "@bitgo/sdk-core": "^36.21.0",
-    "@bitgo/statics": "^58.14.0",
+    "@bitgo/sdk-core": "^36.22.0",
+    "@bitgo/statics": "^58.15.0",
     "@bitgo/secp256k1": "^1.7.0",
     "@flarenetwork/flarejs": "4.1.1",
     "@noble/curves": "1.8.1",

modules/sdk-coin-flrp/src/lib/ExportInCTxBuilder.ts

@@ -9,14 +9,13 @@ import {
   Int,
   Id,
   TransferableOutput,
-  TypeSymbols,
   Address,
   TransferOutput,
   OutputOwners,
   utils as FlareUtils,
 } from '@flarenetwork/flarejs';
 import utils from './utils';
-import { DecodedUtxoObj, Tx } from './iface';
+import { DecodedUtxoObj, Tx, FlareTransactionType } from './iface';
 
 export class ExportInCTxBuilder extends AtomicInCTransactionBuilder {
   private _amount: bigint;
@@ -91,9 +90,6 @@ export class ExportInCTxBuilder extends AtomicInCTransactionBuilder {
     const output = outputs[0];
 
     // TODO validate assetId
-    // if (Buffer.from(output.assetId.toBytes()).toString('hex') !== assetIdStr) {
-    //   throw new Error('AssetID are not equals');
-    // }
 
     // The inputs is not an utxo.
     // It's expected to have only one input from C-Chain address.
@@ -121,11 +117,11 @@ export class ExportInCTxBuilder extends AtomicInCTransactionBuilder {
     return this;
   }
 
-  static verifyTxType(txnType: TypeSymbols): boolean {
-    return txnType === TypeSymbols.EvmExportTx;
+  static verifyTxType(txnType: string): boolean {
+    return txnType === FlareTransactionType.EvmExportTx;
   }
 
-  verifyTxType(txnType: TypeSymbols): boolean {
+  verifyTxType(txnType: string): boolean {
     return ExportInCTxBuilder.verifyTxType(txnType);
   }
 

modules/sdk-coin-flrp/src/lib/ExportInPTxBuilder.ts

@@ -8,14 +8,13 @@ import {
   Int,
   Id,
   TransferableOutput,
-  TypeSymbols,
   Address,
   utils as FlareUtils,
   TransferOutput,
   OutputOwners,
 } from '@flarenetwork/flarejs';
 import utils from './utils';
-import { DecodedUtxoObj, SECP256K1_Transfer_Output } from './iface';
+import { DecodedUtxoObj, SECP256K1_Transfer_Output, FlareTransactionType } from './iface';
 
 export class ExportInPTxBuilder extends AtomicTransactionBuilder {
   private _amount: bigint;
@@ -42,7 +41,7 @@ export class ExportInPTxBuilder extends AtomicTransactionBuilder {
 
   initBuilder(tx: UnsignedTx): this {
     const baseTx = tx.getTx() as evmSerial.ExportTx;
-    if (!this.verifyTxType(baseTx)) {
+    if (!this.verifyTxType(baseTx._type)) {
       throw new NotSupported('Transaction cannot be parsed or has an unsupported transaction type');
     }
 
@@ -81,12 +80,12 @@ export class ExportInPTxBuilder extends AtomicTransactionBuilder {
     return this;
   }
 
-  static verifyTxType(baseTx: evmSerial.ExportTx): boolean {
-    return baseTx._type === TypeSymbols.PvmExportTx;
+  static verifyTxType(txnType: string): boolean {
+    return txnType === FlareTransactionType.PvmExportTx;
   }
 
-  verifyTxType(baseTx: evmSerial.ExportTx): boolean {
-    return ExportInPTxBuilder.verifyTxType(baseTx);
+  verifyTxType(txnType: string): boolean {
+    return ExportInPTxBuilder.verifyTxType(txnType);
   }
 
   /**

modules/sdk-coin-flrp/src/lib/ImportInCTxBuilder.ts

@@ -15,7 +15,7 @@ import {
   avmSerial,
 } from '@flarenetwork/flarejs';
 import utils from './utils';
-import { DecodedUtxoObj, SECP256K1_Transfer_Output } from './iface';
+import { DecodedUtxoObj, FlareTransactionType, SECP256K1_Transfer_Output } from './iface';
 
 export class ImportInCTxBuilder extends AtomicInCTransactionBuilder {
   constructor(_coinConfig: Readonly<CoinConfig>) {
@@ -38,7 +38,7 @@ export class ImportInCTxBuilder extends AtomicInCTransactionBuilder {
 
   initBuilder(tx: UnsignedTx): this {
     const baseTx = tx.getTx() as evmSerial.ImportTx;
-    if (!this.verifyTxType(baseTx)) {
+    if (!this.verifyTxType(baseTx._type)) {
       throw new NotSupported('Transaction cannot be parsed or has an unsupported transaction type');
     }
 
@@ -78,12 +78,12 @@ export class ImportInCTxBuilder extends AtomicInCTransactionBuilder {
     return this;
   }
 
-  static verifyTxType(baseTx: evmSerial.ImportTx): boolean {
-    return baseTx._type === TypeSymbols.BaseTx;
+  static verifyTxType(txnType: string): boolean {
+    return txnType === FlareTransactionType.PvmImportTx;
   }
 
-  verifyTxType(baseTx: evmSerial.ImportTx): boolean {
-    return ImportInCTxBuilder.verifyTxType(baseTx);
+  verifyTxType(txnType: string): boolean {
+    return ImportInCTxBuilder.verifyTxType(txnType);
   }
 
   /**

modules/sdk-coin-flrp/src/lib/ImportInPTxBuilder.ts

@@ -7,13 +7,12 @@ import {
   Int,
   Id,
   TransferableInput,
-  TypeSymbols,
   utils as FlareUtils,
   Address,
   BigIntPr,
 } from '@flarenetwork/flarejs';
 import utils from './utils';
-import { DecodedUtxoObj, SECP256K1_Transfer_Output } from './iface';
+import { DecodedUtxoObj, FlareTransactionType, SECP256K1_Transfer_Output } from './iface';
 
 export class ImportInPTxBuilder extends AtomicTransactionBuilder {
   constructor(_coinConfig: Readonly<CoinConfig>) {
@@ -32,7 +31,7 @@ export class ImportInPTxBuilder extends AtomicTransactionBuilder {
 
   initBuilder(tx: UnsignedTx): this {
     const baseTx = tx.getTx() as evmSerial.ImportTx;
-    if (!this.verifyTxType(baseTx)) {
+    if (!this.verifyTxType(baseTx._type)) {
       throw new NotSupported('Transaction cannot be parsed or has an unsupported transaction type');
     }
 
@@ -68,12 +67,12 @@ export class ImportInPTxBuilder extends AtomicTransactionBuilder {
     return this;
   }
 
-  static verifyTxType(baseTx: evmSerial.ImportTx): boolean {
-    return baseTx._type === TypeSymbols.PvmImportTx;
+  static verifyTxType(txnType: string): boolean {
+    return txnType === FlareTransactionType.PvmImportTx;
   }
 
-  verifyTxType(baseTx: evmSerial.ImportTx): boolean {
-    return ImportInPTxBuilder.verifyTxType(baseTx);
+  verifyTxType(txnType: string): boolean {
+    return ImportInPTxBuilder.verifyTxType(txnType);
   }
 
   /**

modules/sdk-coin-flrp/src/lib/iface.ts

@@ -1,6 +1,16 @@
 import { TransactionExplanation as BaseTransactionExplanation, Entry, TransactionType } from '@bitgo/sdk-core';
 import { pvmSerial, UnsignedTx, TransferableOutput, evmSerial } from '@flarenetwork/flarejs';
 
+/**
+ * Enum for Flare transaction types
+ */
+export enum FlareTransactionType {
+  EvmExportTx = 'evm.ExportTx',
+  EvmImportTx = 'evm.ImportTx',
+  PvmExportTx = 'pvm.ExportTx',
+  PvmImportTx = 'pvm.ImportTx',
+}
+
 export interface FlrpEntry extends Entry {
   id: string;
 }

modules/sdk-coin-flrp/src/lib/keyPair.ts

@@ -11,7 +11,6 @@ import {
 import { bip32, ECPair } from '@bitgo/secp256k1';
 import { randomBytes } from 'crypto';
 import utils from './utils';
-import { secp256k1 } from '@flarenetwork/flarejs';
 import { Buffer as SafeBuffer } from 'safe-buffer';
 import createHash from 'create-hash';
 
@@ -131,7 +130,8 @@ export class KeyPair extends Secp256k1ExtendedKeyPair {
     try {
       // Use the safe buffer method for address derivation
       const publicKey = Buffer.from(this.keyPair.publicKey);
-      return Buffer.from(secp256k1.publicKeyBytesToAddress(publicKey));
+      const sha256 = createHash('sha256').update(publicKey).digest();
+      return Buffer.from(createHash('ripemd160').update(sha256).digest());
     } catch (error) {
       return this.getAddressSafeBuffer();
     }

modules/sdk-coin-flrp/src/lib/utils.ts

@@ -11,7 +11,7 @@ import {
 import { FlareNetwork } from '@bitgo/statics';
 import { Buffer } from 'buffer';
 import { createHash } from 'crypto';
-import { secp256k1 } from '@noble/curves/secp256k1';
+import { ecc } from '@bitgo/secp256k1';
 import { ADDRESS_SEPARATOR, Output, DeprecatedTx } from './iface';
 import bs58 from 'bs58';
 import { bech32 } from 'bech32';
@@ -90,7 +90,7 @@ export class Utils implements BaseUtils {
     }
 
     try {
-      secp256k1.ProjectivePoint.fromHex(pubBuf.toString('hex'));
+      ecc.isPoint(pubBuf);
       return true;
     } catch (e) {
       return false;
@@ -121,8 +121,8 @@ export class Utils implements BaseUtils {
    */
   createSignature(network: FlareNetwork, message: Buffer, prv: Buffer): Buffer {
     const messageHash = this.sha256(message);
-    const signature = secp256k1.sign(messageHash, prv);
-    return Buffer.from(signature.toCompactRawBytes());
+    const signature = ecc.sign(messageHash, prv);
+    return Buffer.from(signature);
   }
 
   /**
@@ -131,7 +131,7 @@ export class Utils implements BaseUtils {
   verifySignature(network: FlareNetwork, message: Buffer, signature: Buffer, publicKey: Buffer): boolean {
     try {
       const messageHash = this.sha256(message);
-      return secp256k1.verify(signature, messageHash, publicKey);
+      return ecc.verify(signature, messageHash, publicKey);
     } catch (e) {
       return false;
     }