Merge branch 'ps/chore/added-on-before-send-hook' of github.com:FuelL…

…abs/fuels-ts into ps/chore/added-on-before-send-hook
FuelLabs · Dec 16, 2024 · de83c9f · de83c9f
2 parents 7269d45 + 2dbae8e
commit de83c9f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/pr-release.yaml b/.github/workflows/pr-release.yaml
@@ -8,7 +8,7 @@ jobs:
     name: "Release PR to npm"
     runs-on: ubuntu-latest
     # comment out if:false to enable release PR to npm
-    if: false
+    # if: false
     permissions: write-all
     steps:
       - name: Checkout

diff --git a/packages/account/src/account.ts b/packages/account/src/account.ts
@@ -646,11 +646,11 @@ export class Account extends AbstractAccount {
    */
   async sendTransaction(
     transactionRequestLike: TransactionRequestLike,
-    { estimateTxDependencies = true }: ProviderSendTxParams = {}
+    { estimateTxDependencies = true, onBeforeSend }: ProviderSendTxParams = {}
   ): Promise<TransactionResponse> {
     if (this._connector) {
       return this.provider.getTransactionResponse(
-        await this._connector.sendTransaction(this.address.toString(), transactionRequestLike)
+        await this._connector.sendTransaction(this.address.toString(), transactionRequestLike, { onBeforeSend })
       );
     }
     const transactionRequest = transactionRequestify(transactionRequestLike);

diff --git a/packages/account/src/connectors/fuel-connector.ts b/packages/account/src/connectors/fuel-connector.ts
@@ -14,6 +14,7 @@ import type {
   FuelEventArg,
   Version,
   SelectNetworkArguments,
+  SendTransactionParams,
 } from './types';
 
 interface Connector {
@@ -42,7 +43,7 @@ interface Connector {
   signTransaction(address: string, transaction: TransactionRequestLike): Promise<string>;
   // #endregion fuel-connector-method-signTransaction
   // #region fuel-connector-method-sendTransaction
-  sendTransaction(address: string, transaction: TransactionRequestLike): Promise<string>;
+  sendTransaction(address: string, transaction: TransactionRequestLike, params?: SendTransactionParams): Promise<string>;
   // #endregion fuel-connector-method-sendTransaction
   // #region fuel-connector-method-currentAccount
   currentAccount(): Promise<string | null>;
@@ -196,7 +197,7 @@ export abstract class FuelConnector extends EventEmitter implements Connector {
    *
    * @returns The transaction id
    */
-  async sendTransaction(_address: string, _transaction: TransactionRequestLike): Promise<string> {
+  async sendTransaction(_address: string, _transaction: TransactionRequestLike, params?: SendTransactionParams): Promise<string> {
     throw new FuelError(FuelError.CODES.NOT_IMPLEMENTED, 'Method not implemented.');
   }
 

diff --git a/packages/account/src/connectors/types/data-type.ts b/packages/account/src/connectors/types/data-type.ts
@@ -1,5 +1,6 @@
 import type { JsonAbi } from '@fuel-ts/abi-coder';
 import type { RequireAtLeastOne } from 'type-fest';
+import type { TransactionRequest } from '../../providers';
 
 /**
  * @name Version
@@ -42,3 +43,7 @@ export type SelectNetworkArguments = RequireAtLeastOne<Network, 'chainId' | 'url
  * Read more at: https://docs.fuel.network/docs/specs/abi/json-abi-format/
  */
 export type FuelABI = JsonAbi;
+
+export type SendTransactionParams = {
+  onBeforeSend?: (txRequest: TransactionRequest) => TransactionRequest;
+}
diff --git a/packages/account/src/providers/provider.ts b/packages/account/src/providers/provider.ts
@@ -363,7 +363,9 @@ export type ProviderCallParams = UTXOValidationParams & EstimateTransactionParam
 /**
  * Provider Send transaction params
  */
-export type ProviderSendTxParams = EstimateTransactionParams;
+export type ProviderSendTxParams = EstimateTransactionParams & {
+  onBeforeSend?: (txRequest: TransactionRequest) => TransactionRequest;
+};
 
 /**
  * URL - Consensus Params mapping.