@imtbl/sdk 1.5.0 → 1.5.2

package/dist/passport.js

@@ -9136,7 +9136,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.5.0' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.5.2' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -9316,7 +9316,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 = () => {
@@ -9491,7 +9491,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
@@ -14552,12 +14552,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
@@ -14581,10 +14583,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,
@@ -14613,7 +14616,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 {
@@ -14636,11 +14640,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;
@@ -14648,6 +14651,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');
@@ -14657,8 +14661,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;
         }
@@ -14667,12 +14675,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');
@@ -14754,7 +14763,6 @@ async function createOrder({ starkSigner, user, request, ordersApi, guardianClie
             getSignableOrderRequestV3,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: getSignableOrderResponse.data.payload_hash,
         });
         const { payload_hash: payloadHash } = getSignableOrderResponse.data;
@@ -14797,7 +14805,6 @@ async function cancelOrder({ user, starkSigner, request, ordersApi, guardianClie
             getSignableCancelOrderRequest,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: getSignableCancelOrderResponse.data.payload_hash,
         });
         const { payload_hash: payloadHash } = getSignableCancelOrderResponse.data;
@@ -14859,7 +14866,6 @@ async function createTrade({ request, tradesApi, user, starkSigner, guardianClie
             getSignableTradeRequest,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: getSignableTradeResponse.data.payload_hash,
         });
         const { payload_hash: payloadHash } = getSignableTradeResponse.data;
@@ -14907,7 +14913,6 @@ async function transfer({ request, transfersApi, starkSigner, user, guardianClie
             getSignableTransferRequest,
         }, { headers });
         await guardianClient.evaluateImxTransaction({
-            user,
             payloadHash: signableResult.data.payload_hash,
         });
         const signableResultData = signableResult.data;
@@ -14958,7 +14963,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) => {
@@ -15038,6 +15042,7 @@ class PassportImxProvider {
         this.guardianClient = new GuardianClient({
             confirmationScreen,
             config,
+            authManager,
         });
         this.magicAdapter = magicAdapter;
         this.imxApiClients = imxApiClients;
@@ -15669,11 +15674,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 = {
@@ -15681,10 +15686,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),
@@ -15843,7 +15849,7 @@ const getMetaTransactions = async (metaTransaction, nonce, chainId, walletAddres
     }
     return [metaTransaction, feeMetaTransaction];
 };
-const sendTransaction = ({ params, magicProvider, jsonRpcProvider, relayerClient, guardianClient, user, }) => guardianClient
+const sendTransaction = ({ params, magicProvider, jsonRpcProvider, relayerClient, guardianClient, zkevmAddress, }) => guardianClient
     .withConfirmationScreen({ width: 480, height: 720 })(async () => {
     const transactionRequest = params[0];
     if (!transactionRequest.to) {
@@ -15853,7 +15859,7 @@ const sendTransaction = ({ params, magicProvider, jsonRpcProvider, relayerClient
     const chainIdBigNumber = BigNumber.from(chainId);
     const magicWeb3Provider = new 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,
@@ -15861,17 +15867,16 @@ const sendTransaction = ({ params, magicProvider, jsonRpcProvider, relayerClient
         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
@@ -15939,7 +15944,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];
@@ -15948,7 +15953,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 Web3Provider(magicProvider);
     const signer = magicWeb3Provider.getSigner();
@@ -15966,7 +15971,7 @@ class ZkEvmProvider {
     guardianClient;
     relayerClient;
     magicProvider; // Used for signing
-    user;
+    zkevmAddress;
     isPassport = true;
     constructor({ authManager, magicAdapter, config, confirmationScreen, multiRollupApiClients, passportEventEmitter, }) {
         this.authManager = authManager;
@@ -15991,7 +15996,6 @@ class ZkEvmProvider {
     handleLogout = () => {
         const shouldEmitAccountsChanged = this.isLoggedIn();
         this.magicProvider = undefined;
-        this.user = undefined;
         this.relayerClient = undefined;
         this.guardianClient = undefined;
         if (shouldEmitAccountsChanged) {
@@ -16000,7 +16004,7 @@ class ZkEvmProvider {
     };
     isLoggedIn() {
         return this.magicProvider !== undefined
-            && this.user !== undefined
+            && this.zkevmAddress !== undefined
             && this.relayerClient !== undefined
             && this.guardianClient !== undefined;
     }
@@ -16008,7 +16012,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,
@@ -16017,19 +16021,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()) {
@@ -16041,11 +16046,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': {
@@ -16058,7 +16063,6 @@ class ZkEvmProvider {
                     magicProvider: this.magicProvider,
                     jsonRpcProvider: this.jsonRpcProvider,
                     relayerClient: this.relayerClient,
-                    user: this.user,
                     guardianClient: this.guardianClient,
                 });
             }

package/dist/x.js

@@ -131,7 +131,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 = () => {
@@ -270,7 +270,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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "author": "Immutable",
   "browser": "./dist/index.browser.js",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",