@safe-global/relay-kit 1.2.0 → 2.0.0-alpha.0

package/LICENSE.md

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Safe Ecosystem Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Safe Ecosystem Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,15 +1,15 @@
-# Relay Kit
-
-[![NPM Version](https://badge.fury.io/js/%40safe-global%2Frelay-kit.svg)](https://badge.fury.io/js/%40safe-global%2Frelay-kit)
-[![GitHub Release](https://img.shields.io/github/release/safe-global/safe-core-sdk.svg?style=flat)](https://github.com/safe-global/safe-core-sdk/releases)
-[![GitHub](https://img.shields.io/github/license/safe-global/safe-core-sdk)](https://github.com/safe-global/safe-core-sdk/blob/main/LICENSE.md)
-
-The Relay Kit allows to abstract users from the transaction fees payment (gas fees) allowing the use of native token or ERC-20 tokens. This will enable you to pay transaction fees directly from funding available in a Safe.
-
-## Reference
-
-- [Relay Kit docs](https://docs.safe.global/learn/safe-core-account-abstraction-sdk/relay-kit)
-
-## License
-
-This library is [released under MIT](https://github.com/safe-global/safe-core-sdk/blob/main/LICENSE.md).
+# Relay Kit
+
+[![NPM Version](https://badge.fury.io/js/%40safe-global%2Frelay-kit.svg)](https://badge.fury.io/js/%40safe-global%2Frelay-kit)
+[![GitHub Release](https://img.shields.io/github/release/safe-global/safe-core-sdk.svg?style=flat)](https://github.com/safe-global/safe-core-sdk/releases)
+[![GitHub](https://img.shields.io/github/license/safe-global/safe-core-sdk)](https://github.com/safe-global/safe-core-sdk/blob/main/LICENSE.md)
+
+The Relay Kit allows to abstract users from the transaction fees payment (gas fees) allowing the use of native token or ERC-20 tokens. This will enable you to pay transaction fees directly from funding available in a Safe.
+
+## Reference
+
+- [Relay Kit docs](https://docs.safe.global/safe-core-aa-sdk/relay-kit)
+
+## License
+
+This library is [released under MIT](https://github.com/safe-global/safe-core-sdk/blob/main/LICENSE.md).

package/dist/src/RelayKitBasePack.d.ts

@@ -0,0 +1,33 @@
+import Safe from '@safe-global/protocol-kit';
+import { MetaTransactionOptions, SafeTransaction } from '@safe-global/safe-core-sdk-types';
+import { RelayKitTransaction } from './types';
+export declare abstract class RelayKitBasePack {
+    protocolKit: Safe;
+    /**
+     * The packs implemented using our SDK should extend this class and therefore provide a Safe SDK instance
+     * @constructor
+     * @param protocolKit The Safe SDK instance
+     */
+    constructor(protocolKit: Safe);
+    /**
+     * Get an estimation of the fee that will be paid for a transaction
+     * @param chainId The chain id
+     * @param gasLimit Max amount of gas willing to consume
+     * @param gasToken Token address (or 0 if ETH) that is used for the payment
+     */
+    abstract getEstimateFee(chainId: bigint, gasLimit: string, gasToken?: string): Promise<string>;
+    /**
+     * Creates a Safe transaction designed to be executed using the relayer.
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties required to create the transaction.
+     * @returns {Promise<SafeTransaction>} - Returns a Promise that resolves with a SafeTransaction object.
+     */
+    abstract createRelayedTransaction({ transactions, options, onlyCalls }: RelayKitTransaction): Promise<SafeTransaction>;
+    /**
+     * Sends the Safe transaction to the relayer for execution.
+     * If the Safe is not deployed, it creates a batch of transactions including the Safe deployment transaction.
+     * @param {SafeTransaction} safeTransaction - The Safe transaction to be executed
+     * @param {MetaTransactionOptions} options - The transaction options
+     * @returns {Promise<RelayResponse>} Returns a Promise that resolves with a RelayResponse object.
+     */
+    abstract executeRelayTransaction(safeTransaction: SafeTransaction, options?: MetaTransactionOptions): Promise<unknown>;
+}

package/dist/src/RelayKitBasePack.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RelayKitBasePack = void 0;
+class RelayKitBasePack {
+    /**
+     * The packs implemented using our SDK should extend this class and therefore provide a Safe SDK instance
+     * @constructor
+     * @param protocolKit The Safe SDK instance
+     */
+    constructor(protocolKit) {
+        this.protocolKit = protocolKit;
+    }
+}
+exports.RelayKitBasePack = RelayKitBasePack;
+//# sourceMappingURL=RelayKitBasePack.js.map

package/dist/src/RelayKitBasePack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RelayKitBasePack.js","sourceRoot":"","sources":["../../src/RelayKitBasePack.ts"],"names":[],"mappings":";;;AAKA,MAAsB,gBAAgB;IAGpC;;;;OAIG;IACH,YAAY,WAAiB;QAC3B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;IAChC,CAAC;CAgCF;AA1CD,4CA0CC"}

package/dist/src/constants.d.ts

@@ -2,3 +2,5 @@ export declare const GELATO_NATIVE_TOKEN_ADDRESS = "0xEeeeeEeeeEeEeeEeEeEeeEEEee
 export declare const GELATO_FEE_COLLECTOR = "0x3AC05161b76a35c1c28dC99Aa01BEd7B24cEA3bf";
 export declare const GELATO_RELAY_URL = "https://relay.gelato.digital";
 export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+export declare const GELATO_GAS_EXECUTION_OVERHEAD = 150000;
+export declare const GELATO_TRANSFER_GAS_COST = 15000;

package/dist/src/constants.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZERO_ADDRESS = exports.GELATO_RELAY_URL = exports.GELATO_FEE_COLLECTOR = exports.GELATO_NATIVE_TOKEN_ADDRESS = void 0;
+exports.GELATO_TRANSFER_GAS_COST = exports.GELATO_GAS_EXECUTION_OVERHEAD = exports.ZERO_ADDRESS = exports.GELATO_RELAY_URL = exports.GELATO_FEE_COLLECTOR = exports.GELATO_NATIVE_TOKEN_ADDRESS = void 0;
 exports.GELATO_NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
 exports.GELATO_FEE_COLLECTOR = '0x3AC05161b76a35c1c28dC99Aa01BEd7B24cEA3bf';
 exports.GELATO_RELAY_URL = 'https://relay.gelato.digital';
 exports.ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
+// see: https://docs.gelato.network/developer-services/relay/quick-start/optional-parameters#optional-parameters
+exports.GELATO_GAS_EXECUTION_OVERHEAD = 150000;
+// gas cost of the separate ERC20 transfer to pay the fees to the Gelato relayer
+exports.GELATO_TRANSFER_GAS_COST = 15000;
 //# sourceMappingURL=constants.js.map

package/dist/src/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,4CAA4C,CAAA;AAE1E,QAAA,oBAAoB,GAAG,4CAA4C,CAAA;AAEnE,QAAA,gBAAgB,GAAG,8BAA8B,CAAA;AAEjD,QAAA,YAAY,GAAG,4CAA4C,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,4CAA4C,CAAA;AAE1E,QAAA,oBAAoB,GAAG,4CAA4C,CAAA;AAEnE,QAAA,gBAAgB,GAAG,8BAA8B,CAAA;AAEjD,QAAA,YAAY,GAAG,4CAA4C,CAAA;AAExE,gHAAgH;AACnG,QAAA,6BAA6B,GAAG,MAAO,CAAA;AAEpD,gFAAgF;AACnE,QAAA,wBAAwB,GAAG,KAAM,CAAA"}

package/dist/src/index.d.ts

@@ -1,2 +1,4 @@
 export * from './packs/gelato/GelatoRelayPack';
+export * from './packs/gelato/types';
+export * from './RelayKitBasePack';
 export * from './types';

package/dist/src/index.js

@@ -15,5 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./packs/gelato/GelatoRelayPack"), exports);
+__exportStar(require("./packs/gelato/types"), exports);
+__exportStar(require("./RelayKitBasePack"), exports);
 __exportStar(require("./types"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA8C;AAC9C,0CAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA8C;AAC9C,uDAAoC;AAEpC,qDAAkC;AAClC,0CAAuB"}

package/dist/src/packs/gelato/GelatoRelayPack.d.ts

@@ -1,16 +1,66 @@
 import { RelayResponse, TransactionStatusResponse } from '@gelatonetwork/relay-sdk';
-import Safe from '@safe-global/protocol-kit';
-import { RelayPack } from '../../types';
-import { MetaTransactionData, MetaTransactionOptions, RelayTransaction, SafeTransaction } from '@safe-global/safe-core-sdk-types';
-export declare class GelatoRelayPack implements RelayPack {
+import { RelayKitBasePack } from '../../RelayKitBasePack';
+import { RelayKitTransaction } from '../../types';
+import { MetaTransactionOptions, RelayTransaction, SafeTransaction } from '@safe-global/safe-core-sdk-types';
+import { GelatoOptions } from './types';
+export declare class GelatoRelayPack extends RelayKitBasePack {
     #private;
-    constructor(apiKey?: string);
+    constructor({ apiKey, protocolKit }: GelatoOptions);
     private _getFeeToken;
     getFeeCollector(): string;
-    getEstimateFee(chainId: number, gasLimit: string, gasToken?: string): Promise<string>;
+    getEstimateFee(chainId: bigint, gasLimit: string, gasToken?: string): Promise<string>;
     getTaskStatus(taskId: string): Promise<TransactionStatusResponse | undefined>;
-    createRelayedTransaction(safe: Safe, transactions: MetaTransactionData[], options: MetaTransactionOptions): Promise<SafeTransaction>;
-    sendSponsorTransaction(target: string, encodedTransaction: string, chainId: number): Promise<RelayResponse>;
-    sendSyncTransaction(target: string, encodedTransaction: string, chainId: number, options: MetaTransactionOptions): Promise<RelayResponse>;
+    /**
+     * Creates a payment transaction to Gelato
+     *
+     * @private
+     * @async
+     * @function
+     * @param {string} gas - The gas amount for the payment.
+     * @param {MetaTransactionOptions} options - Options for the meta transaction.
+     * @returns {Promise<Transaction>} Promise object representing the created payment transaction.
+     *
+     */
+    private createPaymentToGelato;
+    /**
+     * Creates a Safe transaction designed to be executed using the Gelato Relayer.
+     *
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties required to create the transaction.
+     * @returns {Promise<SafeTransaction>} Returns a Promise that resolves with a SafeTransaction object.
+     */
+    createRelayedTransaction({ transactions, onlyCalls, options }: RelayKitTransaction): Promise<SafeTransaction>;
+    /**
+     * Creates a Safe transaction designed to be executed using the Gelato Relayer and
+     * uses the handlePayment function defined in the Safe contract to pay the fees
+     * to the Gelato relayer.
+     *
+     * @async
+     * @function createTransactionWithHandlePayment
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties needed to create the transaction.
+     * @returns {Promise<SafeTransaction>} Returns a promise that resolves to the created SafeTransaction.
+     * @private
+     */
+    private createTransactionWithHandlePayment;
+    /**
+     * Creates a Safe transaction designed to be executed using the Gelato Relayer and
+     * uses a separate ERC20 transfer to pay the fees to the Gelato relayer.
+     *
+     * @async
+     * @function createTransactionWithTransfer
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties needed to create the transaction.
+     * @returns {Promise<SafeTransaction>} Returns a promise that resolves to the created SafeTransaction.
+     * @private
+     */
+    private createTransactionWithTransfer;
+    sendSponsorTransaction(target: string, encodedTransaction: string, chainId: bigint): Promise<RelayResponse>;
+    sendSyncTransaction(target: string, encodedTransaction: string, chainId: bigint, options: MetaTransactionOptions): Promise<RelayResponse>;
     relayTransaction({ target, encodedTransaction, chainId, options }: RelayTransaction): Promise<RelayResponse>;
+    /**
+     * Sends the Safe transaction to the Gelato Relayer for execution.
+     * If the Safe is not deployed, it creates a batch of transactions including the Safe deployment transaction.
+     *
+     * @param {SafeTransaction} safeTransaction - The Safe transaction to be executed.
+     * @returns {Promise<RelayResponse>} Returns a Promise that resolves with a RelayResponse object.
+     */
+    executeRelayTransaction(safeTransaction: SafeTransaction, options?: MetaTransactionOptions): Promise<RelayResponse>;
 }

package/dist/src/packs/gelato/GelatoRelayPack.js

@@ -13,11 +13,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GelatoRelayPack_gelatoRelay, _GelatoRelayPack_apiKey;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GelatoRelayPack = void 0;
-const bignumber_1 = require("@ethersproject/bignumber");
 const relay_sdk_1 = require("@gelatonetwork/relay-sdk");
+const protocol_kit_1 = require("@safe-global/protocol-kit");
+const RelayKitBasePack_1 = require("../../RelayKitBasePack");
 const constants_1 = require("../../constants");
-class GelatoRelayPack {
-    constructor(apiKey) {
+class GelatoRelayPack extends RelayKitBasePack_1.RelayKitBasePack {
+    constructor({ apiKey, protocolKit }) {
+        super(protocolKit);
         _GelatoRelayPack_gelatoRelay.set(this, void 0);
         _GelatoRelayPack_apiKey.set(this, void 0);
         __classPrivateFieldSet(this, _GelatoRelayPack_gelatoRelay, new relay_sdk_1.GelatoRelay(), "f");
@@ -31,36 +33,181 @@ class GelatoRelayPack {
     }
     async getEstimateFee(chainId, gasLimit, gasToken) {
         const feeToken = this._getFeeToken(gasToken);
-        const estimation = await __classPrivateFieldGet(this, _GelatoRelayPack_gelatoRelay, "f").getEstimatedFee(chainId, feeToken, bignumber_1.BigNumber.from(gasLimit), true);
+        const estimation = await __classPrivateFieldGet(this, _GelatoRelayPack_gelatoRelay, "f").getEstimatedFee(chainId, feeToken, BigInt(gasLimit), false);
         return estimation.toString();
     }
     async getTaskStatus(taskId) {
         return __classPrivateFieldGet(this, _GelatoRelayPack_gelatoRelay, "f").getTaskStatus(taskId);
     }
-    async createRelayedTransaction(safe, transactions, options) {
-        const { gasLimit, gasToken, isSponsored } = options;
-        const nonce = await safe.getNonce();
+    /**
+     * Creates a payment transaction to Gelato
+     *
+     * @private
+     * @async
+     * @function
+     * @param {string} gas - The gas amount for the payment.
+     * @param {MetaTransactionOptions} options - Options for the meta transaction.
+     * @returns {Promise<Transaction>} Promise object representing the created payment transaction.
+     *
+     */
+    async createPaymentToGelato(gas, options) {
+        const chainId = await this.protocolKit.getChainId();
+        const gelatoAddress = this.getFeeCollector();
+        const gasToken = options.gasToken ?? constants_1.ZERO_ADDRESS;
+        const paymentToGelato = await this.getEstimateFee(chainId, gas, gasToken);
+        // The Gelato payment transaction
+        const transferToGelato = (0, protocol_kit_1.createERC20TokenTransferTransaction)(gasToken, gelatoAddress, paymentToGelato);
+        return transferToGelato;
+    }
+    /**
+     * Creates a Safe transaction designed to be executed using the Gelato Relayer.
+     *
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties required to create the transaction.
+     * @returns {Promise<SafeTransaction>} Returns a Promise that resolves with a SafeTransaction object.
+     */
+    async createRelayedTransaction({ transactions, onlyCalls = false, options = {} }) {
+        const { isSponsored = false } = options;
         if (isSponsored) {
-            const sponsoredTransaction = await safe.createTransaction({
+            const nonce = await this.protocolKit.getNonce();
+            const sponsoredTransaction = await this.protocolKit.createTransaction({
                 safeTransactionData: transactions,
+                onlyCalls,
                 options: {
                     nonce
                 }
             });
             return sponsoredTransaction;
         }
-        const chainId = await safe.getChainId();
-        const estimation = await this.getEstimateFee(chainId, gasLimit, gasToken);
-        const syncTransaction = await safe.createTransaction({
+        // If the ERC20 gas token does not follow the standard 18 decimals, we cannot use handlePayment to pay Gelato fees.
+        const gasToken = options.gasToken ?? constants_1.ZERO_ADDRESS;
+        const isGasTokenCompatible = await (0, protocol_kit_1.isGasTokenCompatibleWithHandlePayment)(gasToken, this.protocolKit);
+        if (!isGasTokenCompatible) {
+            // if the ERC20 gas token is not compatible (less than 18 decimals like USDC), a separate transfer is required to pay Gelato fees.
+            return this.createTransactionWithTransfer({ transactions, onlyCalls, options });
+        }
+        // If the gas token is compatible (Native token or standard ERC20), we use handlePayment function present in the Safe contract to pay Gelato fees
+        return this.createTransactionWithHandlePayment({ transactions, onlyCalls, options });
+    }
+    /**
+     * Creates a Safe transaction designed to be executed using the Gelato Relayer and
+     * uses the handlePayment function defined in the Safe contract to pay the fees
+     * to the Gelato relayer.
+     *
+     * @async
+     * @function createTransactionWithHandlePayment
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties needed to create the transaction.
+     * @returns {Promise<SafeTransaction>} Returns a promise that resolves to the created SafeTransaction.
+     * @private
+     */
+    async createTransactionWithHandlePayment({ transactions, onlyCalls = false, options = {} }) {
+        const { gasLimit } = options;
+        const nonce = await this.protocolKit.getNonce();
+        // this transaction is only used for gas estimations
+        const transactionToEstimateGas = await this.protocolKit.createTransaction({
+            safeTransactionData: transactions,
+            onlyCalls,
+            options: {
+                nonce
+            }
+        });
+        // as we set gasPrice to 1, safeTxGas is set to a non-zero value to prevent transaction failure due to out-of-gas errors. value see: https://github.com/safe-global/safe-contracts/blob/main/contracts/Safe.sol#L203
+        const gasPrice = '1';
+        const safeTxGas = await (0, protocol_kit_1.estimateSafeTxGas)(this.protocolKit, transactionToEstimateGas);
+        const gasToken = options.gasToken ?? constants_1.ZERO_ADDRESS;
+        const refundReceiver = this.getFeeCollector();
+        const chainId = await this.protocolKit.getChainId();
+        // if a custom gasLimit is provided, we do not need to estimate the gas cost
+        if (gasLimit) {
+            const paymentToGelato = await this.getEstimateFee(chainId, gasLimit, gasToken);
+            const syncTransaction = await this.protocolKit.createTransaction({
+                safeTransactionData: transactions,
+                onlyCalls,
+                options: {
+                    baseGas: paymentToGelato,
+                    gasPrice,
+                    safeTxGas,
+                    gasToken,
+                    refundReceiver,
+                    nonce
+                }
+            });
+            return syncTransaction;
+        }
+        // If gasLimit is not provided, we need to estimate the gas cost.
+        const baseGas = await (0, protocol_kit_1.estimateTxBaseGas)(this.protocolKit, transactionToEstimateGas);
+        const safeDeploymentGasCost = await (0, protocol_kit_1.estimateSafeDeploymentGas)(this.protocolKit);
+        const totalGas = Number(baseGas) + // baseGas
+            Number(safeTxGas) + // safeTxGas
+            Number(safeDeploymentGasCost) + // Safe deploymet gas cost if it is required
+            constants_1.GELATO_GAS_EXECUTION_OVERHEAD; // Gelato execution overhead
+        const paymentToGelato = await this.getEstimateFee(chainId, String(totalGas), gasToken);
+        const syncTransaction = await this.protocolKit.createTransaction({
+            safeTransactionData: transactions,
+            onlyCalls,
+            options: {
+                baseGas: paymentToGelato,
+                gasPrice,
+                safeTxGas,
+                gasToken,
+                refundReceiver,
+                nonce
+            }
+        });
+        return syncTransaction;
+    }
+    /**
+     * Creates a Safe transaction designed to be executed using the Gelato Relayer and
+     * uses a separate ERC20 transfer to pay the fees to the Gelato relayer.
+     *
+     * @async
+     * @function createTransactionWithTransfer
+     * @param {RelayKitTransaction} RelayKitTransaction - Properties needed to create the transaction.
+     * @returns {Promise<SafeTransaction>} Returns a promise that resolves to the created SafeTransaction.
+     * @private
+     */
+    async createTransactionWithTransfer({ transactions, onlyCalls = false, options = {} }) {
+        const { gasLimit } = options;
+        const nonce = await this.protocolKit.getNonce();
+        const gasToken = options.gasToken ?? constants_1.ZERO_ADDRESS;
+        // if a custom gasLimit is provided, we do not need to estimate the gas cost
+        if (gasLimit) {
+            const transferToGelato = await this.createPaymentToGelato(gasLimit, options);
+            const syncTransaction = await this.protocolKit.createTransaction({
+                safeTransactionData: [...transactions, transferToGelato],
+                onlyCalls,
+                options: {
+                    nonce,
+                    gasToken
+                }
+            });
+            return syncTransaction;
+        }
+        // If gasLimit is not provided, we need to estimate the gas cost.
+        // this transaction is only used for gas estimations
+        const transactionToEstimateGas = await this.protocolKit.createTransaction({
             safeTransactionData: transactions,
+            onlyCalls,
             options: {
-                baseGas: estimation,
-                gasPrice: '1',
-                gasToken: gasToken !== null && gasToken !== void 0 ? gasToken : constants_1.ZERO_ADDRESS,
-                refundReceiver: this.getFeeCollector(),
                 nonce
             }
         });
+        const safeTxGas = await (0, protocol_kit_1.estimateSafeTxGas)(this.protocolKit, transactionToEstimateGas);
+        const baseGas = await (0, protocol_kit_1.estimateTxBaseGas)(this.protocolKit, transactionToEstimateGas);
+        const safeDeploymentGasCost = await (0, protocol_kit_1.estimateSafeDeploymentGas)(this.protocolKit);
+        const totalGas = Number(baseGas) + // baseGas
+            Number(safeTxGas) + // safeTxGas without Gelato payment transfer
+            Number(safeDeploymentGasCost) + // Safe deploymet gas cost if it is required
+            constants_1.GELATO_TRANSFER_GAS_COST + // Gelato payment transfer
+            constants_1.GELATO_GAS_EXECUTION_OVERHEAD; // Gelato execution overhead
+        const transferToGelato = await this.createPaymentToGelato(String(totalGas), options);
+        const syncTransaction = await this.protocolKit.createTransaction({
+            safeTransactionData: [...transactions, transferToGelato],
+            onlyCalls,
+            options: {
+                nonce,
+                gasToken
+            }
+        });
         return syncTransaction;
     }
     async sendSponsorTransaction(target, encodedTransaction, chainId) {
@@ -86,17 +233,55 @@ class GelatoRelayPack {
             isRelayContext: false
         };
         const relayRequestOptions = {
-            gasLimit
+            gasLimit: gasLimit ? BigInt(gasLimit) : undefined
         };
         const response = await __classPrivateFieldGet(this, _GelatoRelayPack_gelatoRelay, "f").callWithSyncFee(request, relayRequestOptions);
         return response;
     }
-    async relayTransaction({ target, encodedTransaction, chainId, options }) {
+    async relayTransaction({ target, encodedTransaction, chainId, options = {} }) {
         const response = options.isSponsored
             ? this.sendSponsorTransaction(target, encodedTransaction, chainId)
             : this.sendSyncTransaction(target, encodedTransaction, chainId, options);
         return response;
     }
+    /**
+     * Sends the Safe transaction to the Gelato Relayer for execution.
+     * If the Safe is not deployed, it creates a batch of transactions including the Safe deployment transaction.
+     *
+     * @param {SafeTransaction} safeTransaction - The Safe transaction to be executed.
+     * @returns {Promise<RelayResponse>} Returns a Promise that resolves with a RelayResponse object.
+     */
+    async executeRelayTransaction(safeTransaction, options) {
+        const isSafeDeployed = await this.protocolKit.isSafeDeployed();
+        const chainId = await this.protocolKit.getChainId();
+        const safeAddress = await this.protocolKit.getAddress();
+        const safeTransactionEncodedData = await this.protocolKit.getEncodedTransaction(safeTransaction);
+        const gasToken = options?.gasToken || safeTransaction.data.gasToken;
+        if (isSafeDeployed) {
+            const relayTransaction = {
+                target: safeAddress,
+                encodedTransaction: safeTransactionEncodedData,
+                chainId,
+                options: {
+                    ...options,
+                    gasToken
+                }
+            };
+            return this.relayTransaction(relayTransaction);
+        }
+        // if the Safe is not deployed we create a batch with the Safe deployment transaction and the provided Safe transaction
+        const safeDeploymentBatch = await this.protocolKit.wrapSafeTransactionIntoDeploymentBatch(safeTransaction);
+        const relayTransaction = {
+            target: safeDeploymentBatch.to,
+            encodedTransaction: safeDeploymentBatch.data,
+            chainId,
+            options: {
+                ...options,
+                gasToken
+            }
+        };
+        return this.relayTransaction(relayTransaction);
+    }
 }
 exports.GelatoRelayPack = GelatoRelayPack;
 _GelatoRelayPack_gelatoRelay = new WeakMap(), _GelatoRelayPack_apiKey = new WeakMap();

package/dist/src/packs/gelato/GelatoRelayPack.js.map

@@ -1 +1 @@
-{"version":3,"file":"GelatoRelayPack.js","sourceRoot":"","sources":["../../../../src/packs/gelato/GelatoRelayPack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GelatoRelayPack.js","sourceRoot":"","sources":["../../../../src/packs/gelato/GelatoRelayPack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAOiC;AACjC,4DAMkC;AAClC,8EAA0E;AAC1E,gEAMyC;AAWzC,MAAa,eAAgB,SAAQ,mCAAgB;IAInD,YAAY,EAAE,MAAM,EAAE,WAAW,EAAiB;QAChD,KAAK,CAAC,WAAW,CAAC,CAAA;QAJpB,+CAAgC;QAChC,0CAAgB;QAId,uBAAA,IAAI,gCAAgB,IAAI,uBAAkB,EAAE,MAAA,CAAA;QAE5C,uBAAA,IAAI,2BAAW,MAAM,MAAA,CAAA;IACvB,CAAC;IAEO,YAAY,CAAC,QAAiB;QACpC,OAAO,CAAC,QAAQ,IAAI,QAAQ,KAAK,wBAAY,CAAC,CAAC,CAAC,uCAA2B,CAAC,CAAC,CAAC,QAAQ,CAAA;IACxF,CAAC;IAED,eAAe;QACb,OAAO,gCAAoB,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAe,EAAE,QAAgB,EAAE,QAAiB;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC5C,MAAM,UAAU,GAAG,MAAM,uBAAA,IAAI,oCAAa,CAAC,eAAe,CACxD,OAAO,EACP,QAAQ,EACR,MAAM,CAAC,QAAQ,CAAC,EAChB,KAAK,CACN,CAAA;QACD,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAc;QAChC,OAAO,uBAAA,IAAI,oCAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,qBAAqB,CACjC,GAAW,EACX,OAA+B;QAE/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAA;QACnD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,wBAAY,CAAA;QAEjD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;QAEzE,iCAAiC;QACjC,MAAM,gBAAgB,GAAG,IAAA,kDAAmC,EAC1D,QAAQ,EACR,aAAa,EACb,eAAe,CAChB,CAAA;QAED,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,wBAAwB,CAAC,EAC7B,YAAY,EACZ,SAAS,GAAG,KAAK,EACjB,OAAO,GAAG,EAAE,EACQ;QACpB,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,OAAO,CAAA;QAEvC,IAAI,WAAW,EAAE;YACf,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAA;YAE/C,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;gBACpE,mBAAmB,EAAE,YAAY;gBACjC,SAAS;gBACT,OAAO,EAAE;oBACP,KAAK;iBACN;aACF,CAAC,CAAA;YAEF,OAAO,oBAAoB,CAAA;SAC5B;QAED,mHAAmH;QAEnH,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,wBAAY,CAAA;QACjD,MAAM,oBAAoB,GAAG,MAAM,IAAA,oDAAqC,EACtE,QAAQ,EACR,IAAI,CAAC,WAAW,CACjB,CAAA;QAED,IAAI,CAAC,oBAAoB,EAAE;YACzB,kIAAkI;YAElI,OAAO,IAAI,CAAC,6BAA6B,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;SAChF;QAED,iJAAiJ;QACjJ,OAAO,IAAI,CAAC,kCAAkC,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAA;IACtF,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,kCAAkC,CAAC,EAC/C,YAAY,EACZ,SAAS,GAAG,KAAK,EACjB,OAAO,GAAG,EAAE,EACQ;QACpB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAC5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAA;QAE/C,oDAAoD;QACpD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;YACxE,mBAAmB,EAAE,YAAY;YACjC,SAAS;YACT,OAAO,EAAE;gBACP,KAAK;aACN;SACF,CAAC,CAAA;QAEF,oNAAoN;QACpN,MAAM,QAAQ,GAAG,GAAG,CAAA;QACpB,MAAM,SAAS,GAAG,MAAM,IAAA,gCAAiB,EAAC,IAAI,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAA;QACrF,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,wBAAY,CAAA;QACjD,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAC7C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAA;QAEnD,4EAA4E;QAC5E,IAAI,QAAQ,EAAE;YACZ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAE9E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;gBAC/D,mBAAmB,EAAE,YAAY;gBACjC,SAAS;gBACT,OAAO,EAAE;oBACP,OAAO,EAAE,eAAe;oBACxB,QAAQ;oBACR,SAAS;oBACT,QAAQ;oBACR,cAAc;oBACd,KAAK;iBACN;aACF,CAAC,CAAA;YAEF,OAAO,eAAe,CAAA;SACvB;QAED,iEAAiE;QAEjE,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAiB,EAAC,IAAI,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAA;QACnF,MAAM,qBAAqB,GAAG,MAAM,IAAA,wCAAyB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE/E,MAAM,QAAQ,GACZ,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU;YAC5B,MAAM,CAAC,SAAS,CAAC,GAAG,YAAY;YAChC,MAAM,CAAC,qBAAqB,CAAC,GAAG,4CAA4C;YAC5E,yCAA6B,CAAA,CAAC,4BAA4B;QAE5D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;QAEtF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;YAC/D,mBAAmB,EAAE,YAAY;YACjC,SAAS;YACT,OAAO,EAAE;gBACP,OAAO,EAAE,eAAe;gBACxB,QAAQ;gBACR,SAAS;gBACT,QAAQ;gBACR,cAAc;gBACd,KAAK;aACN;SACF,CAAC,CAAA;QAEF,OAAO,eAAe,CAAA;IACxB,CAAC;IAED;;;;;;;;;OASG;IACK,KAAK,CAAC,6BAA6B,CAAC,EAC1C,YAAY,EACZ,SAAS,GAAG,KAAK,EACjB,OAAO,GAAG,EAAE,EACQ;QACpB,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QAC5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAA;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,wBAAY,CAAA;QAEjD,4EAA4E;QAC5E,IAAI,QAAQ,EAAE;YACZ,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAE5E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;gBAC/D,mBAAmB,EAAE,CAAC,GAAG,YAAY,EAAE,gBAAgB,CAAC;gBACxD,SAAS;gBACT,OAAO,EAAE;oBACP,KAAK;oBACL,QAAQ;iBACT;aACF,CAAC,CAAA;YAEF,OAAO,eAAe,CAAA;SACvB;QAED,iEAAiE;QAEjE,oDAAoD;QACpD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;YACxE,mBAAmB,EAAE,YAAY;YACjC,SAAS;YACT,OAAO,EAAE;gBACP,KAAK;aACN;SACF,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,MAAM,IAAA,gCAAiB,EAAC,IAAI,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAA;QACrF,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAiB,EAAC,IAAI,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAA;QACnF,MAAM,qBAAqB,GAAG,MAAM,IAAA,wCAAyB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE/E,MAAM,QAAQ,GACZ,MAAM,CAAC,OAAO,CAAC,GAAG,UAAU;YAC5B,MAAM,CAAC,SAAS,CAAC,GAAG,4CAA4C;YAChE,MAAM,CAAC,qBAAqB,CAAC,GAAG,4CAA4C;YAC5E,oCAAwB,GAAG,0BAA0B;YACrD,yCAA6B,CAAA,CAAC,4BAA4B;QAE5D,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAA;QAEpF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;YAC/D,mBAAmB,EAAE,CAAC,GAAG,YAAY,EAAE,gBAAgB,CAAC;YACxD,SAAS;YACT,OAAO,EAAE;gBACP,KAAK;gBACL,QAAQ;aACT;SACF,CAAC,CAAA;QAEF,OAAO,eAAe,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,MAAc,EACd,kBAA0B,EAC1B,OAAe;QAEf,IAAI,CAAC,uBAAA,IAAI,+BAAQ,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;SACvC;QACD,MAAM,OAAO,GAAyB;YACpC,OAAO;YACP,MAAM;YACN,IAAI,EAAE,kBAAkB;SACzB,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,uBAAA,IAAI,oCAAa,CAAC,aAAa,CAAC,OAAO,EAAE,uBAAA,IAAI,+BAAQ,CAAC,CAAA;QAC7E,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,MAAc,EACd,kBAA0B,EAC1B,OAAe,EACf,OAA+B;QAE/B,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAA;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAC5C,MAAM,OAAO,GAA2B;YACtC,OAAO;YACP,MAAM;YACN,IAAI,EAAE,kBAAkB;YACxB,QAAQ;YACR,cAAc,EAAE,KAAK;SACtB,CAAA;QACD,MAAM,mBAAmB,GAAwB;YAC/C,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SAClD,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,uBAAA,IAAI,oCAAa,CAAC,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;QACtF,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EACrB,MAAM,EACN,kBAAkB,EAClB,OAAO,EACP,OAAO,GAAG,EAAE,EACK;QACjB,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW;YAClC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC;YAClE,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QAC1E,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,uBAAuB,CAC3B,eAAgC,EAChC,OAAgC;QAEhC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAA;QAC9D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAA;QACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAA;QACvD,MAAM,0BAA0B,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAA;QAEhG,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAA;QAEnE,IAAI,cAAc,EAAE;YAClB,MAAM,gBAAgB,GAAqB;gBACzC,MAAM,EAAE,WAAW;gBACnB,kBAAkB,EAAE,0BAA0B;gBAC9C,OAAO;gBACP,OAAO,EAAE;oBACP,GAAG,OAAO;oBACV,QAAQ;iBACT;aACF,CAAA;YAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;SAC/C;QAED,uHAAuH;QACvH,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,sCAAsC,CACvF,eAAe,CAChB,CAAA;QAED,MAAM,gBAAgB,GAAqB;YACzC,MAAM,EAAE,mBAAmB,CAAC,EAAE;YAC9B,kBAAkB,EAAE,mBAAmB,CAAC,IAAI;YAC5C,OAAO;YACP,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,QAAQ;aACT;SACF,CAAA;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;IAChD,CAAC;CACF;AA7WD,0CA6WC"}