Merge remote-tracking branch 'origin/HSM-850'

Author: islamaminBitGo

modules/abstract-eth/src/lib/transaction.ts

@@ -34,14 +34,21 @@ export class Transaction extends BaseTransaction {
    * @param coinConfig The coin configuration object
    * @param common network commons
    * @param serializedTx The serialized tx string with which to initialize the transaction
+   * @param isFirstSigner whether the transaction is being signed by the first signer
    * @returns a new transaction object
    */
   public static fromSerialized(
     coinConfig: Readonly<CoinConfig>,
     common: EthereumCommon,
-    serializedTx: string
+    serializedTx: string,
+    isFirstSigner?: boolean
   ): Transaction {
-    return new Transaction(coinConfig, common, EthTransactionData.fromSerialized(serializedTx, common).toJson());
+    return new Transaction(
+      coinConfig,
+      common,
+      EthTransactionData.fromSerialized(serializedTx, common).toJson(),
+      isFirstSigner
+    );
   }
 
   /**
@@ -50,19 +57,21 @@ export class Transaction extends BaseTransaction {
    * @param {Readonly<CoinConfig>} coinConfig
    * @param common the network commons
    * @param {TxData} txData The object transaction data or encoded transaction data
+   * @param {boolean} isFirstSigner whether the transaction is being signed by the first signer
    */
-  constructor(coinConfig: Readonly<CoinConfig>, common: EthereumCommon, txData?: TxData) {
+  constructor(coinConfig: Readonly<CoinConfig>, common: EthereumCommon, txData?: TxData, isFirstSigner?: boolean) {
     super(coinConfig);
     this._common = common;
     if (txData) {
-      this.setTransactionData(txData);
+      this.setTransactionData(txData, isFirstSigner);
     }
   }
 
   /**
    * Set the transaction data
    *
    * @param {TxData} txData The transaction data to set
+   * @param {boolean} isFirstSigner Whether the transaction is being signed by the first signer
    */
   setTransactionData(txData: TxData, isFirstSigner?: boolean): void {
     this._transactionData = EthTransactionData.fromJson(txData, this._common);

modules/abstract-eth/src/lib/transactionBuilder.ts

@@ -157,7 +157,7 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   protected fromImplementation(rawTransaction: string, isFirstSigner?: boolean): Transaction {
     let tx: Transaction;
     if (/^0x?[0-9a-f]{1,}$/.test(rawTransaction.toLowerCase())) {
-      tx = Transaction.fromSerialized(this._coinConfig, this._common, rawTransaction);
+      tx = Transaction.fromSerialized(this._coinConfig, this._common, rawTransaction, isFirstSigner);
       this.loadBuilderInput(tx.toJson(), isFirstSigner);
     } else {
       const txData = JSON.parse(rawTransaction);
@@ -618,7 +618,8 @@ export abstract class TransactionBuilder extends BaseTransactionBuilder {
   /**
    * Gets the transfer funds builder if exist, or creates a new one for this transaction and returns it
    *
-   * @param [data] transfer data to initialize the transfer builder with, empty if none given
+   * @param {string} data transfer data to initialize the transfer builder with, empty if none given
+   * @param {boolean} isFirstSigner whether the transaction is being signed by the first signer
    * @returns {TransferBuilder | ERC721TransferBuilder | ERC1155TransferBuilder} the transfer builder
    */
   abstract transfer(

modules/abstract-eth/src/lib/utils.ts

@@ -292,6 +292,7 @@ export function decodeWalletCreationData(data: string): WalletInitializationData
  * Decode the given ABI-encoded transfer data and return parsed fields
  *
  * @param data The data to decode
+ * @param isFirstSigner whether transaction is being built for a first signer
  * @returns parsed transfer data
  */
 export function decodeTransferData(data: string, isFirstSigner?: boolean): TransferData {

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

@@ -26,7 +26,8 @@ export class TransactionBuilder extends EthLikeTransactionBuilder {
   /**
    * Gets the transfer funds builder if exist, or creates a new one for this transaction and returns it
    *
-   * @param [data] transfer data to initialize the transfer builder with, empty if none given
+   * @param {string} data transfer data to initialize the transfer builder with, empty if none given
+   * @param {boolean} isFirstSigner whether the transaction is being signed by the first signer
    * @returns {TransferBuilder | ERC721TransferBuilder | ERC1155TransferBuilder} the transfer builder
    */
   transfer(data?: string, isFirstSigner?: boolean): TransferBuilder | ERC721TransferBuilder | ERC1155TransferBuilder {

modules/sdk-core/src/account-lib/baseCoin/baseTransactionBuilder.ts

@@ -24,6 +24,7 @@ export abstract class BaseTransactionBuilder {
    * extending this class. Some examples are hex, base64, or JSON.
    *
    * @param rawTransaction A raw transaction to be parsed
+   * @param isFirstSigner Whether the transaction is being signed by the first signer
    */
   from(rawTransaction: any, isFirstSigner?: boolean): void {
     this.validateRawTransaction(rawTransaction);