@fuel-ts/account 0.77.0 → 0.79.0

package/dist/index.js

@@ -1839,13 +1839,27 @@ var BaseTransactionRequest = class {
     this.outputs.push(output);
     return this.outputs.length - 1;
   }
+  /**
+   * @hidden
+   *
+   * Pushes a witness to the list and returns the index
+   *
+   * @param signature - The signature to add to the witness.
+   * @returns The index of the created witness.
+   */
+  addWitness(signature) {
+    this.witnesses.push(signature);
+    return this.witnesses.length - 1;
+  }
   /**
    * @hidden
    *
    * Creates an empty witness without any side effects and returns the index
+   *
+   * @returns The index of the created witness.
    */
-  createWitness() {
-    this.witnesses.push((0, import_utils9.concat)([import_configs6.ZeroBytes32, import_configs6.ZeroBytes32]));
+  addEmptyWitness() {
+    this.addWitness((0, import_utils9.concat)([import_configs6.ZeroBytes32, import_configs6.ZeroBytes32]));
     return this.witnesses.length - 1;
   }
   /**
@@ -1874,6 +1888,21 @@ var BaseTransactionRequest = class {
     }
     this.witnesses[index] = witness;
   }
+  /**
+   * Helper function to add an external signature to the transaction.
+   *
+   * @param account - The account/s to sign to the transaction.
+   * @returns The transaction with the signature witness added.
+   */
+  async addAccountWitnesses(account) {
+    const accounts = Array.isArray(account) ? account : [account];
+    await Promise.all(
+      accounts.map(async (acc) => {
+        this.addWitness(await acc.signTransaction(this));
+      })
+    );
+    return this;
+  }
   /**
    * Gets the coin inputs for a transaction.
    *
@@ -1939,7 +1968,7 @@ var BaseTransactionRequest = class {
     } else {
       witnessIndex = this.getCoinInputWitnessIndexByOwner(owner);
       if (typeof witnessIndex !== "number") {
-        witnessIndex = this.createWitness();
+        witnessIndex = this.addEmptyWitness();
       }
     }
     const input = {
@@ -1973,7 +2002,7 @@ var BaseTransactionRequest = class {
     } else {
       witnessIndex = this.getCoinInputWitnessIndexByOwner(recipient);
       if (typeof witnessIndex !== "number") {
-        witnessIndex = this.createWitness();
+        witnessIndex = this.addEmptyWitness();
       }
     }
     const input = {
@@ -2463,6 +2492,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
   script;
   /** Script input data (parameters) */
   scriptData;
+  abis;
   /**
    * Constructor for `ScriptTransactionRequest`.
    *
@@ -2473,6 +2503,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
     this.gasLimit = (0, import_math9.bn)(gasLimit);
     this.script = (0, import_utils15.arrayify)(script ?? returnZeroScript.bytes);
     this.scriptData = (0, import_utils15.arrayify)(scriptData ?? returnZeroScript.encodeScriptData());
+    this.abis = rest.abis;
   }
   /**
    * Converts the transaction request to a `TransactionScript`.
@@ -2640,7 +2671,7 @@ var transactionRequestify = (obj) => {
 // src/providers/transaction-response/transaction-response.ts
 var import_errors12 = require("@fuel-ts/errors");
 var import_math13 = require("@fuel-ts/math");
-var import_transactions15 = require("@fuel-ts/transactions");
+var import_transactions16 = require("@fuel-ts/transactions");
 var import_utils21 = require("@fuel-ts/utils");
 
 // src/providers/transaction-summary/assemble-transaction-summary.ts
@@ -3385,6 +3416,21 @@ function assembleTransactionSummary(params) {
   return transactionSummary;
 }
 
+// src/providers/transaction-response/getDecodedLogs.ts
+var import_abi_coder3 = require("@fuel-ts/abi-coder");
+var import_transactions15 = require("@fuel-ts/transactions");
+function getDecodedLogs(receipts, mainAbi, externalAbis = {}) {
+  return receipts.reduce((logs, receipt) => {
+    if (receipt.type === import_transactions15.ReceiptType.LogData || receipt.type === import_transactions15.ReceiptType.Log) {
+      const interfaceToUse = new import_abi_coder3.Interface(externalAbis[receipt.id] || mainAbi);
+      const data = receipt.type === import_transactions15.ReceiptType.Log ? new import_abi_coder3.BigNumberCoder("u64").encode(receipt.val0) : receipt.data;
+      const [decodedLog] = interfaceToUse.decodeLog(data, receipt.val1.toNumber());
+      logs.push(decodedLog);
+    }
+    return logs;
+  }, []);
+}
+
 // src/providers/transaction-response/transaction-response.ts
 var TransactionResponse = class {
   /** Transaction ID */
@@ -3395,15 +3441,17 @@ var TransactionResponse = class {
   gasUsed = (0, import_math13.bn)(0);
   /** The graphql Transaction with receipts object. */
   gqlTransaction;
+  abis;
   /**
    * Constructor for `TransactionResponse`.
    *
    * @param id - The transaction ID.
    * @param provider - The provider.
    */
-  constructor(id, provider) {
+  constructor(id, provider, abis) {
     this.id = id;
     this.provider = provider;
+    this.abis = abis;
   }
   /**
    * Async constructor for `TransactionResponse`. This method can be used to create
@@ -3413,8 +3461,8 @@ var TransactionResponse = class {
    * @param id - The transaction ID.
    * @param provider - The provider.
    */
-  static async create(id, provider) {
-    const response = new TransactionResponse(id, provider);
+  static async create(id, provider, abis) {
+    const response = new TransactionResponse(id, provider, abis);
     await response.fetch();
     return response;
   }
@@ -3448,7 +3496,7 @@ var TransactionResponse = class {
    * @returns The decoded transaction.
    */
   decodeTransaction(transactionWithReceipts) {
-    return new import_transactions15.TransactionCoder().decode(
+    return new import_transactions16.TransactionCoder().decode(
       (0, import_utils21.arrayify)(transactionWithReceipts.rawPayload),
       0
     )?.[0];
@@ -3518,6 +3566,14 @@ var TransactionResponse = class {
       gqlTransaction: this.gqlTransaction,
       ...transactionSummary
     };
+    if (this.abis) {
+      const logs = getDecodedLogs(
+        transactionSummary.receipts,
+        this.abis.main,
+        this.abis.otherContractsAbis
+      );
+      transactionResult.logs = logs;
+    }
     return transactionResult;
   }
   /**
@@ -3537,23 +3593,6 @@ var TransactionResponse = class {
   }
 };
 
-// src/providers/transaction-response/getDecodedLogs.ts
-var import_abi_coder3 = require("@fuel-ts/abi-coder");
-var import_transactions16 = require("@fuel-ts/transactions");
-function getDecodedLogs(receipts, abiInterface) {
-  return receipts.reduce((logs, r) => {
-    if (r.type === import_transactions16.ReceiptType.LogData) {
-      logs.push(abiInterface.decodeLog(r.data, r.val1.toNumber(), r.id)[0]);
-    }
-    if (r.type === import_transactions16.ReceiptType.Log) {
-      logs.push(
-        abiInterface.decodeLog(new import_abi_coder3.BigNumberCoder("u64").encode(r.val0), r.val1.toNumber(), r.id)[0]
-      );
-    }
-    return logs;
-  }, []);
-}
-
 // src/providers/utils/auto-retry-fetch.ts
 function getWaitDelay(options, retryAttemptNum) {
   const duration = options.baseDelay ?? 150;
@@ -3888,6 +3927,10 @@ var _Provider = class {
       await this.estimateTxDependencies(transactionRequest);
     }
     const encodedTransaction = (0, import_utils22.hexlify)(transactionRequest.toTransactionBytes());
+    let abis;
+    if (transactionRequest.type === import_transactions17.TransactionType.Script) {
+      abis = transactionRequest.abis;
+    }
     if (awaitExecution) {
       const subscription = this.operations.submitAndAwait({ encodedTransaction });
       for await (const { submitAndAwait } of subscription) {
@@ -3902,14 +3945,14 @@ var _Provider = class {
         }
       }
       const transactionId2 = transactionRequest.getTransactionId(this.getChainId());
-      const response = new TransactionResponse(transactionId2, this);
+      const response = new TransactionResponse(transactionId2, this, abis);
       await response.fetch();
       return response;
     }
     const {
       submit: { id: transactionId }
     } = await this.operations.submit({ encodedTransaction });
-    return new TransactionResponse(transactionId, this);
+    return new TransactionResponse(transactionId, this, abis);
   }
   /**
    * Executes a transaction without actually submitting it to the chain.
@@ -4060,7 +4103,8 @@ var _Provider = class {
   async getTransactionCost(transactionRequestLike, forwardingQuantities = [], {
     estimateTxDependencies = true,
     estimatePredicates = true,
-    resourcesOwner
+    resourcesOwner,
+    signatureCallback
   } = {}) {
     const txRequestClone = (0, import_ramda3.clone)(transactionRequestify(transactionRequestLike));
     const chainInfo = this.getChain();
@@ -4079,6 +4123,9 @@ var _Provider = class {
       }
       await this.estimatePredicates(txRequestClone);
     }
+    if (signatureCallback && isScriptTransaction) {
+      await signatureCallback(txRequestClone);
+    }
     const minGas = txRequestClone.calculateMinGas(chainInfo);
     const maxGas = txRequestClone.calculateMaxGas(chainInfo, minGas);
     let receipts = [];
@@ -5126,6 +5173,21 @@ var Account = class extends import_interfaces.AbstractAccount {
     }
     return this._connector.signMessage(this.address.toString(), message);
   }
+  /**
+   * Signs a transaction with the wallet's private key.
+   *
+   * @param transactionRequestLike - The transaction request to sign.
+   * @returns A promise that resolves to the signature of the transaction.
+   */
+  async signTransaction(transactionRequestLike) {
+    if (!this._connector) {
+      throw new import_errors15.FuelError(
+        import_errors15.ErrorCode.MISSING_CONNECTOR,
+        "A connector is required to sign transactions."
+      );
+    }
+    return this._connector.signTransaction(this.address.toString(), transactionRequestLike);
+  }
   /**
    * Sends a transaction to the network.
    *
@@ -5436,7 +5498,7 @@ var BaseWalletUnlocked = class extends Account {
    */
   async signTransaction(transactionRequestLike) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
-    const chainId = this.provider.getChain().consensusParameters.chainId.toNumber();
+    const chainId = this.provider.getChainId();
     const hashedTransaction = transactionRequest.getTransactionId(chainId);
     const signature = await this.signer().sign(hashedTransaction);
     return (0, import_utils30.hexlify)(signature);
@@ -8977,6 +9039,18 @@ var FuelConnector = class extends import_events2.EventEmitter {
   async signMessage(_address, _message) {
     throw new Error("Method not implemented.");
   }
+  /**
+   * Should start the sign transaction process and return
+   * the signed transaction.
+   *
+   * @param address - The address to sign the transaction
+   * @param transaction - The transaction to sign
+   *
+   * @returns Transaction signature
+   */
+  async signTransaction(_address, _transaction) {
+    throw new Error("Method not implemented.");
+  }
   /**
    * Should start the send transaction process and return
    * the transaction id submitted to the network.