@imtbl/sdk 1.45.3-alpha.3 → 1.45.3-alpha.4

package/dist/passport.js

@@ -11459,7 +11459,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-1.45.3-alpha.3' };
+const defaultHeaders$1 = { 'x-sdk-version': 'ts-immutable-sdk-1.45.3-alpha.4' };
 const createConfig$1 = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -11668,7 +11668,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.45.3-alpha.3';
+const SDK_VERSION = '1.45.3-alpha.4';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';
@@ -12096,7 +12096,7 @@ const addKeysToHeadersOverride = (baseConfig, overrides) => {
 /* eslint-disable @typescript-eslint/naming-convention */
 class ApiConfiguration extends index$2.Configuration {
 }
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.45.3-alpha.3' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.45.3-alpha.4' };
 /**
  * @dev use createImmutableXConfiguration instead
  */
@@ -12137,7 +12137,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     coreContractAddress,
     registrationContractAddress,
     registrationV4ContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.45.3-alpha.3',
+    sdkVersion: 'ts-immutable-sdk-1.45.3-alpha.4',
     baseConfig,
 });
 const production = ({ baseConfig }) => createImmutableXConfiguration({
@@ -20013,6 +20013,7 @@ function isTokenExpired(oidcUser) {
 var PassportEvents;
 (function (PassportEvents) {
     PassportEvents["LOGGED_OUT"] = "loggedOut";
+    PassportEvents["LOGGED_IN"] = "loggedIn";
     PassportEvents["ACCOUNTS_REQUESTED"] = "accountsRequested";
 })(PassportEvents || (PassportEvents = {}));
 const isUserZkEvm = (user) => !!user.zkEvm;
@@ -22448,12 +22449,12 @@ const buildMetaTransactions = async (transactionRequest, rpcProvider, relayerCli
     }
     return metaTransactions;
 };
-const sendTransaction = async ({ params, ethSigner, rpcProvider, relayerClient, guardianClient, zkevmAddress, flow, }) => {
+const sendTransaction = async ({ params, ethSigner, rpcProvider, relayerClient, guardianClient, zkEvmAddress, flow, }) => {
     const { chainId } = await rpcProvider.detectNetwork();
     const chainIdBigNumber = BigNumber.from(chainId);
     flow.addEvent('endDetectNetwork');
     // Prepare the meta transactions by adding an optional fee transaction
-    const metaTransactions = await buildMetaTransactions(params[0], rpcProvider, relayerClient, zkevmAddress);
+    const metaTransactions = await buildMetaTransactions(params[0], rpcProvider, relayerClient, zkEvmAddress);
     flow.addEvent('endBuildMetaTransactions');
     const { nonce } = metaTransactions[0];
     if (!nonce) {
@@ -22468,13 +22469,13 @@ const sendTransaction = async ({ params, ethSigner, rpcProvider, relayerClient,
     validateEVMTransactionPromise.then(() => flow.addEvent('endValidateEVMTransaction'));
     // NOTE: We sign again because we now are adding the fee transaction, so the
     // whole payload is different and needs a new signature.
-    const getSignedMetaTransactionsPromise = signMetaTransactions(metaTransactions, nonce, chainIdBigNumber, zkevmAddress, ethSigner);
+    const getSignedMetaTransactionsPromise = signMetaTransactions(metaTransactions, nonce, chainIdBigNumber, zkEvmAddress, ethSigner);
     getSignedMetaTransactionsPromise.then(() => flow.addEvent('endGetSignedMetaTransactions'));
     const [, signedTransactions] = await Promise.all([
         validateEVMTransactionPromise,
         getSignedMetaTransactionsPromise,
     ]);
-    const relayerId = await relayerClient.ethSendTransaction(zkevmAddress, signedTransactions);
+    const relayerId = await relayerClient.ethSendTransaction(zkEvmAddress, signedTransactions);
     flow.addEvent('endRelayerSendTransaction');
     const retrieveRelayerTransaction = async () => {
         const tx = await relayerClient.imGetTransactionByHash(relayerId);
@@ -22815,7 +22816,6 @@ class ZkEvmProvider {
      */
     #ethSigner;
     #signerInitialisationError;
-    #zkEvmAddress;
     isPassport = true;
     constructor({ authManager, magicAdapter, config, multiRollupApiClients, passportEventEmitter, guardianClient, }) {
         this.#authManager = authManager;
@@ -22841,16 +22841,21 @@ class ZkEvmProvider {
         });
         this.#multiRollupApiClients = multiRollupApiClients;
         this.#providerEventEmitter = new TypedEventEmitter();
+        // Automatically connect an existing user session to Passport
+        this.#authManager.getUser().then((user) => {
+            if (user && isZkEvmUser(user)) {
+                this.#initialiseEthSigner(user);
+            }
+        }).catch(() => {
+            // User does not exist, don't initialise an eth signer
+        });
+        passportEventEmitter.on(PassportEvents.LOGGED_IN, (user) => this.#initialiseEthSigner(user));
         passportEventEmitter.on(PassportEvents.LOGGED_OUT, this.#handleLogout);
         passportEventEmitter.on(PassportEvents.ACCOUNTS_REQUESTED, trackSessionActivity);
     }
     #handleLogout = () => {
-        const shouldEmitAccountsChanged = !!this.#zkEvmAddress;
         this.#ethSigner = undefined;
-        this.#zkEvmAddress = undefined;
-        if (shouldEmitAccountsChanged) {
-            this.#providerEventEmitter.emit(ProviderEvent.ACCOUNTS_CHANGED, []);
-        }
+        this.#providerEventEmitter.emit(ProviderEvent.ACCOUNTS_CHANGED, []);
     };
     /**
      * This method is called by `eth_requestAccounts` and asynchronously initialises the signer.
@@ -22870,6 +22875,7 @@ class ZkEvmProvider {
             const web3Provider = new Web3Provider(magicRpcProvider);
             return web3Provider.getSigner();
         };
+        this.#signerInitialisationError = undefined;
         // eslint-disable-next-line no-async-promise-executor
         this.#ethSigner = new Promise(async (resolve) => {
             try {
@@ -22893,7 +22899,7 @@ class ZkEvmProvider {
         }
         return ethSigner;
     }
-    async #callSessionActivity() {
+    async #callSessionActivity(zkEvmAddress) {
         const sendTransactionClosure = async (params, flow) => {
             const ethSigner = await this.#getSigner();
             return await sendTransaction({
@@ -22902,35 +22908,49 @@ class ZkEvmProvider {
                 guardianClient: this.#guardianClient,
                 rpcProvider: this.#rpcProvider,
                 relayerClient: this.#relayerClient,
-                zkevmAddress: this.#zkEvmAddress,
+                zkEvmAddress,
                 flow,
             });
         };
         this.#passportEventEmitter.emit(PassportEvents.ACCOUNTS_REQUESTED, {
             environment: this.#config.baseConfig.environment,
             sendTransaction: sendTransactionClosure,
-            walletAddress: this.#zkEvmAddress || '',
+            walletAddress: zkEvmAddress,
             passportClient: this.#config.oidcConfiguration.clientId,
         });
     }
+    // Used to get the registered zkEvm address from the User session
+    async #getZkEvmAddress() {
+        try {
+            const user = await this.#authManager.getUser();
+            if (user && isZkEvmUser(user)) {
+                return user.zkEvm.ethAddress;
+            }
+            return undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
     async #performRequest(request) {
         // This is required for sending session activity events
         switch (request.method) {
             case 'eth_requestAccounts': {
                 const requestAccounts = async () => {
-                    if (this.#zkEvmAddress) {
-                        return [this.#zkEvmAddress];
-                    }
+                    const zkEvmAddress = await this.#getZkEvmAddress();
+                    if (zkEvmAddress)
+                        return [zkEvmAddress];
                     const flow = trackFlow('passport', 'ethRequestAccounts');
                     try {
                         const user = await this.#authManager.getUserOrLogin();
                         flow.addEvent('endGetUserOrLogin');
                         this.#initialiseEthSigner(user);
+                        let userZkEvmEthAddress;
                         if (!isZkEvmUser(user)) {
                             flow.addEvent('startUserRegistration');
                             const ethSigner = await this.#getSigner();
                             flow.addEvent('ethSignerResolved');
-                            this.#zkEvmAddress = await registerZkEvmUser({
+                            userZkEvmEthAddress = await registerZkEvmUser({
                                 ethSigner,
                                 authManager: this.#authManager,
                                 multiRollupApiClients: this.#multiRollupApiClients,
@@ -22941,15 +22961,15 @@ class ZkEvmProvider {
                             flow.addEvent('endUserRegistration');
                         }
                         else {
-                            this.#zkEvmAddress = user.zkEvm.ethAddress;
+                            userZkEvmEthAddress = user.zkEvm.ethAddress;
                         }
                         this.#providerEventEmitter.emit(ProviderEvent.ACCOUNTS_CHANGED, [
-                            this.#zkEvmAddress,
+                            userZkEvmEthAddress,
                         ]);
                         identify({
                             passportId: user.profile.sub,
                         });
-                        return [this.#zkEvmAddress];
+                        return [userZkEvmEthAddress];
                     }
                     catch (error) {
                         if (error instanceof Error) {
@@ -22963,11 +22983,13 @@ class ZkEvmProvider {
                     }
                 };
                 const addresses = await requestAccounts();
-                this.#callSessionActivity();
+                const [zkEvmAddress] = addresses;
+                this.#callSessionActivity(zkEvmAddress);
                 return addresses;
             }
             case 'eth_sendTransaction': {
-                if (!this.#zkEvmAddress) {
+                const zkEvmAddress = await this.#getZkEvmAddress();
+                if (!zkEvmAddress) {
                     throw new JsonRpcError(ProviderErrorCode.UNAUTHORIZED, 'Unauthorised - call eth_requestAccounts first');
                 }
                 const flow = trackFlow('passport', 'ethSendTransaction');
@@ -22984,7 +23006,7 @@ class ZkEvmProvider {
                             guardianClient: this.#guardianClient,
                             rpcProvider: this.#rpcProvider,
                             relayerClient: this.#relayerClient,
-                            zkevmAddress: this.#zkEvmAddress,
+                            zkEvmAddress,
                             flow,
                         });
                     });
@@ -23001,10 +23023,12 @@ class ZkEvmProvider {
                 }
             }
             case 'eth_accounts': {
-                return this.#zkEvmAddress ? [this.#zkEvmAddress] : [];
+                const zkEvmAddress = await this.#getZkEvmAddress();
+                return zkEvmAddress ? [zkEvmAddress] : [];
             }
             case 'personal_sign': {
-                if (!this.#zkEvmAddress) {
+                const zkEvmAddress = await this.#getZkEvmAddress();
+                if (!zkEvmAddress) {
                     throw new JsonRpcError(ProviderErrorCode.UNAUTHORIZED, 'Unauthorised - call eth_requestAccounts first');
                 }
                 const flow = trackFlow('passport', 'personalSign');
@@ -23018,7 +23042,7 @@ class ZkEvmProvider {
                         return await personalSign({
                             params: request.params || [],
                             ethSigner,
-                            zkEvmAddress: this.#zkEvmAddress,
+                            zkEvmAddress,
                             rpcProvider: this.#rpcProvider,
                             guardianClient: this.#guardianClient,
                             relayerClient: this.#relayerClient,
@@ -23039,7 +23063,8 @@ class ZkEvmProvider {
             }
             case 'eth_signTypedData':
             case 'eth_signTypedData_v4': {
-                if (!this.#zkEvmAddress) {
+                const zkEvmAddress = await this.#getZkEvmAddress();
+                if (!zkEvmAddress) {
                     throw new JsonRpcError(ProviderErrorCode.UNAUTHORIZED, 'Unauthorised - call eth_requestAccounts first');
                 }
                 const flow = trackFlow('passport', 'ethSignTypedDataV4');
@@ -23371,6 +23396,7 @@ class Passport {
             identify({
                 passportId: user.profile.sub,
             });
+            this.passportEventEmitter.emit(PassportEvents.LOGGED_IN, user);
         }
         return user ? user.profile : null;
     }
@@ -23382,6 +23408,7 @@ class Passport {
     }
     async loginWithDeviceFlowCallback(deviceCode, interval, timeoutMs) {
         const user = await this.authManager.loginWithDeviceFlowCallback(deviceCode, interval, timeoutMs);
+        this.passportEventEmitter.emit(PassportEvents.LOGGED_IN, user);
         return user.profile;
     }
     loginWithPKCEFlow() {
@@ -23389,6 +23416,7 @@ class Passport {
     }
     async loginWithPKCEFlowCallback(authorizationCode, state) {
         const user = await this.authManager.loginWithPKCEFlowCallback(authorizationCode, state);
+        this.passportEventEmitter.emit(PassportEvents.LOGGED_IN, user);
         return user.profile;
     }
     async logout() {

package/dist/webhook.js

@@ -145,7 +145,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.45.3-alpha.3';
+const SDK_VERSION = '1.45.3-alpha.4';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';

package/dist/x.js

@@ -9019,7 +9019,7 @@ const flattenProperties = (properties) => {
 };
 
 // WARNING: DO NOT CHANGE THE STRING BELOW. IT GETS REPLACED AT BUILD TIME.
-const SDK_VERSION = '1.45.3-alpha.3';
+const SDK_VERSION = '1.45.3-alpha.4';
 const getFrameParentDomain = () => {
     if (isNode()) {
         return '';
@@ -9288,7 +9288,7 @@ const addKeysToHeadersOverride = (baseConfig, overrides) => {
 /* eslint-disable @typescript-eslint/naming-convention */
 class ApiConfiguration extends index$2.Configuration {
 }
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.45.3-alpha.3' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-1.45.3-alpha.4' };
 /**
  * @dev use createImmutableXConfiguration instead
  */
@@ -9329,7 +9329,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     coreContractAddress,
     registrationContractAddress,
     registrationV4ContractAddress,
-    sdkVersion: 'ts-immutable-sdk-1.45.3-alpha.3',
+    sdkVersion: 'ts-immutable-sdk-1.45.3-alpha.4',
     baseConfig,
 });
 const production = ({ baseConfig }) => createImmutableXConfiguration({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Typescript SDK",
-  "version": "1.45.3-alpha.3",
+  "version": "1.45.3-alpha.4",
   "author": "Immutable",
   "browser": "./dist/index.browser.js",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",