@imtbl/sdk 1.5.0 → 1.5.2

package/dist/index.cjs

@@ -173,7 +173,7 @@ const flattenProperties$1 = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION$1 = '1.5.0';
+const SDK_VERSION$1 = '1.5.2';
 let initialised$1 = false;
 const isInitialised$1 = () => initialised$1;
 const getReferrer$1 = () => {
@@ -11260,7 +11260,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-1.5.0' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-1.5.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -11332,7 +11332,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-1.5.0',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-1.5.2',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -11765,7 +11765,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.5.0',
+    sdkVersion: 'ts-immutable-sdk-1.5.2',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -16835,12 +16835,14 @@ class GuardianClient {
     messageAPI;
     confirmationScreen;
     crossSdkBridgeEnabled;
-    constructor({ confirmationScreen, config }) {
+    authManager;
+    constructor({ confirmationScreen, config, authManager }) {
         const guardianConfiguration = new Configuration({ basePath: config.imxPublicApiDomain });
         this.confirmationScreen = confirmationScreen;
         this.crossSdkBridgeEnabled = config.crossSdkBridgeEnabled;
         this.messageAPI = new MessagesApi(guardianConfiguration);
         this.transactionAPI = new TransactionsApi(guardianConfiguration);
+        this.authManager = authManager;
     }
     /**
      * Open confirmation screen and close it automatically if the
@@ -16864,10 +16866,11 @@ class GuardianClient {
     withDefaultConfirmationScreenTask(task) {
         return this.withConfirmationScreenTask()(task);
     }
-    async evaluateImxTransaction({ payloadHash, user }) {
+    async evaluateImxTransaction({ payloadHash }) {
         const finallyFn = () => {
             this.confirmationScreen.closeWindow();
         };
+        const user = await this.authManager.getUser();
         const headers = { Authorization: `Bearer ${user.accessToken}` };
         const transactionRes = await retryWithDelay(async () => this.transactionAPI.getTransactionByID({
             transactionID: payloadHash,
@@ -16896,7 +16899,8 @@ class GuardianClient {
             this.confirmationScreen.closeWindow();
         }
     }
-    async evaluateEVMTransaction({ chainId, nonce, user, metaTransactions, }) {
+    async evaluateEVMTransaction({ chainId, nonce, metaTransactions, }) {
+        const user = await this.authManager.getUser();
         const headers = { Authorization: `Bearer ${user.accessToken}` };
         const guardianTransactions = transformGuardianTransactions(metaTransactions);
         try {
@@ -16919,11 +16923,10 @@ class GuardianClient {
             throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, `Transaction failed to validate with error: ${errorMessage}`);
         }
     }
-    async validateEVMTransaction({ chainId, nonce, user, metaTransactions, }) {
+    async validateEVMTransaction({ chainId, nonce, metaTransactions, }) {
         const transactionEvaluationResponse = await this.evaluateEVMTransaction({
             chainId,
             nonce,
-            user,
             metaTransactions,
         });
         const { confirmationRequired, transactionId } = transactionEvaluationResponse;
@@ -16931,6 +16934,7 @@ class GuardianClient {
             throw new JsonRpcError(RpcErrorCode.TRANSACTION_REJECTED, transactionRejectedCrossSdkBridgeError);
         }
         if (confirmationRequired && !!transactionId) {
+            const user = await this.authManager.getUser();
             const confirmationResult = await this.confirmationScreen.requestConfirmation(transactionId, user.zkEvm.ethAddress, TransactionApprovalRequestChainTypeEnum.Evm, chainId);
             if (!confirmationResult.confirmed) {
                 throw new JsonRpcError(RpcErrorCode.TRANSACTION_REJECTED, 'Transaction rejected by user');
@@ -16940,8 +16944,12 @@ class GuardianClient {
             this.confirmationScreen.closeWindow();
         }
     }
-    async evaluateMessage({ chainID, payload, user }) {
+    async evaluateMessage({ chainID, payload }) {
         try {
+            const user = await this.authManager.getUser();
+            if (user === null) {
+                throw new PassportError('evaluateMessage requires a valid ID token or refresh token. Please log in first', PassportErrorType.NOT_LOGGED_IN_ERROR);
+            }
             const messageEvalResponse = await this.messageAPI.evaluateMessage({ messageEvaluationRequest: { chainID, payload } }, { headers: { Authorization: `Bearer ${user.accessToken}` } });
             return messageEvalResponse.data;
         }
@@ -16950,12 +16958,13 @@ class GuardianClient {
             throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, `Message failed to validate with error: ${errorMessage}`);
         }
     }
-    async validateMessage({ chainID, payload, user }) {
-        const { messageId, confirmationRequired } = await this.evaluateMessage({ chainID, payload, user });
+    async validateMessage({ chainID, payload }) {
+        const { messageId, confirmationRequired } = await this.evaluateMessage({ chainID, payload });
         if (confirmationRequired && this.crossSdkBridgeEnabled) {
             throw new JsonRpcError(RpcErrorCode.TRANSACTION_REJECTED, transactionRejectedCrossSdkBridgeError);
         }
         if (confirmationRequired && !!messageId) {
+            const user = await this.authManager.getUser();
             const confirmationResult = await this.confirmationScreen.requestMessageConfirmation(messageId, user.zkEvm.ethAddress);
             if (!confirmationResult.confirmed) {
                 throw new JsonRpcError(RpcErrorCode.TRANSACTION_REJECTED, 'Signature rejected by user');
@@ -17037,7 +17046,6 @@ async function createOrder$1({ starkSigner, user, request, ordersApi, guardianCl
             getSignableOrderRequestV3,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: getSignableOrderResponse.data.payload_hash,
         });
         const { payload_hash: payloadHash } = getSignableOrderResponse.data;
@@ -17080,7 +17088,6 @@ async function cancelOrder$1({ user, starkSigner, request, ordersApi, guardianCl
             getSignableCancelOrderRequest,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: getSignableCancelOrderResponse.data.payload_hash,
         });
         const { payload_hash: payloadHash } = getSignableCancelOrderResponse.data;
@@ -17142,7 +17149,6 @@ async function createTrade$1({ request, tradesApi, user, starkSigner, guardianCl
             getSignableTradeRequest,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: getSignableTradeResponse.data.payload_hash,
         });
         const { payload_hash: payloadHash } = getSignableTradeResponse.data;
@@ -17190,7 +17196,6 @@ async function transfer$1({ request, transfersApi, starkSigner, user, guardianCl
             getSignableTransferRequest,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: signableResult.data.payload_hash,
         });
         const signableResultData = signableResult.data;
@@ -17241,7 +17246,6 @@ async function batchNftTransfer({ user, starkSigner, request, transfersApi, guar
             },
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: signableResult.data.signable_responses[0]?.payload_hash,
         });
         const requests = await Promise.all(signableResult.data.signable_responses.map(async (resp) => {
@@ -17321,6 +17325,7 @@ class PassportImxProvider {
         this.guardianClient = new GuardianClient({
             confirmationScreen,
             config,
+            authManager,
         });
         this.magicAdapter = magicAdapter;
         this.imxApiClients = imxApiClients;
@@ -17952,11 +17957,11 @@ const getEip155ChainId = (chainId) => `eip155:${chainId}`;
 class RelayerClient {
     config;
     jsonRpcProvider;
-    user;
-    constructor({ config, jsonRpcProvider, user }) {
+    authManager;
+    constructor({ config, jsonRpcProvider, authManager }) {
         this.config = config;
         this.jsonRpcProvider = jsonRpcProvider;
-        this.user = user;
+        this.authManager = authManager;
     }
     async postToRelayer(request) {
         const body = {
@@ -17964,10 +17969,11 @@ class RelayerClient {
             jsonrpc: '2.0',
             ...request,
         };
+        const user = await this.authManager.getUser();
         const response = await fetch(`${this.config.relayerUrl}/v1/transactions`, {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${this.user.accessToken}`,
+                Authorization: `Bearer ${user?.accessToken}`,
                 'Content-Type': 'application/json',
             },
             body: JSON.stringify(body),
@@ -18126,7 +18132,7 @@ const getMetaTransactions = async (metaTransaction, nonce, chainId, walletAddres
     }
     return [metaTransaction, feeMetaTransaction];
 };
-const sendTransaction$1 = ({ params, magicProvider, jsonRpcProvider, relayerClient, guardianClient, user, }) => guardianClient
+const sendTransaction$1 = ({ params, magicProvider, jsonRpcProvider, relayerClient, guardianClient, zkevmAddress, }) => guardianClient
     .withConfirmationScreen({ width: 480, height: 720 })(async () => {
     const transactionRequest = params[0];
     if (!transactionRequest.to) {
@@ -18136,7 +18142,7 @@ const sendTransaction$1 = ({ params, magicProvider, jsonRpcProvider, relayerClie
     const chainIdBigNumber = ethers.BigNumber.from(chainId);
     const magicWeb3Provider = new providers.Web3Provider(magicProvider);
     const signer = magicWeb3Provider.getSigner();
-    const nonce = await getNonce(jsonRpcProvider, user.zkEvm.ethAddress);
+    const nonce = await getNonce(jsonRpcProvider, zkevmAddress);
     const metaTransaction = {
         to: transactionRequest.to,
         data: transactionRequest.data,
@@ -18144,17 +18150,16 @@ const sendTransaction$1 = ({ params, magicProvider, jsonRpcProvider, relayerClie
         value: transactionRequest.value,
         revertOnError: true,
     };
-    const metaTransactions = await getMetaTransactions(metaTransaction, nonce, chainIdBigNumber, user.zkEvm.ethAddress, signer, relayerClient);
+    const metaTransactions = await getMetaTransactions(metaTransaction, nonce, chainIdBigNumber, zkevmAddress, signer, relayerClient);
     await guardianClient.validateEVMTransaction({
         chainId: getEip155ChainId(chainId),
         nonce: convertBigNumberishToString(nonce),
-        user,
         metaTransactions,
     });
     // NOTE: We sign again because we now are adding the fee transaction, so the
     // whole payload is different and needs a new signature.
-    const signedTransactions = await getSignedMetaTransactions(metaTransactions, nonce, chainIdBigNumber, user.zkEvm.ethAddress, signer);
-    const relayerId = await relayerClient.ethSendTransaction(user.zkEvm.ethAddress, signedTransactions);
+    const signedTransactions = await getSignedMetaTransactions(metaTransactions, nonce, chainIdBigNumber, zkevmAddress, signer);
+    const relayerId = await relayerClient.ethSendTransaction(zkevmAddress, signedTransactions);
     const retrieveRelayerTransaction = async () => {
         const tx = await relayerClient.imGetTransactionByHash(relayerId);
         // NOTE: The transaction hash is only available from the Relayer once the
@@ -18222,7 +18227,7 @@ const transformTypedData = (typedData, chainId) => {
     }
     return transformedTypedData;
 };
-const signTypedDataV4 = async ({ params, method, magicProvider, jsonRpcProvider, relayerClient, guardianClient, user, }) => guardianClient
+const signTypedDataV4 = async ({ params, method, magicProvider, jsonRpcProvider, relayerClient, guardianClient, }) => guardianClient
     .withConfirmationScreen({ width: 480, height: 730 })(async () => {
     const fromAddress = params[0];
     const typedDataParam = params[1];
@@ -18231,7 +18236,7 @@ const signTypedDataV4 = async ({ params, method, magicProvider, jsonRpcProvider,
     }
     const { chainId } = await jsonRpcProvider.ready;
     const typedData = transformTypedData(typedDataParam, chainId);
-    await guardianClient.validateMessage({ chainID: String(chainId), payload: typedData, user });
+    await guardianClient.validateMessage({ chainID: String(chainId), payload: typedData });
     const relayerSignature = await relayerClient.imSignTypedData(fromAddress, typedData);
     const magicWeb3Provider = new providers.Web3Provider(magicProvider);
     const signer = magicWeb3Provider.getSigner();
@@ -18249,7 +18254,7 @@ class ZkEvmProvider {
     guardianClient;
     relayerClient;
     magicProvider; // Used for signing
-    user;
+    zkevmAddress;
     isPassport = true;
     constructor({ authManager, magicAdapter, config, confirmationScreen, multiRollupApiClients, passportEventEmitter, }) {
         this.authManager = authManager;
@@ -18274,7 +18279,6 @@ class ZkEvmProvider {
     handleLogout = () => {
         const shouldEmitAccountsChanged = this.isLoggedIn();
         this.magicProvider = undefined;
-        this.user = undefined;
         this.relayerClient = undefined;
         this.guardianClient = undefined;
         if (shouldEmitAccountsChanged) {
@@ -18283,7 +18287,7 @@ class ZkEvmProvider {
     };
     isLoggedIn() {
         return this.magicProvider !== undefined
-            && this.user !== undefined
+            && this.zkevmAddress !== undefined
             && this.relayerClient !== undefined
             && this.guardianClient !== undefined;
     }
@@ -18291,7 +18295,7 @@ class ZkEvmProvider {
         switch (request.method) {
             case 'eth_requestAccounts': {
                 if (this.isLoggedIn()) {
-                    return [this.user.zkEvm.ethAddress];
+                    return [this.zkevmAddress];
                 }
                 const { magicProvider, user } = await loginZkEvmUser({
                     authManager: this.authManager,
@@ -18300,19 +18304,20 @@ class ZkEvmProvider {
                     multiRollupApiClients: this.multiRollupApiClients,
                     jsonRpcProvider: this.jsonRpcProvider,
                 });
-                this.user = user;
                 this.magicProvider = magicProvider;
                 this.relayerClient = new RelayerClient({
                     config: this.config,
                     jsonRpcProvider: this.jsonRpcProvider,
-                    user: this.user,
+                    authManager: this.authManager,
                 });
                 this.guardianClient = new GuardianClient({
                     confirmationScreen: this.confirmationScreen,
                     config: this.config,
+                    authManager: this.authManager,
                 });
-                this.eventEmitter.emit(ProviderEvent.ACCOUNTS_CHANGED, [this.user.zkEvm.ethAddress]);
-                return [this.user.zkEvm.ethAddress];
+                this.zkevmAddress = user.zkEvm.ethAddress;
+                this.eventEmitter.emit(ProviderEvent.ACCOUNTS_CHANGED, [user.zkEvm.ethAddress]);
+                return [user.zkEvm.ethAddress];
             }
             case 'eth_sendTransaction': {
                 if (!this.isLoggedIn()) {
@@ -18324,11 +18329,11 @@ class ZkEvmProvider {
                     guardianClient: this.guardianClient,
                     jsonRpcProvider: this.jsonRpcProvider,
                     relayerClient: this.relayerClient,
-                    user: this.user,
+                    zkevmAddress: this.zkevmAddress,
                 });
             }
             case 'eth_accounts': {
-                return this.isLoggedIn() ? [this.user.zkEvm.ethAddress] : [];
+                return this.zkevmAddress ? [this.zkevmAddress] : [];
             }
             case 'eth_signTypedData':
             case 'eth_signTypedData_v4': {
@@ -18341,7 +18346,6 @@ class ZkEvmProvider {
                     magicProvider: this.magicProvider,
                     jsonRpcProvider: this.jsonRpcProvider,
                     relayerClient: this.relayerClient,
-                    user: this.user,
                     guardianClient: this.guardianClient,
                 });
             }
@@ -37062,7 +37066,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.5.0';
+const SDK_VERSION = '1.5.2';
 let initialised = false;
 const isInitialised = () => initialised;
 const getReferrer = () => {
@@ -39881,6 +39885,9 @@ const MIN_MAX_HOPS = 1;
 const BASIS_POINT_PRECISION = 10000;
 // 10% maximum secondary fee
 const MAX_SECONDARY_FEE_BASIS_POINTS = 1000;
+// How much more gas does a swap with secondary fees cost?
+// This number is the average difference of a number of different swaps with different hop amounts, etc.
+const AVERAGE_SECONDARY_FEE_EXTRA_GAS = 50876;
 
 const quoteReturnMapping = {
     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -40301,6 +40308,59 @@ startTokenIn = tokenIn) => {
     return routes;
 };
 
+const IMMUTABLE_TESTNET_RPC_URL = 'https://rpc.testnet.immutable.com';
+const IMMUTABLE_TESTNET_CHAIN_ID = 13473;
+
+const IMMUTABLE_MAINNET_RPC_URL = 'https://rpc.immutable.com';
+const IMMUTABLE_MAINNET_CHAIN_ID = 13371;
+
+const NATIVE_IMX_IMMUTABLE_TESTNET = {
+    chainId: IMMUTABLE_TESTNET_CHAIN_ID,
+    decimals: 18,
+    symbol: 'tIMX',
+    name: 'Immutable Testnet Token',
+    type: 'native',
+};
+const WIMX_IMMUTABLE_TESTNET = {
+    chainId: IMMUTABLE_TESTNET_CHAIN_ID,
+    address: '0x1CcCa691501174B4A623CeDA58cC8f1a76dc3439',
+    decimals: 18,
+    symbol: 'WIMX',
+    name: 'Wrapped Immutable Testnet Token',
+    type: 'erc20',
+};
+const IMMUTABLE_TESTNET_COMMON_ROUTING_TOKENS = [
+    WIMX_IMMUTABLE_TESTNET,
+];
+
+const NATIVE_IMX_IMMUTABLE_MAINNET = {
+    chainId: IMMUTABLE_MAINNET_CHAIN_ID,
+    decimals: 18,
+    symbol: 'IMX',
+    name: 'Immutable Token',
+    type: 'native',
+};
+const WIMX_IMMUTABLE_MAINNET = {
+    chainId: IMMUTABLE_MAINNET_CHAIN_ID,
+    address: '0x3a0c2ba54d6cbd3121f01b96dfd20e99d1696c9d',
+    decimals: 18,
+    symbol: 'WIMX',
+    name: 'Wrapped Immutable Token',
+    type: 'erc20',
+};
+const ETH_IMMUTABLE_MAINNET = {
+    chainId: IMMUTABLE_MAINNET_CHAIN_ID,
+    address: '0x52a6c53869ce09a731cd772f245b97a4401d3348',
+    decimals: 18,
+    symbol: 'ETH',
+    name: 'Ethereum',
+    type: 'erc20',
+};
+const IMMUTABLE_MAINNET_COMMON_ROUTING_TOKENS = [
+    WIMX_IMMUTABLE_MAINNET,
+    ETH_IMMUTABLE_MAINNET,
+];
+
 const getFeeData = async (provider) => {
     const [block, maxPriorityFeePerGas] = await Promise.all([
         provider.getBlock('latest'),
@@ -40336,9 +40396,13 @@ const fetchGasPrice = async (provider, nativeToken) => {
  * @param {BigNumber} gasEstimate - The total gas units that will be used for the transaction
  * @returns - The cost of the transaction in the gas token's smallest denomination (e.g. WEI)
  */
-const calculateGasFee = (gasPrice, gasEstimate) => 
-// eslint-disable-next-line implicit-arrow-linebreak
-newAmount(gasEstimate.mul(gasPrice.value), gasPrice.token);
+const calculateGasFee = (hasSecondaryFees, gasPrice, gasEstimate) => {
+    const baseGasFee = newAmount(gasEstimate.mul(gasPrice.value), gasPrice.token);
+    if (!hasSecondaryFees)
+        return baseGasFee;
+    return newAmount(baseGasFee.value.add(gasPrice.value.mul(AVERAGE_SECONDARY_FEE_EXTRA_GAS)), gasPrice.token);
+    // eslint-disable-next-line implicit-arrow-linebreak
+};
 
 /**
  * Check if the spender needs approval for the token
@@ -40425,7 +40489,7 @@ const getApproval = async (provider, ownerAddress, preparedApproval, gasPrice) =
         return null;
     }
     const gasEstimate = await getApproveGasEstimate(provider, ownerAddress, preparedApproval.spender, preparedApproval.amount.token.address);
-    const gasFeeEstimate = gasPrice ? calculateGasFee(gasPrice, gasEstimate) : null;
+    const gasFeeEstimate = gasPrice ? calculateGasFee(false, gasPrice, gasEstimate) : null;
     return {
         transaction: approveTransaction,
         gasFeeEstimate: gasFeeEstimate ? toPublicAmount(gasFeeEstimate) : null,
@@ -40574,59 +40638,6 @@ const IMX_WRAP_GAS_COST = 45038;
 // to avoid an extra remote call.
 const IMX_UNWRAP_GAS_COST = 35216;
 
-const IMMUTABLE_TESTNET_RPC_URL = 'https://rpc.testnet.immutable.com';
-const IMMUTABLE_TESTNET_CHAIN_ID = 13473;
-
-const IMMUTABLE_MAINNET_RPC_URL = 'https://rpc.immutable.com';
-const IMMUTABLE_MAINNET_CHAIN_ID = 13371;
-
-const NATIVE_IMX_IMMUTABLE_TESTNET = {
-    chainId: IMMUTABLE_TESTNET_CHAIN_ID,
-    decimals: 18,
-    symbol: 'tIMX',
-    name: 'Immutable Testnet Token',
-    type: 'native',
-};
-const WIMX_IMMUTABLE_TESTNET = {
-    chainId: IMMUTABLE_TESTNET_CHAIN_ID,
-    address: '0x1CcCa691501174B4A623CeDA58cC8f1a76dc3439',
-    decimals: 18,
-    symbol: 'WIMX',
-    name: 'Wrapped Immutable Testnet Token',
-    type: 'erc20',
-};
-const IMMUTABLE_TESTNET_COMMON_ROUTING_TOKENS = [
-    WIMX_IMMUTABLE_TESTNET,
-];
-
-const NATIVE_IMX_IMMUTABLE_MAINNET = {
-    chainId: IMMUTABLE_MAINNET_CHAIN_ID,
-    decimals: 18,
-    symbol: 'IMX',
-    name: 'Immutable Token',
-    type: 'native',
-};
-const WIMX_IMMUTABLE_MAINNET = {
-    chainId: IMMUTABLE_MAINNET_CHAIN_ID,
-    address: '0x3a0c2ba54d6cbd3121f01b96dfd20e99d1696c9d',
-    decimals: 18,
-    symbol: 'WIMX',
-    name: 'Wrapped Immutable Token',
-    type: 'erc20',
-};
-const ETH_IMMUTABLE_MAINNET = {
-    chainId: IMMUTABLE_MAINNET_CHAIN_ID,
-    address: '0x52a6c53869ce09a731cd772f245b97a4401d3348',
-    decimals: 18,
-    symbol: 'ETH',
-    name: 'Ethereum',
-    type: 'erc20',
-};
-const IMMUTABLE_MAINNET_COMMON_ROUTING_TOKENS = [
-    WIMX_IMMUTABLE_MAINNET,
-    ETH_IMMUTABLE_MAINNET,
-];
-
 const zeroNativeCurrencyValue = '0x00';
 const multicallWithDeadlineFunctionSignature = 'multicall(uint256,bytes[])';
 function buildSinglePoolSwap(tokenIn, tokenOut, recipient, trade, route, amountIn, amountOut, routerContract, paymentsContract) {
@@ -40867,8 +40878,8 @@ const getSwapRecipient = (tokenOut, fromAddress, routerContractAddress, secondar
 function getSwap(tokenIn, tokenOut, adjustedQuote, fromAddress, slippage, deadline, routerContractAddress, secondaryFeesContractAddress, gasPrice, secondaryFees) {
     const swapRecipient = getSwapRecipient(tokenOut, fromAddress, routerContractAddress, secondaryFeesContractAddress, secondaryFees);
     const { calldata, maximumAmountIn } = createSwapParameters(tokenIn, tokenOut, adjustedQuote, swapRecipient, slippage, deadline, secondaryFees);
-    // TODO: Add additional gas fee estimates for secondary fees
-    const gasFeeEstimate = gasPrice ? calculateGasFee(gasPrice, adjustedQuote.gasEstimate) : null;
+    const hasSecondaryFees = secondaryFees.length > 0;
+    const gasFeeEstimate = gasPrice ? calculateGasFee(hasSecondaryFees, gasPrice, adjustedQuote.gasEstimate) : null;
     const transactionValue = getTransactionValue(tokenIn, maximumAmountIn);
     return {
         transaction: {
@@ -41090,7 +41101,7 @@ class Exchange {
     async getUnwrapTransaction(fromAddress, tokenAmount, wimxInterface, gasPrice) {
         const calldata = wimxInterface.encodeFunctionData('withdraw', [tokenAmount]);
         const gasEstimate = ethers.ethers.BigNumber.from(IMX_UNWRAP_GAS_COST);
-        const gasFeeEstimate = gasPrice ? toPublicAmount(calculateGasFee(gasPrice, gasEstimate)) : null;
+        const gasFeeEstimate = gasPrice ? toPublicAmount(calculateGasFee(false, gasPrice, gasEstimate)) : null;
         // This transaction is for calling calling `withdraw` on the WETH/WIMX contract.
         const transactionDetails = {
             transaction: {
@@ -41108,7 +41119,7 @@ class Exchange {
     getWrapTransaction(fromAddress, tokenAmount, wimxInterface, gasPrice) {
         const calldata = wimxInterface.encodeFunctionData('deposit');
         const gasEstimate = ethers.ethers.BigNumber.from(IMX_WRAP_GAS_COST);
-        const gasFeeEstimate = gasPrice ? toPublicAmount(calculateGasFee(gasPrice, gasEstimate)) : null;
+        const gasFeeEstimate = gasPrice ? toPublicAmount(calculateGasFee(false, gasPrice, gasEstimate)) : null;
         // This transaction is for calling calling `deposit` on the WETH/WIMX contract.
         const transactionDetails = {
             transaction: {
@@ -42170,7 +42181,7 @@ const IMMUTABLE_ZKVEM_GAS_OVERRIDES = {
     maxPriorityFeePerGas: ethers.BigNumber.from(10e9),
 };
 
-const SDK_VERSION_MARKER = '1.5.0';
+const SDK_VERSION_MARKER = '1.5.2';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 
@@ -45432,9 +45443,7 @@ const buy = async (config, provider, orders, overrides = {
     };
 };
 
-const cancel = async (config, provider, orderIds, overrides = {
-    waitFulfillmentSettlements: true,
-}) => {
+const cancelOnChain = async (config, orderbook, provider, orderIds, waitFulfillmentSettlements) => {
     let unsignedCancelOrderTransaction;
     if (orderIds.length === 0) {
         throw new CheckoutError('No orderIds were provided to the orderIds array. Please provide at least one orderId.', CheckoutErrorType.CANCEL_ORDER_LISTING_ERROR);
@@ -45443,7 +45452,6 @@ const cancel = async (config, provider, orderIds, overrides = {
     const orderId = orderIds[0];
     try {
         const offererAddress = await measureAsyncExecution(config, 'Time to get the address from the provider', provider.getSigner().getAddress());
-        const orderbook = createOrderbookInstance(config);
         const cancelOrderResponse = await measureAsyncExecution(config, 'Time to get the cancel order from the orderbook', orderbook.cancelOrdersOnChain([orderId], offererAddress));
         unsignedCancelOrderTransaction = await cancelOrderResponse.cancellationAction.buildTransaction();
     }
@@ -45453,7 +45461,7 @@ const cancel = async (config, provider, orderIds, overrides = {
             error: err,
         });
     }
-    if (overrides.waitFulfillmentSettlements) {
+    if (waitFulfillmentSettlements) {
         const result = await signFulfillmentTransactions(provider, [unsignedCancelOrderTransaction]);
         if (result.type === SignTransactionStatusType.FAILED) {
             return {
@@ -45481,6 +45489,56 @@ const cancel = async (config, provider, orderIds, overrides = {
         transactions,
     };
 };
+const gaslessCancel = async (orderbook, provider, orderIds) => {
+    try {
+        const signer = provider.getSigner();
+        const address = await signer.getAddress();
+        const { signableAction } = await orderbook.prepareOrderCancellations(orderIds);
+        // eslint-disable-next-line no-underscore-dangle
+        const signedMessage = await signer._signTypedData(signableAction.message.domain, signableAction.message.types, signableAction.message.value);
+        const { result } = await orderbook.cancelOrders(orderIds, address, signedMessage);
+        const successfulCancellations = [];
+        const failedCancellations = [];
+        const pendingCancellations = [];
+        for (const success of result.successful_cancellations) {
+            successfulCancellations.push({
+                orderId: success,
+            });
+        }
+        for (const failed of result.failed_cancellations) {
+            failedCancellations.push({
+                orderId: failed.order,
+                reason: failed.reason_code,
+            });
+        }
+        for (const pending of result.pending_cancellations) {
+            pendingCancellations.push({
+                orderId: pending,
+            });
+        }
+        return {
+            successfulCancellations,
+            failedCancellations,
+            pendingCancellations,
+        };
+    }
+    catch (err) {
+        throw new CheckoutError('An error occurred while cancelling the order listing', CheckoutErrorType.CANCEL_ORDER_LISTING_ERROR, {
+            orderIds,
+            error: err,
+        });
+    }
+};
+const cancel = async (config, provider, orderIds, overrides = {
+    waitFulfillmentSettlements: true,
+    useGaslessCancel: false,
+}) => {
+    const orderbook = createOrderbookInstance(config);
+    if (overrides.useGaslessCancel) {
+        return await gaslessCancel(orderbook, provider, orderIds);
+    }
+    return await cancelOnChain(config, orderbook, provider, orderIds, overrides.waitFulfillmentSettlements ?? true);
+};
 
 const getERC721Requirement = (id, contractAddress, spenderAddress) => ({
     type: ItemType.ERC721,