@imtbl/sdk 0.30.1 → 0.30.3

package/dist/index.cjs

@@ -13,7 +13,7 @@ var BN$2 = require('bn.js');
 var encUtils = require('enc-utils');
 var events = require('events');
 var abi = require('@0xsequence/abi');
-var config$1 = require('@0xsequence/config');
+var core = require('@0xsequence/core');
 var FormData$2 = require('form-data');
 var seaportJs = require('@opensea/seaport-js');
 var units = require('@ethersproject/units');
@@ -3792,7 +3792,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.30.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.30.3' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -3852,7 +3852,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.30.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.30.3',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4263,7 +4263,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.30.1',
+    sdkVersion: 'ts-immutable-sdk-0.30.3',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -8978,7 +8978,7 @@ class AuthManager {
                 nickname: idTokenPayload.nickname,
             },
         };
-        if (idTokenPayload?.passport.imx_eth_address) {
+        if (idTokenPayload?.passport?.imx_eth_address) {
             user.imx = {
                 ethAddress: idTokenPayload.passport.imx_eth_address,
                 starkAddress: idTokenPayload.passport.imx_stark_address,
@@ -9033,10 +9033,7 @@ class AuthManager {
                 try {
                     const tokenResponse = await this.getDeviceFlowToken(deviceCode);
                     const user = AuthManager.mapDeviceTokenResponseToDomainUserModel(tokenResponse);
-                    // Only persist credentials that contain the necessary data
-                    if (user.imx?.ethAddress && user.imx?.starkAddress && user.imx?.userAdminAddress) {
-                        this.deviceCredentialsManager.saveCredentials(tokenResponse);
-                    }
+                    this.deviceCredentialsManager.saveCredentials(tokenResponse);
                     return user;
                 }
                 catch (error) {
@@ -9108,10 +9105,7 @@ class AuthManager {
             }
             const tokenResponse = await this.getPKCEToken(authorizationCode, pkceData.verifier);
             const user = AuthManager.mapDeviceTokenResponseToDomainUserModel(tokenResponse);
-            // Only persist credentials that contain the necessary data
-            if (user.imx?.ethAddress && user.imx?.starkAddress && user.imx?.userAdminAddress) {
-                this.deviceCredentialsManager.saveCredentials(tokenResponse);
-            }
+            this.deviceCredentialsManager.saveCredentials(tokenResponse);
             return user;
         }, PassportErrorType.AUTHENTICATION_ERROR);
     }
@@ -9165,21 +9159,11 @@ class AuthManager {
             this.deviceCredentialsManager.clearCredentials();
         }, PassportErrorType.LOGOUT_ERROR);
     }
-    async loginSilent({ forceRefresh } = { forceRefresh: false }) {
-        // eslint-disable-next-line arrow-body-style
-        return withPassportError(async () => {
-            return this.getUser({ forceRefresh });
-        }, PassportErrorType.SILENT_LOGIN_ERROR);
-    }
     /**
      * Get the user from the cache or refresh the token if it's expired.
-     * @param forceRefresh If set to true, force an HTTP call to the OIDC server's authorization endpoint. This call will
-     * throw an error if there's no refresh token.
+     * return null if there's no refresh token.
      */
-    async getAuthenticatedUser({ forceRefresh = false }) {
-        if (forceRefresh) {
-            return this.refreshTokenAndUpdatePromise();
-        }
+    async getAuthenticatedUser() {
         const oidcUser = await this.userManager.getUser();
         if (!oidcUser)
             return null;
@@ -9191,6 +9175,9 @@ class AuthManager {
         }
         return null;
     }
+    async forceUserRefresh() {
+        return this.refreshTokenAndUpdatePromise();
+    }
     /**
      * Refreshes the token and returns the user.
      * If the token is already being refreshed, returns the existing promise.
@@ -9217,9 +9204,9 @@ class AuthManager {
         });
         return this.refreshingPromise;
     }
-    async getUser({ forceRefresh } = { forceRefresh: false }) {
+    async getUser() {
         return withPassportError(async () => {
-            const user = await this.getAuthenticatedUser({ forceRefresh });
+            const user = await this.getAuthenticatedUser();
             if (user)
                 return user;
             const deviceToken = this.deviceCredentialsManager.getCredentials();
@@ -9830,7 +9817,7 @@ async function batchNftTransfer({ user, starkSigner, request, transfersApi, guar
 async function forceUserRefresh(authManager) {
     // User metadata is updated asynchronously. Poll userinfo endpoint until it is updated.
     await retryWithDelay(async () => {
-        const user = await authManager.loginSilent({ forceRefresh: true }); // force refresh to get updated user info
+        const user = await authManager.forceUserRefresh(); // force refresh to get updated user info
         if (user?.imx)
             return user;
         return Promise.reject(new Error('user wallet addresses not exist'));
@@ -10057,7 +10044,7 @@ class PassportImxProviderFactory {
     async getProvider() {
         let user = null;
         try {
-            user = await this.authManager.loginSilent();
+            user = await this.authManager.getUser();
         }
         catch (e) {
             // eslint-disable-next-line no-console
@@ -10069,7 +10056,7 @@ class PassportImxProviderFactory {
         return this.createProviderInstance(user);
     }
     async getProviderSilent() {
-        const user = await this.authManager.loginSilent();
+        const user = await this.authManager.getUser();
         if (!user) {
             return null;
         }
@@ -10452,10 +10439,13 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     const ethsigNoType = await signer.signMessage(hashArray);
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     // Add metadata
-    const encodedSignature = config$1.encodeSignature({
+    const encodedSignature = core.v1.signature.encodeSignature({
+        version: 1,
         threshold: TRANSACTION_SIGNATURE_THRESHOLD,
         signers: [
             {
+                isDynamic: false,
+                unrecovered: true,
                 weight: SIGNATURE_WEIGHT,
                 signature: signedDigest,
             },
@@ -10470,8 +10460,8 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     ]);
 };
 const decodeRelayerTypedDataSignature = (relayerSignature) => {
-    const signatureWithThreshold = `0000${relayerSignature}`;
-    return config$1.decodeSignature(signatureWithThreshold);
+    const signatureWithThreshold = `0x0000${relayerSignature}`;
+    return core.v1.signature.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
@@ -10487,11 +10477,14 @@ const getSignedTypedData = async (typedData, relayerSignature, chainId, walletAd
     const ethsigNoType = await signer.signMessage(hashArray);
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     const { signers } = decodeRelayerTypedDataSignature(relayerSignature);
-    return config$1.encodeSignature({
+    return core.v1.signature.encodeSignature({
+        version: 1,
         threshold: EIP712_SIGNATURE_THRESHOLD,
         signers: [
             ...signers,
             {
+                isDynamic: false,
+                unrecovered: true,
                 weight: SIGNATURE_WEIGHT,
                 signature: signedDigest,
             },
@@ -10634,7 +10627,7 @@ async function registerZkEvmUser({ authManager, config, magicProvider, multiRoll
         user = await authManager.refreshToken(credentials.refresh_token);
     }
     else {
-        user = await authManager.loginSilent({ forceRefresh: true });
+        user = await authManager.forceUserRefresh();
     }
     if (!user?.zkEvm) {
         throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, 'Failed to refresh user details');
@@ -10643,7 +10636,17 @@ async function registerZkEvmUser({ authManager, config, magicProvider, multiRoll
 }
 
 const loginZkEvmUser = async ({ authManager, config, magicAdapter, multiRollupApiClients, jsonRpcProvider, }) => {
-    const user = await authManager.getUser() || await authManager.getUserDeviceFlow() || await authManager.login();
+    let user = null;
+    try {
+        user = await authManager.getUser();
+    }
+    catch (err) {
+        // eslint-disable-next-line no-console
+        console.warn('eth_requestAccounts` failed to retrieve a cached user session:', err);
+    }
+    if (!user) {
+        user = await authManager.getUserDeviceFlow() || await authManager.login();
+    }
     if (!user.idToken) {
         throw new Error('User is missing idToken');
     }
@@ -11119,11 +11122,14 @@ class Passport {
         const { useCachedSession = false } = options || {};
         let user = null;
         try {
-            user = await this.authManager.loginSilent();
+            user = await this.authManager.getUser();
         }
         catch (error) {
+            if (useCachedSession) {
+                throw error;
+            }
             // eslint-disable-next-line no-console
-            console.warn('loginSilent failed with error:', error);
+            console.warn('login failed to retrieve a cached user session', error);
         }
         if (!user && !useCachedSession) {
             user = await this.authManager.login();
@@ -34018,7 +34024,7 @@ async function getItemRequirementsFromRequirements(provider, requirements) {
     return itemRequirements;
 }
 
-const SDK_VERSION_MARKER = '0.30.1';
+const SDK_VERSION_MARKER = '0.30.3';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 

package/dist/index.js

@@ -11,7 +11,7 @@ import BN$2 from 'bn.js';
 import * as encUtils from 'enc-utils';
 import { EventEmitter } from 'events';
 import { walletContracts } from '@0xsequence/abi';
-import { encodeSignature, decodeSignature } from '@0xsequence/config';
+import { v1 } from '@0xsequence/core';
 import FormData$2 from 'form-data';
 import { Seaport as Seaport$1 } from '@opensea/seaport-js';
 import { parseUnits } from '@ethersproject/units';
@@ -3770,7 +3770,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.30.1' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-0.30.3' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -3830,7 +3830,7 @@ class APIError extends Error {
 
 /* eslint-disable implicit-arrow-linebreak */
 const defaultHeaders = {
-    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.30.1',
+    sdkVersion: 'ts-immutable-sdk-multi-rollup-api-client-0.30.3',
 };
 /**
  * createAPIConfiguration to create a custom Configuration
@@ -4241,7 +4241,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.30.1',
+    sdkVersion: 'ts-immutable-sdk-0.30.3',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -8956,7 +8956,7 @@ class AuthManager {
                 nickname: idTokenPayload.nickname,
             },
         };
-        if (idTokenPayload?.passport.imx_eth_address) {
+        if (idTokenPayload?.passport?.imx_eth_address) {
             user.imx = {
                 ethAddress: idTokenPayload.passport.imx_eth_address,
                 starkAddress: idTokenPayload.passport.imx_stark_address,
@@ -9011,10 +9011,7 @@ class AuthManager {
                 try {
                     const tokenResponse = await this.getDeviceFlowToken(deviceCode);
                     const user = AuthManager.mapDeviceTokenResponseToDomainUserModel(tokenResponse);
-                    // Only persist credentials that contain the necessary data
-                    if (user.imx?.ethAddress && user.imx?.starkAddress && user.imx?.userAdminAddress) {
-                        this.deviceCredentialsManager.saveCredentials(tokenResponse);
-                    }
+                    this.deviceCredentialsManager.saveCredentials(tokenResponse);
                     return user;
                 }
                 catch (error) {
@@ -9086,10 +9083,7 @@ class AuthManager {
             }
             const tokenResponse = await this.getPKCEToken(authorizationCode, pkceData.verifier);
             const user = AuthManager.mapDeviceTokenResponseToDomainUserModel(tokenResponse);
-            // Only persist credentials that contain the necessary data
-            if (user.imx?.ethAddress && user.imx?.starkAddress && user.imx?.userAdminAddress) {
-                this.deviceCredentialsManager.saveCredentials(tokenResponse);
-            }
+            this.deviceCredentialsManager.saveCredentials(tokenResponse);
             return user;
         }, PassportErrorType.AUTHENTICATION_ERROR);
     }
@@ -9143,21 +9137,11 @@ class AuthManager {
             this.deviceCredentialsManager.clearCredentials();
         }, PassportErrorType.LOGOUT_ERROR);
     }
-    async loginSilent({ forceRefresh } = { forceRefresh: false }) {
-        // eslint-disable-next-line arrow-body-style
-        return withPassportError(async () => {
-            return this.getUser({ forceRefresh });
-        }, PassportErrorType.SILENT_LOGIN_ERROR);
-    }
     /**
      * Get the user from the cache or refresh the token if it's expired.
-     * @param forceRefresh If set to true, force an HTTP call to the OIDC server's authorization endpoint. This call will
-     * throw an error if there's no refresh token.
+     * return null if there's no refresh token.
      */
-    async getAuthenticatedUser({ forceRefresh = false }) {
-        if (forceRefresh) {
-            return this.refreshTokenAndUpdatePromise();
-        }
+    async getAuthenticatedUser() {
         const oidcUser = await this.userManager.getUser();
         if (!oidcUser)
             return null;
@@ -9169,6 +9153,9 @@ class AuthManager {
         }
         return null;
     }
+    async forceUserRefresh() {
+        return this.refreshTokenAndUpdatePromise();
+    }
     /**
      * Refreshes the token and returns the user.
      * If the token is already being refreshed, returns the existing promise.
@@ -9195,9 +9182,9 @@ class AuthManager {
         });
         return this.refreshingPromise;
     }
-    async getUser({ forceRefresh } = { forceRefresh: false }) {
+    async getUser() {
         return withPassportError(async () => {
-            const user = await this.getAuthenticatedUser({ forceRefresh });
+            const user = await this.getAuthenticatedUser();
             if (user)
                 return user;
             const deviceToken = this.deviceCredentialsManager.getCredentials();
@@ -9808,7 +9795,7 @@ async function batchNftTransfer({ user, starkSigner, request, transfersApi, guar
 async function forceUserRefresh(authManager) {
     // User metadata is updated asynchronously. Poll userinfo endpoint until it is updated.
     await retryWithDelay(async () => {
-        const user = await authManager.loginSilent({ forceRefresh: true }); // force refresh to get updated user info
+        const user = await authManager.forceUserRefresh(); // force refresh to get updated user info
         if (user?.imx)
             return user;
         return Promise.reject(new Error('user wallet addresses not exist'));
@@ -10035,7 +10022,7 @@ class PassportImxProviderFactory {
     async getProvider() {
         let user = null;
         try {
-            user = await this.authManager.loginSilent();
+            user = await this.authManager.getUser();
         }
         catch (e) {
             // eslint-disable-next-line no-console
@@ -10047,7 +10034,7 @@ class PassportImxProviderFactory {
         return this.createProviderInstance(user);
     }
     async getProviderSilent() {
-        const user = await this.authManager.loginSilent();
+        const user = await this.authManager.getUser();
         if (!user) {
             return null;
         }
@@ -10430,10 +10417,13 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     const ethsigNoType = await signer.signMessage(hashArray);
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     // Add metadata
-    const encodedSignature = encodeSignature({
+    const encodedSignature = v1.signature.encodeSignature({
+        version: 1,
         threshold: TRANSACTION_SIGNATURE_THRESHOLD,
         signers: [
             {
+                isDynamic: false,
+                unrecovered: true,
                 weight: SIGNATURE_WEIGHT,
                 signature: signedDigest,
             },
@@ -10448,8 +10438,8 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     ]);
 };
 const decodeRelayerTypedDataSignature = (relayerSignature) => {
-    const signatureWithThreshold = `0000${relayerSignature}`;
-    return decodeSignature(signatureWithThreshold);
+    const signatureWithThreshold = `0x0000${relayerSignature}`;
+    return v1.signature.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
@@ -10465,11 +10455,14 @@ const getSignedTypedData = async (typedData, relayerSignature, chainId, walletAd
     const ethsigNoType = await signer.signMessage(hashArray);
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     const { signers } = decodeRelayerTypedDataSignature(relayerSignature);
-    return encodeSignature({
+    return v1.signature.encodeSignature({
+        version: 1,
         threshold: EIP712_SIGNATURE_THRESHOLD,
         signers: [
             ...signers,
             {
+                isDynamic: false,
+                unrecovered: true,
                 weight: SIGNATURE_WEIGHT,
                 signature: signedDigest,
             },
@@ -10612,7 +10605,7 @@ async function registerZkEvmUser({ authManager, config, magicProvider, multiRoll
         user = await authManager.refreshToken(credentials.refresh_token);
     }
     else {
-        user = await authManager.loginSilent({ forceRefresh: true });
+        user = await authManager.forceUserRefresh();
     }
     if (!user?.zkEvm) {
         throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, 'Failed to refresh user details');
@@ -10621,7 +10614,17 @@ async function registerZkEvmUser({ authManager, config, magicProvider, multiRoll
 }
 
 const loginZkEvmUser = async ({ authManager, config, magicAdapter, multiRollupApiClients, jsonRpcProvider, }) => {
-    const user = await authManager.getUser() || await authManager.getUserDeviceFlow() || await authManager.login();
+    let user = null;
+    try {
+        user = await authManager.getUser();
+    }
+    catch (err) {
+        // eslint-disable-next-line no-console
+        console.warn('eth_requestAccounts` failed to retrieve a cached user session:', err);
+    }
+    if (!user) {
+        user = await authManager.getUserDeviceFlow() || await authManager.login();
+    }
     if (!user.idToken) {
         throw new Error('User is missing idToken');
     }
@@ -11097,11 +11100,14 @@ class Passport {
         const { useCachedSession = false } = options || {};
         let user = null;
         try {
-            user = await this.authManager.loginSilent();
+            user = await this.authManager.getUser();
         }
         catch (error) {
+            if (useCachedSession) {
+                throw error;
+            }
             // eslint-disable-next-line no-console
-            console.warn('loginSilent failed with error:', error);
+            console.warn('login failed to retrieve a cached user session', error);
         }
         if (!user && !useCachedSession) {
             user = await this.authManager.login();
@@ -33996,7 +34002,7 @@ async function getItemRequirementsFromRequirements(provider, requirements) {
     return itemRequirements;
 }
 
-const SDK_VERSION_MARKER = '0.30.1';
+const SDK_VERSION_MARKER = '0.30.3';
 // This SDK version is replaced by the `yarn build` command ran on the root level
 const globalPackageVersion = () => SDK_VERSION_MARKER;
 

package/dist/passport.js

@@ -11,7 +11,7 @@ import BN from 'bn.js';
 import * as encUtils from 'enc-utils';
 import { EventEmitter } from 'events';
 import { walletContracts } from '@0xsequence/abi';
-import { encodeSignature, decodeSignature } from '@0xsequence/config';
+import { v1 } from '@0xsequence/core';
 
 /* tslint:disable */
 /* eslint-disable */
@@ -2191,7 +2191,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.30.1' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.30.3' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -2247,7 +2247,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.30.1',
+    sdkVersion: 'ts-immutable-sdk-0.30.3',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -6945,7 +6945,7 @@ class AuthManager {
                 nickname: idTokenPayload.nickname,
             },
         };
-        if (idTokenPayload?.passport.imx_eth_address) {
+        if (idTokenPayload?.passport?.imx_eth_address) {
             user.imx = {
                 ethAddress: idTokenPayload.passport.imx_eth_address,
                 starkAddress: idTokenPayload.passport.imx_stark_address,
@@ -7000,10 +7000,7 @@ class AuthManager {
                 try {
                     const tokenResponse = await this.getDeviceFlowToken(deviceCode);
                     const user = AuthManager.mapDeviceTokenResponseToDomainUserModel(tokenResponse);
-                    // Only persist credentials that contain the necessary data
-                    if (user.imx?.ethAddress && user.imx?.starkAddress && user.imx?.userAdminAddress) {
-                        this.deviceCredentialsManager.saveCredentials(tokenResponse);
-                    }
+                    this.deviceCredentialsManager.saveCredentials(tokenResponse);
                     return user;
                 }
                 catch (error) {
@@ -7075,10 +7072,7 @@ class AuthManager {
             }
             const tokenResponse = await this.getPKCEToken(authorizationCode, pkceData.verifier);
             const user = AuthManager.mapDeviceTokenResponseToDomainUserModel(tokenResponse);
-            // Only persist credentials that contain the necessary data
-            if (user.imx?.ethAddress && user.imx?.starkAddress && user.imx?.userAdminAddress) {
-                this.deviceCredentialsManager.saveCredentials(tokenResponse);
-            }
+            this.deviceCredentialsManager.saveCredentials(tokenResponse);
             return user;
         }, PassportErrorType.AUTHENTICATION_ERROR);
     }
@@ -7132,21 +7126,11 @@ class AuthManager {
             this.deviceCredentialsManager.clearCredentials();
         }, PassportErrorType.LOGOUT_ERROR);
     }
-    async loginSilent({ forceRefresh } = { forceRefresh: false }) {
-        // eslint-disable-next-line arrow-body-style
-        return withPassportError(async () => {
-            return this.getUser({ forceRefresh });
-        }, PassportErrorType.SILENT_LOGIN_ERROR);
-    }
     /**
      * Get the user from the cache or refresh the token if it's expired.
-     * @param forceRefresh If set to true, force an HTTP call to the OIDC server's authorization endpoint. This call will
-     * throw an error if there's no refresh token.
+     * return null if there's no refresh token.
      */
-    async getAuthenticatedUser({ forceRefresh = false }) {
-        if (forceRefresh) {
-            return this.refreshTokenAndUpdatePromise();
-        }
+    async getAuthenticatedUser() {
         const oidcUser = await this.userManager.getUser();
         if (!oidcUser)
             return null;
@@ -7158,6 +7142,9 @@ class AuthManager {
         }
         return null;
     }
+    async forceUserRefresh() {
+        return this.refreshTokenAndUpdatePromise();
+    }
     /**
      * Refreshes the token and returns the user.
      * If the token is already being refreshed, returns the existing promise.
@@ -7184,9 +7171,9 @@ class AuthManager {
         });
         return this.refreshingPromise;
     }
-    async getUser({ forceRefresh } = { forceRefresh: false }) {
+    async getUser() {
         return withPassportError(async () => {
-            const user = await this.getAuthenticatedUser({ forceRefresh });
+            const user = await this.getAuthenticatedUser();
             if (user)
                 return user;
             const deviceToken = this.deviceCredentialsManager.getCredentials();
@@ -7797,7 +7784,7 @@ async function batchNftTransfer({ user, starkSigner, request, transfersApi, guar
 async function forceUserRefresh(authManager) {
     // User metadata is updated asynchronously. Poll userinfo endpoint until it is updated.
     await retryWithDelay(async () => {
-        const user = await authManager.loginSilent({ forceRefresh: true }); // force refresh to get updated user info
+        const user = await authManager.forceUserRefresh(); // force refresh to get updated user info
         if (user?.imx)
             return user;
         return Promise.reject(new Error('user wallet addresses not exist'));
@@ -8024,7 +8011,7 @@ class PassportImxProviderFactory {
     async getProvider() {
         let user = null;
         try {
-            user = await this.authManager.loginSilent();
+            user = await this.authManager.getUser();
         }
         catch (e) {
             // eslint-disable-next-line no-console
@@ -8036,7 +8023,7 @@ class PassportImxProviderFactory {
         return this.createProviderInstance(user);
     }
     async getProviderSilent() {
-        const user = await this.authManager.loginSilent();
+        const user = await this.authManager.getUser();
         if (!user) {
             return null;
         }
@@ -8419,10 +8406,13 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     const ethsigNoType = await signer.signMessage(hashArray);
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     // Add metadata
-    const encodedSignature = encodeSignature({
+    const encodedSignature = v1.signature.encodeSignature({
+        version: 1,
         threshold: TRANSACTION_SIGNATURE_THRESHOLD,
         signers: [
             {
+                isDynamic: false,
+                unrecovered: true,
                 weight: SIGNATURE_WEIGHT,
                 signature: signedDigest,
             },
@@ -8437,8 +8427,8 @@ const getSignedMetaTransactions = async (metaTransactions, nonce, chainId, walle
     ]);
 };
 const decodeRelayerTypedDataSignature = (relayerSignature) => {
-    const signatureWithThreshold = `0000${relayerSignature}`;
-    return decodeSignature(signatureWithThreshold);
+    const signatureWithThreshold = `0x0000${relayerSignature}`;
+    return v1.signature.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
@@ -8454,11 +8444,14 @@ const getSignedTypedData = async (typedData, relayerSignature, chainId, walletAd
     const ethsigNoType = await signer.signMessage(hashArray);
     const signedDigest = `${ethsigNoType}${ETH_SIGN_FLAG}`;
     const { signers } = decodeRelayerTypedDataSignature(relayerSignature);
-    return encodeSignature({
+    return v1.signature.encodeSignature({
+        version: 1,
         threshold: EIP712_SIGNATURE_THRESHOLD,
         signers: [
             ...signers,
             {
+                isDynamic: false,
+                unrecovered: true,
                 weight: SIGNATURE_WEIGHT,
                 signature: signedDigest,
             },
@@ -8601,7 +8594,7 @@ async function registerZkEvmUser({ authManager, config, magicProvider, multiRoll
         user = await authManager.refreshToken(credentials.refresh_token);
     }
     else {
-        user = await authManager.loginSilent({ forceRefresh: true });
+        user = await authManager.forceUserRefresh();
     }
     if (!user?.zkEvm) {
         throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, 'Failed to refresh user details');
@@ -8610,7 +8603,17 @@ async function registerZkEvmUser({ authManager, config, magicProvider, multiRoll
 }
 
 const loginZkEvmUser = async ({ authManager, config, magicAdapter, multiRollupApiClients, jsonRpcProvider, }) => {
-    const user = await authManager.getUser() || await authManager.getUserDeviceFlow() || await authManager.login();
+    let user = null;
+    try {
+        user = await authManager.getUser();
+    }
+    catch (err) {
+        // eslint-disable-next-line no-console
+        console.warn('eth_requestAccounts` failed to retrieve a cached user session:', err);
+    }
+    if (!user) {
+        user = await authManager.getUserDeviceFlow() || await authManager.login();
+    }
     if (!user.idToken) {
         throw new Error('User is missing idToken');
     }
@@ -9086,11 +9089,14 @@ class Passport {
         const { useCachedSession = false } = options || {};
         let user = null;
         try {
-            user = await this.authManager.loginSilent();
+            user = await this.authManager.getUser();
         }
         catch (error) {
+            if (useCachedSession) {
+                throw error;
+            }
             // eslint-disable-next-line no-console
-            console.warn('loginSilent failed with error:', error);
+            console.warn('login failed to retrieve a cached user session', error);
         }
         if (!user && !useCachedSession) {
             user = await this.authManager.login();