@imtbl/sdk 0.17.5 → 0.18.0

package/dist/index.js

@@ -11,7 +11,7 @@ import * as encUtils from 'enc-utils';
 import { Web3Provider, JsonRpcProvider } from '@ethersproject/providers';
 import { EventEmitter } from 'events';
 import { walletContracts } from '@0xsequence/abi';
-import { encodeSignature } from '@0xsequence/config';
+import { encodeSignature, decodeSignature } from '@0xsequence/config';
 import FormData$2 from 'form-data';
 import { Seaport as Seaport$1 } from '@opensea/seaport-js';
 import { parseUnits } from '@ethersproject/units';
@@ -2702,7 +2702,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.17.5' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.18.0' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -2762,7 +2762,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.17.5',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.18.0',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -3048,7 +3048,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.17.5',
+    sdkVersion: 'ts-immutable-sdk-0.18.0',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -6780,6 +6780,8 @@ var globalAxios = axios;
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+// Some imports not used depending on template conditions
+// @ts-ignore
 const BASE_PATH = "https://guardian.sandbox.imtbl.com".replace(/\/+$/, "");
 /**
  *
@@ -6807,10 +6809,10 @@ class BaseAPI {
  */
 class RequiredError extends Error {
     field;
+    name = "RequiredError";
     constructor(field, msg) {
         super(msg);
         this.field = field;
-        this.name = "RequiredError";
     }
 }
 
@@ -6855,8 +6857,6 @@ const setBearerAuthToObject = async function (object, configuration) {
     }
 };
 function setFlattenedQueryParams(urlSearchParams, parameter, key = "") {
-    if (parameter == null)
-        return;
     if (typeof parameter === "object") {
         if (Array.isArray(parameter)) {
             parameter.forEach(item => setFlattenedQueryParams(urlSearchParams, item, key));
@@ -6914,6 +6914,208 @@ const createRequestFunction = function (axiosArgs, globalAxios, BASE_PATH, confi
     };
 };
 
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Guardian
+ * Guardian API
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Contact: support@immutable.com
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/**
+ * MessagesApi - axios parameter creator
+ * @export
+ */
+const MessagesApiAxiosParamCreator = function (configuration) {
+    return {
+        /**
+         * Approve a pending evm message
+         * @summary Approve a pending evm message
+         * @param {string} messageID id for the message
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        approvePendingMessage: async (messageID, options = {}) => {
+            // verify required parameter 'messageID' is not null or undefined
+            assertParamExists('approvePendingMessage', 'messageID', messageID);
+            const localVarPath = `/guardian/v1/messages/{messageID}/approve`
+                .replace(`{${"messageID"}}`, encodeURIComponent(String(messageID)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options };
+            const localVarHeaderParameter = {};
+            const localVarQueryParameter = {};
+            // authentication BearerAuth required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration);
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * Check if a given message is valid  for EVM
+         * @summary Evaluate an evm message to sign
+         * @param {MessageEvaluationRequest} messageEvaluationRequest Specifies the kind of transaction
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        evaluateMessage: async (messageEvaluationRequest, options = {}) => {
+            // verify required parameter 'messageEvaluationRequest' is not null or undefined
+            assertParamExists('evaluateMessage', 'messageEvaluationRequest', messageEvaluationRequest);
+            const localVarPath = `/guardian/v1/messages/evaluate`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options };
+            const localVarHeaderParameter = {};
+            const localVarQueryParameter = {};
+            // authentication BearerAuth required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration);
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
+            localVarRequestOptions.data = serializeDataIfNeeded(messageEvaluationRequest, localVarRequestOptions, configuration);
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * Get an evm message by id
+         * @summary Info for a specific evm message
+         * @param {string} messageID The id of the evm message
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getMessageByID: async (messageID, options = {}) => {
+            // verify required parameter 'messageID' is not null or undefined
+            assertParamExists('getMessageByID', 'messageID', messageID);
+            const localVarPath = `/guardian/v1/messages/{messageID}`
+                .replace(`{${"messageID"}}`, encodeURIComponent(String(messageID)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options };
+            const localVarHeaderParameter = {};
+            const localVarQueryParameter = {};
+            // authentication BearerAuth required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration);
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = { ...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers };
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+    };
+};
+/**
+ * MessagesApi - functional programming interface
+ * @export
+ */
+const MessagesApiFp = function (configuration) {
+    const localVarAxiosParamCreator = MessagesApiAxiosParamCreator(configuration);
+    return {
+        /**
+         * Approve a pending evm message
+         * @summary Approve a pending evm message
+         * @param {string} messageID id for the message
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async approvePendingMessage(messageID, options) {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.approvePendingMessage(messageID, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * Check if a given message is valid  for EVM
+         * @summary Evaluate an evm message to sign
+         * @param {MessageEvaluationRequest} messageEvaluationRequest Specifies the kind of transaction
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async evaluateMessage(messageEvaluationRequest, options) {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.evaluateMessage(messageEvaluationRequest, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+        /**
+         * Get an evm message by id
+         * @summary Info for a specific evm message
+         * @param {string} messageID The id of the evm message
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async getMessageByID(messageID, options) {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getMessageByID(messageID, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+    };
+};
+/**
+ * MessagesApi - object-oriented interface
+ * @export
+ * @class MessagesApi
+ * @extends {BaseAPI}
+ */
+class MessagesApi extends BaseAPI {
+    /**
+     * Approve a pending evm message
+     * @summary Approve a pending evm message
+     * @param {MessagesApiApprovePendingMessageRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof MessagesApi
+     */
+    approvePendingMessage(requestParameters, options) {
+        return MessagesApiFp(this.configuration).approvePendingMessage(requestParameters.messageID, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * Check if a given message is valid  for EVM
+     * @summary Evaluate an evm message to sign
+     * @param {MessagesApiEvaluateMessageRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof MessagesApi
+     */
+    evaluateMessage(requestParameters, options) {
+        return MessagesApiFp(this.configuration).evaluateMessage(requestParameters.messageEvaluationRequest, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * Get an evm message by id
+     * @summary Info for a specific evm message
+     * @param {MessagesApiGetMessageByIDRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof MessagesApi
+     */
+    getMessageByID(requestParameters, options) {
+        return MessagesApiFp(this.configuration).getMessageByID(requestParameters.messageID, options).then((request) => request(this.axios, this.basePath));
+    }
+}
+
 /* tslint:disable */
 /* eslint-disable */
 /**
@@ -6937,7 +7139,7 @@ const TransactionsApiAxiosParamCreator = function (configuration) {
          * Approve a pending transaction
          * @summary Approve a pending transaction given chain
          * @param {string} payloadHash Hash for the payload
-         * @param {TransactionApprovalRequest} transactionApprovalRequest request body for approving a pending transactio
+         * @param {TransactionApprovalRequest} transactionApprovalRequest request body for approving a pending transaction
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -7062,7 +7264,7 @@ const TransactionsApiFp = function (configuration) {
          * Approve a pending transaction
          * @summary Approve a pending transaction given chain
          * @param {string} payloadHash Hash for the payload
-         * @param {TransactionApprovalRequest} transactionApprovalRequest request body for approving a pending transactio
+         * @param {TransactionApprovalRequest} transactionApprovalRequest request body for approving a pending transaction
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -7828,18 +8030,18 @@ const transformGuardianTransactions = (txs) => {
 };
 class GuardianClient {
     transactionAPI;
+    messageAPI;
     confirmationScreen;
     // TODO: ID-977, make this rollup agnostic
     imxEtherAddress;
     crossSdkBridgeEnabled;
     constructor({ accessToken, confirmationScreen, imxEtherAddress, config, }) {
+        const guardianConfiguration = new Configuration({ accessToken, basePath: config.imxPublicApiDomain });
         this.confirmationScreen = confirmationScreen;
-        this.transactionAPI = new TransactionsApi(new Configuration({
-            accessToken,
-            basePath: config.imxPublicApiDomain,
-        }));
+        this.transactionAPI = new TransactionsApi(new Configuration(guardianConfiguration));
         this.imxEtherAddress = imxEtherAddress;
         this.crossSdkBridgeEnabled = config.crossSdkBridgeEnabled;
+        this.messageAPI = new MessagesApi(guardianConfiguration);
     }
     /**
      * Open confirmation screen and close it automatically if the
@@ -7938,6 +8140,31 @@ class GuardianClient {
             this.confirmationScreen.closeWindow();
         }
     }
+    async evaluateMessage({ chainID, payload, user }) {
+        try {
+            const messageEvalResponse = await this.messageAPI.evaluateMessage({ messageEvaluationRequest: { chainID, payload } }, { headers: { Authorization: `Bearer ${user.accessToken}` } });
+            return messageEvalResponse.data;
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            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 });
+        if (confirmationRequired && this.crossSdkBridgeEnabled) {
+            throw new JsonRpcError(RpcErrorCode.TRANSACTION_REJECTED, transactionRejectedCrossSdkBridgeError);
+        }
+        if (confirmationRequired && !!messageId) {
+            const confirmationResult = await this.confirmationScreen.requestMessageConfirmation(messageId);
+            if (!confirmationResult.confirmed) {
+                throw new JsonRpcError(RpcErrorCode.TRANSACTION_REJECTED, 'Signature rejected by user');
+            }
+        }
+        else {
+            this.confirmationScreen.closeWindow();
+        }
+    }
 }
 
 var PassportEvents;
@@ -8565,6 +8792,8 @@ var ReceiveMessage;
     ReceiveMessage["CONFIRMATION_WINDOW_READY"] = "confirmation_window_ready";
     ReceiveMessage["TRANSACTION_CONFIRMED"] = "transaction_confirmed";
     ReceiveMessage["TRANSACTION_ERROR"] = "transaction_error";
+    ReceiveMessage["MESSAGE_CONFIRMED"] = "message_confirmed";
+    ReceiveMessage["MESSAGE_REJECTED"] = "message_rejected";
 })(ReceiveMessage || (ReceiveMessage = {}));
 const PASSPORT_EVENT_TYPE = 'imx_passport_confirmation';
 
@@ -8618,11 +8847,11 @@ class ConfirmationScreen {
                         reject(new Error('Unsupported message type'));
                 }
             };
-            window.addEventListener('message', messageHandler);
             if (!this.confirmationWindow) {
                 resolve({ confirmed: false });
                 return;
             }
+            window.addEventListener('message', messageHandler);
             let href = '';
             if (chainType === TransactionApprovalRequestChainTypeEnum.Starkex) {
                 // eslint-disable-next-line max-len
@@ -8632,15 +8861,39 @@ class ConfirmationScreen {
                 // eslint-disable-next-line max-len
                 href = `${this.config.passportDomain}/transaction-confirmation/zkevm?transactionId=${transactionId}&imxEtherAddress=${imxEtherAddress}&chainType=evm&chainId=${chainId}`;
             }
-            this.confirmationWindow.location.href = href;
-            // https://stackoverflow.com/questions/9388380/capture-the-close-event-of-popup-window-in-javascript/48240128#48240128
-            const timer = setInterval(() => {
-                if (this.confirmationWindow?.closed) {
-                    clearInterval(timer);
-                    window.removeEventListener('message', messageHandler);
-                    resolve({ confirmed: false });
+            this.showConfirmationScreen(href, messageHandler, resolve);
+        });
+    }
+    requestMessageConfirmation(messageId) {
+        return new Promise((resolve, reject) => {
+            const messageHandler = ({ data, origin }) => {
+                if (origin !== this.config.passportDomain
+                    || data.eventType !== PASSPORT_EVENT_TYPE) {
+                    return;
+                }
+                switch (data.messageType) {
+                    case ReceiveMessage.CONFIRMATION_WINDOW_READY: {
+                        break;
+                    }
+                    case ReceiveMessage.MESSAGE_CONFIRMED: {
+                        resolve({ confirmed: true });
+                        break;
+                    }
+                    case ReceiveMessage.MESSAGE_REJECTED: {
+                        reject(new Error('Message rejected'));
+                        break;
+                    }
+                    default:
+                        reject(new Error('Unsupported message type'));
                 }
-            }, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+            };
+            if (!this.confirmationWindow) {
+                resolve({ confirmed: false });
+                return;
+            }
+            window.addEventListener('message', messageHandler);
+            const href = `${this.config.passportDomain}/transaction-confirmation/zkevm/message?messageID=${messageId}`;
+            this.showConfirmationScreen(href, messageHandler, resolve);
         });
     }
     loading(popupOptions) {
@@ -8658,6 +8911,17 @@ class ConfirmationScreen {
     closeWindow() {
         this.confirmationWindow?.close();
     }
+    showConfirmationScreen(href, messageHandler, resolve) {
+        this.confirmationWindow.location.href = href;
+        // https://stackoverflow.com/questions/9388380/capture-the-close-event-of-popup-window-in-javascript/48240128#48240128
+        const timer = setInterval(() => {
+            if (this.confirmationWindow?.closed) {
+                clearInterval(timer);
+                window.removeEventListener('message', messageHandler);
+                resolve({ confirmed: false });
+            }
+        }, CONFIRMATION_WINDOW_CLOSED_POLLING_DURATION);
+    }
 }
 
 var RelayerTransactionStatus;
@@ -8686,13 +8950,9 @@ class TypedEventEmitter {
     }
 }
 
-// These are ignored by the Relayer but for consistency we set them to the
-// appropriate values for a 1/1 wallet.
-//
-// Weight of a single signature in the multisig
-const SIGNATURE_WEIGHT = 1;
-// Total required weight in the multisig
-const SIGNATURE_THRESHOLD = 1;
+const SIGNATURE_WEIGHT = 1; // Weight of a single signature in the multi-sig
+const TRANSACTION_SIGNATURE_THRESHOLD = 1; // Total required weight in the multi-sig for a transaction
+const EIP712_SIGNATURE_THRESHOLD = 2; // Total required weight in the multi-sig for data signing
 const ETH_SIGN_FLAG = '02';
 const ETH_SIGN_PREFIX = '\x19\x01';
 const META_TRANSACTIONS_TYPE = `tuple(
@@ -8725,11 +8985,12 @@ const getNonce = async (jsonRpcProvider, smartContractWalletAddress) => {
     }
     return 0;
 };
+const encodeMessageSubDigest = (chainId, walletAddress, digest) => (ethers.utils.solidityPack(['string', 'uint256', 'address', 'bytes32'], [ETH_SIGN_PREFIX, chainId, walletAddress, digest]));
 const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walletAddress, signer) => {
     const normalisedMetaTransactions = getNormalisedTransactions(metaTransactions);
     // Get the hash
     const digest = digestOfTransactionsAndNonce(nonce, normalisedMetaTransactions);
-    const completePayload = ethers.utils.solidityPack(['string', 'uint256', 'address', 'bytes32'], [ETH_SIGN_PREFIX, chainId, walletAddress, digest]);
+    const completePayload = encodeMessageSubDigest(chainId, walletAddress, digest);
     const hash = ethers.utils.keccak256(completePayload);
     // Sign the digest
     const hashArray = ethers.utils.arrayify(hash);
@@ -8737,7 +8998,7 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     // Add metadata
     const encodedSignature = encodeSignature({
-        threshold: SIGNATURE_THRESHOLD,
+        threshold: TRANSACTION_SIGNATURE_THRESHOLD,
         signers: [
             {
                 weight: SIGNATURE_WEIGHT,
@@ -8753,6 +9014,35 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
         encodedSignature,
     ]);
 };
+const decodeRelayerTypedDataSignature = (relayerSignature) => {
+    const signatureWithThreshold = `0000${relayerSignature}`;
+    return decodeSignature(signatureWithThreshold);
+};
+const getSignedTypedData = async (typedData, relayerSignature, chainId, walletAddress, signer) => {
+    // Ethers auto-generates the EIP712Domain type in the TypedDataEncoder, and so it needs to be removed
+    const types = { ...typedData.types };
+    // @ts-ignore
+    delete types.EIP712Domain;
+    // eslint-disable-next-line no-underscore-dangle
+    const digest = ethers.utils._TypedDataEncoder.hash(typedData.domain, types, typedData.message);
+    const completePayload = encodeMessageSubDigest(chainId, walletAddress, digest);
+    const hash = ethers.utils.keccak256(completePayload);
+    // Sign the digest
+    const hashArray = ethers.utils.arrayify(hash);
+    const ethsigNoType = await signer.signMessage(hashArray);
+    const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
+    const { signers } = decodeRelayerTypedDataSignature(relayerSignature);
+    return encodeSignature({
+        threshold: EIP712_SIGNATURE_THRESHOLD,
+        signers: [
+            ...signers,
+            {
+                weight: SIGNATURE_WEIGHT,
+                signature: signedDigest,
+            },
+        ],
+    });
+};
 const getEip155ChainId = (chainId) => `eip155:${chainId}`;
 
 class RelayerClient {
@@ -8818,6 +9108,19 @@ class RelayerClient {
         const { result } = await this.postToRelayer(payload);
         return result;
     }
+    async imSignTypedData(address, eip712Payload) {
+        const { chainId } = await this.jsonRpcProvider.ready;
+        const payload = {
+            method: 'im_signTypedData',
+            params: [{
+                    address,
+                    eip712Payload,
+                    chainId: getEip155ChainId(chainId),
+                }],
+        };
+        const { result } = await this.postToRelayer(payload);
+        return result;
+    }
 }
 
 const MESSAGE_TO_SIGN = 'Only sign this message from Immutable Passport';
@@ -8958,6 +9261,60 @@ const sendTransaction = ({ params, magicProvider, jsonRpcProvider, relayerClient
     return relayerTransaction.hash;
 });
 
+const REQUIRED_TYPED_DATA_PROPERTIES = ['types', 'domain', 'primaryType', 'message'];
+const isValidTypedDataPayload = (typedData) => (REQUIRED_TYPED_DATA_PROPERTIES.every((key) => key in typedData));
+const transformTypedData = (typedData, chainId) => {
+    let transformedTypedData;
+    if (typeof typedData === 'string') {
+        try {
+            transformedTypedData = JSON.parse(typedData);
+        }
+        catch (err) {
+            throw new JsonRpcError(RpcErrorCode.INVALID_PARAMS, `Failed to parse typed data JSON: ${err}`);
+        }
+    }
+    else if (typeof typedData === 'object') {
+        transformedTypedData = typedData;
+    }
+    else {
+        throw new JsonRpcError(RpcErrorCode.INVALID_PARAMS, `Invalid typed data argument: ${typedData}`);
+    }
+    if (!isValidTypedDataPayload(transformedTypedData)) {
+        throw new JsonRpcError(RpcErrorCode.INVALID_PARAMS, `Invalid typed data argument. The following properties are required: ${REQUIRED_TYPED_DATA_PROPERTIES.join(', ')}`);
+    }
+    const providedChainId = transformedTypedData.domain?.chainId;
+    if (providedChainId) {
+        // domain.chainId (if defined) can be a number, string, or hex value, but the relayer & guardian only accept a number.
+        if (typeof providedChainId === 'string') {
+            if (providedChainId.startsWith('0x')) {
+                transformedTypedData.domain.chainId = parseInt(providedChainId, 16);
+            }
+            else {
+                transformedTypedData.domain.chainId = parseInt(providedChainId, 10);
+            }
+        }
+        if (transformedTypedData.domain.chainId !== chainId) {
+            throw new JsonRpcError(RpcErrorCode.INVALID_PARAMS, `Invalid chainId, expected ${chainId}`);
+        }
+    }
+    return transformedTypedData;
+};
+const signTypedDataV4 = async ({ params, method, magicProvider, jsonRpcProvider, relayerClient, guardianClient, user, }) => guardianClient
+    .withConfirmationScreen({ width: 480, height: 730 })(async () => {
+    const fromAddress = params[0];
+    const typedDataParam = params[1];
+    if (!fromAddress || !typedDataParam) {
+        throw new JsonRpcError(RpcErrorCode.INVALID_PARAMS, `${method} requires an address and a typed data JSON`);
+    }
+    const { chainId } = await jsonRpcProvider.ready;
+    const typedData = transformTypedData(typedDataParam, chainId);
+    await guardianClient.validateMessage({ chainID: String(chainId), payload: typedData, user });
+    const relayerSignature = await relayerClient.imSignTypedData(fromAddress, typedData);
+    const magicWeb3Provider = new Web3Provider(magicProvider);
+    const signer = magicWeb3Provider.getSigner();
+    return getSignedTypedData(typedData, relayerSignature, BigNumber$1.from(chainId), fromAddress, signer);
+});
+
 class ZkEvmProvider {
     authManager;
     config;
@@ -9041,6 +9398,21 @@ class ZkEvmProvider {
             case 'eth_accounts': {
                 return this.isLoggedIn() ? [this.user.zkEvm.ethAddress] : [];
             }
+            case 'eth_signTypedData':
+            case 'eth_signTypedData_v4': {
+                if (!this.isLoggedIn()) {
+                    throw new JsonRpcError(ProviderErrorCode.UNAUTHORIZED, 'Unauthorised - call eth_requestAccounts first');
+                }
+                return signTypedDataV4({
+                    method: request.method,
+                    params: request.params || [],
+                    magicProvider: this.magicProvider,
+                    jsonRpcProvider: this.jsonRpcProvider,
+                    relayerClient: this.relayerClient,
+                    user: this.user,
+                    guardianClient: this.guardianClient,
+                });
+            }
             // Pass through methods
             case 'eth_gasPrice':
             case 'eth_getBalance':
@@ -29414,8 +29786,8 @@ const $7d1bfafb81e64d74$export$3a4140bd9e983e4e = async (provider, insufficientI
 
 
 
-const $1fda5c40669a566d$export$1fac8e857d728583 = async ()=>true;
-const $1fda5c40669a566d$export$2e83e9eeaf217e20 = async ()=>true;
+const $1fda5c40669a566d$export$1fac8e857d728583 = async ()=>false;
+const $1fda5c40669a566d$export$2e83e9eeaf217e20 = async ()=>false;
 
 
 const $7f2e17f026d4fc8d$var$isPassportProvider = (provider)=>(provider.provider?.isPassport === true) ?? false;
@@ -29598,6 +29970,24 @@ const $07ac9c0576988336$export$a3dd181de896b7c7 = async (config, readOnlyProvide
 
 
 
+
+const $5a5ccedc98d53d25$var$filterTokens = (allowedTokens, balances)=>{
+    if (balances && balances.success) return allowedTokens.filter((token)=>{
+        if ("address" in token) return balances.balances.find((balance)=>balance.token.address === token.address && balance.balance.gt(0));
+        return balances.balances.find((balance)=>!("address" in balance.token) && balance.balance.gt(0));
+    });
+    return [];
+};
+const $5a5ccedc98d53d25$export$d744af9f1c0712bc = async (config, tokenBalances, availableRoutingOptions)=>{
+    if (availableRoutingOptions.bridge) {
+        const allowedTokens = (await config.remote.getConfig("bridge"))?.tokens ?? [];
+        const balances = tokenBalances.get(($4013c5c91bb535f6$export$9b794d067cdd1af6)(config));
+        return $5a5ccedc98d53d25$var$filterTokens(allowedTokens, balances);
+    }
+    return [];
+};
+
+
 const $fa9ac5bfdbbf9dfa$export$9994ad18c2f0e665 = (balances, totalFees)=>{
     const balance = ($f730af3b727f04ac$export$22fea095b15361de)(balances);
     return balance.gte(totalFees);
@@ -29656,15 +30046,18 @@ const $fa9ac5bfdbbf9dfa$export$ddc7ba2b57d7c5fa = async (config, readOnlyProvide
         chainId: chainId.toString()
     });
     // If no balances on layer 1 then Bridge cannot be an option
-    if (tokenBalanceResult === undefined || tokenBalanceResult.success === false) throw new ($a8bc256d81a5e2c1$export$b722478a3cbfa3bc)("Error getting balances", ($a8bc256d81a5e2c1$export$e3dc0620abde7f5a).GET_BALANCE_ERROR, {
-        chainId: chainId.toString()
-    });
-    if (tokenBalanceResult.balances.length === 0) return undefined;
+    if (tokenBalanceResult === undefined || tokenBalanceResult.success === false) return undefined;
+    const allowedTokenList = await ($5a5ccedc98d53d25$export$d744af9f1c0712bc)(config, balances, availableRoutingOptions);
+    if (allowedTokenList.length === 0) return undefined;
     const bridgeFeeEstimate = await $fa9ac5bfdbbf9dfa$export$da05aed50d75046(config, readOnlyProviders, feeEstimates);
     // If the user has no ETH to cover the bridge fees or approval fees then bridge cannot be an option
     if (!$fa9ac5bfdbbf9dfa$export$9994ad18c2f0e665(tokenBalanceResult, bridgeFeeEstimate)) return undefined;
     const l1address = await $fa9ac5bfdbbf9dfa$export$952cdf461a00a8c6(config, balanceRequirement);
     if (l1address === "") return undefined;
+    // Ensure l1address is in the allowed token list
+    if (l1address === ($823db9fb0ca4bc15$export$c37d8687c27b9660)) {
+        if (!allowedTokenList.find((token)=>!("address" in token))) return undefined;
+    } else if (!allowedTokenList.find((token)=>token.address === l1address)) return undefined;
     const gasForApproval = await ($07ac9c0576988336$export$a3dd181de896b7c7)(config, readOnlyProviders, l1provider, depositorAddress, l1address, balanceRequirement.delta.balance);
     if (!$fa9ac5bfdbbf9dfa$export$9994ad18c2f0e665(tokenBalanceResult, gasForApproval.add(bridgeFeeEstimate))) return undefined;
     // If the L1 representation of the requirement is ETH then find the ETH balance and check if the balance covers the delta
@@ -29720,7 +30113,6 @@ const $c16168a9c28ae4fd$export$92606e71d0a264ff = async (config, ownerAddress, b
         });
     }
     const tokenBalances = await ($33acec7b4a26c053$export$23ddeb2642d2f9d)(config, readOnlyProviders, ownerAddress, availableRoutingOptions);
-    // Get allowed tokens?
     // Bridge and swap fee cache
     const feeEstimates = new Map();
     // Ensures only 1 balance requirement is insufficient otherwise one bridge route cannot be recommended
@@ -30467,31 +30859,30 @@ var checkout_sdk = /*#__PURE__*/Object.freeze({
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
-const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.17.5";
+const $d663162fd5a0853f$export$38a083d9fb5551ca = "0.18.0";
 const $d663162fd5a0853f$export$83bf90b30cdfd29f = ()=>false;
 const $d663162fd5a0853f$export$1169f5475725171b = ()=>$d663162fd5a0853f$export$38a083d9fb5551ca;
 
 
 function $430e3eda76fa4d5f$export$46b1ae20f762ad4c(version) {
     const defaultPackageVersion = ($d663162fd5a0853f$export$1169f5475725171b)();
-    if (version === undefined) return defaultPackageVersion;
-    // Pre-production release
-    // TODO: https://immutable.atlassian.net/browse/WT-1501
-    if (version.major === undefined || version.minor === undefined || version.patch === undefined || version.prerelease === undefined) return defaultPackageVersion;
-    if (version.major < 0) return defaultPackageVersion;
-    if (version.minor < 0) return defaultPackageVersion;
-    if (version.patch < 0) return defaultPackageVersion;
-    if (version.prerelease !== "alpha") return defaultPackageVersion;
+    if (version === undefined || version.major === undefined) return defaultPackageVersion;
+    if (!Number.isInteger(version.major) || version.major < 0) return defaultPackageVersion;
+    if (version.minor !== undefined && version.minor < 0) return defaultPackageVersion;
+    if (version.patch !== undefined && version.patch < 0) return defaultPackageVersion;
+    if (version.major === 0 && version.minor === undefined) return defaultPackageVersion;
+    if (version.major === 0 && version.minor === 0 && version.patch === undefined) return defaultPackageVersion;
+    if (version.major === 0 && version.minor === undefined && version.patch === undefined) return defaultPackageVersion;
     if (version.major === 0 && version.minor === 0 && version.patch === 0) return defaultPackageVersion;
-    let validatedVersion = defaultPackageVersion;
-    if (!Number.isNaN(version.major) && version.major >= 0) validatedVersion = version.major.toString();
-    if (!Number.isNaN(version.minor)) validatedVersion += `.${version.minor.toString()}`;
-    if (!Number.isNaN(version.patch)) validatedVersion += `.${version.patch.toString()}`;
-    // TODO: https://immutable.atlassian.net/browse/WT-1501
-    // Ensure this is gated by `version.prerelease !== undefined`
-    // once we go to prod with checkout.
-    validatedVersion += `-${version.prerelease}`;
-    if (version.build !== undefined && version.build > 0) validatedVersion += `.${version.build}`;
+    let validatedVersion = version.major.toString();
+    if (version.minor === undefined) return validatedVersion;
+    if (Number.isInteger(version.minor)) validatedVersion += `.${version.minor.toString()}`;
+    if (version.patch === undefined) return validatedVersion;
+    if (Number.isInteger(version.patch)) validatedVersion += `.${version.patch.toString()}`;
+    if (version.prerelease === undefined || version.prerelease !== "alpha") return validatedVersion;
+    if (version.prerelease === "alpha") validatedVersion += `-${version.prerelease}`;
+    if (version.build === undefined) return validatedVersion;
+    if (Number.isInteger(version.build) && version.build >= 0) validatedVersion += `.${version.build.toString()}`;
     return validatedVersion;
 }
 function $430e3eda76fa4d5f$export$af210a0808087845(config) {