@mocanetwork/airkit 1.9.0-beta.2 → 1.9.0-beta.3

package/dist/airkit.cjs.js

@@ -97,7 +97,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "1.9.0-beta.2";
+var version = "1.9.0-beta.3";
 var airkitPackage = {
 	version: version};
 
@@ -177,6 +177,12 @@ const AirRecoveryMessageTypes = {
   RECOVERY_IFRAME_VISIBILITY_REQUEST: "air_recovery_iframe_visibility_request",
   UPDATE_SESSION_CONFIG_REQUEST: "air_recovery_update_session_config_request",
   UPDATE_SESSION_CONFIG_RESPONSE: "air_recovery_update_session_config_response",
+  GET_AGENT_KEYS_REQUEST: "air_recovery_get_agent_keys_request",
+  GET_AGENT_KEYS_RESPONSE: "air_recovery_get_agent_keys_response",
+  REGISTER_AGENT_KEY_REQUEST: "air_recovery_register_agent_key_request",
+  REGISTER_AGENT_KEY_RESPONSE: "air_recovery_register_agent_key_response",
+  REMOVE_AGENT_KEY_REQUEST: "air_recovery_remove_agent_key_request",
+  REMOVE_AGENT_KEY_RESPONSE: "air_recovery_remove_agent_key_response",
   LOGOUT_REQUEST: "air_recovery_logout_request",
   LOGOUT_RESPONSE: "air_recovery_logout_response"
 };
@@ -2012,7 +2018,7 @@ class ProviderMessageService extends MessageServiceBase {
 _a$4 = ProviderMessageService;
 _ProviderMessageService_instance = { value: void 0 };
 
-var _AirWalletProvider_instances, _AirWalletProvider_providerMessageService, _AirWalletProvider_isWalletInitialized, _AirWalletProvider_getLoginResult, _AirWalletProvider_ensureWallet, _AirWalletProvider_eventListeners, _AirWalletProvider_emit;
+var _AirWalletProvider_instances, _AirWalletProvider_providerMessageService, _AirWalletProvider_isWalletInitialized, _AirWalletProvider_getLoginResult, _AirWalletProvider_ensureWallet, _AirWalletProvider_eventListeners, _AirWalletProvider_currentChainId, _AirWalletProvider_emit, _AirWalletProvider_getAddressForCurrentChain, _AirWalletProvider_parseChainId;
 class AirWalletProvider {
     constructor({ ensureWallet, isWalletInitialized, getLoginResult, }) {
         _AirWalletProvider_instances.add(this);
@@ -2021,11 +2027,18 @@ class AirWalletProvider {
         _AirWalletProvider_getLoginResult.set(this, void 0);
         _AirWalletProvider_ensureWallet.set(this, void 0);
         _AirWalletProvider_eventListeners.set(this, void 0);
+        _AirWalletProvider_currentChainId.set(this, null);
         this.startEventMessageListening = async (walletIframe) => {
             await __classPrivateFieldGet(this, _AirWalletProvider_providerMessageService, "f").open(walletIframe);
             __classPrivateFieldGet(this, _AirWalletProvider_providerMessageService, "f").messages$
                 .pipe(filter((msg) => msg.type === AirWalletProviderMessageTypes.EVENT))
                 .subscribe((message) => {
+                if (message.payload.event === "chainChanged") {
+                    const parsedChainId = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, message.payload.data);
+                    if (parsedChainId !== null) {
+                        __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId, "f");
+                    }
+                }
                 __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
             });
         };
@@ -2061,10 +2074,13 @@ class AirWalletProvider {
         if (!loginResult) {
             throw new UnauthorizedProviderError("User is not logged in");
         }
+        // Early return optimization: return cached address from login result if wallet not yet initialized
         if ((method === "eth_accounts" || method === "eth_requestAccounts") &&
-            !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this) &&
-            loginResult?.abstractAccountAddress) {
-            return [loginResult.abstractAccountAddress];
+            !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this)) {
+            const address = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_getAddressForCurrentChain).call(this, loginResult);
+            if (address) {
+                return [address];
+            }
         }
         const skipWalletLoginMethods = ["eth_chainId"];
         try {
@@ -2086,6 +2102,12 @@ class AirWalletProvider {
         if (!response.success) {
             throw ensureProviderRpcError(response.payload);
         }
+        if (method === "eth_chainId") {
+            const parsedChainId = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, response.payload.response);
+            if (parsedChainId !== null) {
+                __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId, "f");
+            }
+        }
         return response.payload.response;
     }
     on(eventName, listener) {
@@ -2109,7 +2131,7 @@ class AirWalletProvider {
         }, "f");
     }
 }
-_AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_isWalletInitialized = new WeakMap(), _AirWalletProvider_getLoginResult = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_eventListeners = new WeakMap(), _AirWalletProvider_instances = new WeakSet(), _AirWalletProvider_emit = function _AirWalletProvider_emit(eventName, ...args) {
+_AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_isWalletInitialized = new WeakMap(), _AirWalletProvider_getLoginResult = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_eventListeners = new WeakMap(), _AirWalletProvider_currentChainId = new WeakMap(), _AirWalletProvider_instances = new WeakSet(), _AirWalletProvider_emit = function _AirWalletProvider_emit(eventName, ...args) {
     (__classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] || []).forEach((listener) => {
         try {
             return listener(...args);
@@ -2118,6 +2140,32 @@ _AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_is
             log.warn(error);
         }
     });
+}, _AirWalletProvider_getAddressForCurrentChain = function _AirWalletProvider_getAddressForCurrentChain(loginResult) {
+    const currentChainId = __classPrivateFieldGet(this, _AirWalletProvider_currentChainId, "f");
+    // If we have the new addresses array and current chainId, look up by chain
+    if (loginResult.abstractAccountAddresses && currentChainId !== null) {
+        const chainIdStr = String(currentChainId);
+        const addressEntry = loginResult.abstractAccountAddresses.find((entry) => entry.chainIds.includes(chainIdStr));
+        if (addressEntry) {
+            return addressEntry.address;
+        }
+    }
+    // Fallback to legacy single address (backward compatibility)
+    return loginResult.abstractAccountAddress;
+}, _AirWalletProvider_parseChainId = function _AirWalletProvider_parseChainId(chainId) {
+    if (typeof chainId === "number") {
+        return Number.isFinite(chainId) ? chainId : null;
+    }
+    if (typeof chainId === "bigint") {
+        return Number(chainId);
+    }
+    if (typeof chainId !== "string" || !chainId) {
+        return null;
+    }
+    const parsed = chainId.startsWith("0x")
+        ? parseInt(chainId, 16)
+        : parseInt(chainId, 10);
+    return Number.isNaN(parsed) ? null : parsed;
 };
 
 var _a$3, _AuthMessageService_instance;
@@ -2431,6 +2479,29 @@ class RecoveryMessageService extends MessageServiceBase {
         await this.sendMessage({ type: AirRecoveryMessageTypes.LOGOUT_REQUEST });
         return response;
     }
+    async sendGetAgentKeysRequest() {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.GET_AGENT_KEYS_RESPONSE)));
+        await this.sendMessage({
+            type: AirRecoveryMessageTypes.GET_AGENT_KEYS_REQUEST,
+        });
+        return response;
+    }
+    async sendRegisterAgentKeyRequest(payload) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.REGISTER_AGENT_KEY_RESPONSE)));
+        await this.sendMessage({
+            type: AirRecoveryMessageTypes.REGISTER_AGENT_KEY_REQUEST,
+            payload,
+        });
+        return response;
+    }
+    async sendRemoveAgentKeyRequest(payload) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.REMOVE_AGENT_KEY_RESPONSE)));
+        await this.sendMessage({
+            type: AirRecoveryMessageTypes.REMOVE_AGENT_KEY_REQUEST,
+            payload,
+        });
+        return response;
+    }
     async open(element) {
         await this._open({ window: element.contentWindow, origin: new URL(element.src).origin });
     }
@@ -3097,6 +3168,35 @@ class AirService {
             throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
         }
     }
+    async getAgentKeys() {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendGetAgentKeysRequest();
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
+        }
+        return payload.agentKeys;
+    }
+    async registerAgentKey(publicKey) {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendRegisterAgentKeyRequest({
+            publicKey,
+        });
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
+        }
+        return {
+            id: payload.id,
+            publicKey: payload.publicKey,
+            createdAt: payload.createdAt,
+        };
+    }
+    async removeAgentKey(id) {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendRemoveAgentKeyRequest({ id });
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
+        }
+    }
     async getUserInfo() {
         __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
         const info = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
@@ -3489,6 +3589,7 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         isLoggedIn: true,
         id: payload.id,
         abstractAccountAddress: payload.abstractAccountAddress,
+        abstractAccountAddresses: payload.abstractAccountAddresses,
         token: payload.partnerAccessToken,
         isMFASetup: payload.activeMfaMethods.length > 0,
     };

package/dist/airkit.esm.js

@@ -95,7 +95,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "1.9.0-beta.2";
+var version = "1.9.0-beta.3";
 var airkitPackage = {
 	version: version};
 
@@ -175,6 +175,12 @@ const AirRecoveryMessageTypes = {
   RECOVERY_IFRAME_VISIBILITY_REQUEST: "air_recovery_iframe_visibility_request",
   UPDATE_SESSION_CONFIG_REQUEST: "air_recovery_update_session_config_request",
   UPDATE_SESSION_CONFIG_RESPONSE: "air_recovery_update_session_config_response",
+  GET_AGENT_KEYS_REQUEST: "air_recovery_get_agent_keys_request",
+  GET_AGENT_KEYS_RESPONSE: "air_recovery_get_agent_keys_response",
+  REGISTER_AGENT_KEY_REQUEST: "air_recovery_register_agent_key_request",
+  REGISTER_AGENT_KEY_RESPONSE: "air_recovery_register_agent_key_response",
+  REMOVE_AGENT_KEY_REQUEST: "air_recovery_remove_agent_key_request",
+  REMOVE_AGENT_KEY_RESPONSE: "air_recovery_remove_agent_key_response",
   LOGOUT_REQUEST: "air_recovery_logout_request",
   LOGOUT_RESPONSE: "air_recovery_logout_response"
 };
@@ -2010,7 +2016,7 @@ class ProviderMessageService extends MessageServiceBase {
 _a$4 = ProviderMessageService;
 _ProviderMessageService_instance = { value: void 0 };
 
-var _AirWalletProvider_instances, _AirWalletProvider_providerMessageService, _AirWalletProvider_isWalletInitialized, _AirWalletProvider_getLoginResult, _AirWalletProvider_ensureWallet, _AirWalletProvider_eventListeners, _AirWalletProvider_emit;
+var _AirWalletProvider_instances, _AirWalletProvider_providerMessageService, _AirWalletProvider_isWalletInitialized, _AirWalletProvider_getLoginResult, _AirWalletProvider_ensureWallet, _AirWalletProvider_eventListeners, _AirWalletProvider_currentChainId, _AirWalletProvider_emit, _AirWalletProvider_getAddressForCurrentChain, _AirWalletProvider_parseChainId;
 class AirWalletProvider {
     constructor({ ensureWallet, isWalletInitialized, getLoginResult, }) {
         _AirWalletProvider_instances.add(this);
@@ -2019,11 +2025,18 @@ class AirWalletProvider {
         _AirWalletProvider_getLoginResult.set(this, void 0);
         _AirWalletProvider_ensureWallet.set(this, void 0);
         _AirWalletProvider_eventListeners.set(this, void 0);
+        _AirWalletProvider_currentChainId.set(this, null);
         this.startEventMessageListening = async (walletIframe) => {
             await __classPrivateFieldGet(this, _AirWalletProvider_providerMessageService, "f").open(walletIframe);
             __classPrivateFieldGet(this, _AirWalletProvider_providerMessageService, "f").messages$
                 .pipe(filter((msg) => msg.type === AirWalletProviderMessageTypes.EVENT))
                 .subscribe((message) => {
+                if (message.payload.event === "chainChanged") {
+                    const parsedChainId = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, message.payload.data);
+                    if (parsedChainId !== null) {
+                        __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId, "f");
+                    }
+                }
                 __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
             });
         };
@@ -2059,10 +2072,13 @@ class AirWalletProvider {
         if (!loginResult) {
             throw new UnauthorizedProviderError("User is not logged in");
         }
+        // Early return optimization: return cached address from login result if wallet not yet initialized
         if ((method === "eth_accounts" || method === "eth_requestAccounts") &&
-            !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this) &&
-            loginResult?.abstractAccountAddress) {
-            return [loginResult.abstractAccountAddress];
+            !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this)) {
+            const address = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_getAddressForCurrentChain).call(this, loginResult);
+            if (address) {
+                return [address];
+            }
         }
         const skipWalletLoginMethods = ["eth_chainId"];
         try {
@@ -2084,6 +2100,12 @@ class AirWalletProvider {
         if (!response.success) {
             throw ensureProviderRpcError(response.payload);
         }
+        if (method === "eth_chainId") {
+            const parsedChainId = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, response.payload.response);
+            if (parsedChainId !== null) {
+                __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId, "f");
+            }
+        }
         return response.payload.response;
     }
     on(eventName, listener) {
@@ -2107,7 +2129,7 @@ class AirWalletProvider {
         }, "f");
     }
 }
-_AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_isWalletInitialized = new WeakMap(), _AirWalletProvider_getLoginResult = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_eventListeners = new WeakMap(), _AirWalletProvider_instances = new WeakSet(), _AirWalletProvider_emit = function _AirWalletProvider_emit(eventName, ...args) {
+_AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_isWalletInitialized = new WeakMap(), _AirWalletProvider_getLoginResult = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_eventListeners = new WeakMap(), _AirWalletProvider_currentChainId = new WeakMap(), _AirWalletProvider_instances = new WeakSet(), _AirWalletProvider_emit = function _AirWalletProvider_emit(eventName, ...args) {
     (__classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] || []).forEach((listener) => {
         try {
             return listener(...args);
@@ -2116,6 +2138,32 @@ _AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_is
             log.warn(error);
         }
     });
+}, _AirWalletProvider_getAddressForCurrentChain = function _AirWalletProvider_getAddressForCurrentChain(loginResult) {
+    const currentChainId = __classPrivateFieldGet(this, _AirWalletProvider_currentChainId, "f");
+    // If we have the new addresses array and current chainId, look up by chain
+    if (loginResult.abstractAccountAddresses && currentChainId !== null) {
+        const chainIdStr = String(currentChainId);
+        const addressEntry = loginResult.abstractAccountAddresses.find((entry) => entry.chainIds.includes(chainIdStr));
+        if (addressEntry) {
+            return addressEntry.address;
+        }
+    }
+    // Fallback to legacy single address (backward compatibility)
+    return loginResult.abstractAccountAddress;
+}, _AirWalletProvider_parseChainId = function _AirWalletProvider_parseChainId(chainId) {
+    if (typeof chainId === "number") {
+        return Number.isFinite(chainId) ? chainId : null;
+    }
+    if (typeof chainId === "bigint") {
+        return Number(chainId);
+    }
+    if (typeof chainId !== "string" || !chainId) {
+        return null;
+    }
+    const parsed = chainId.startsWith("0x")
+        ? parseInt(chainId, 16)
+        : parseInt(chainId, 10);
+    return Number.isNaN(parsed) ? null : parsed;
 };
 
 var _a$3, _AuthMessageService_instance;
@@ -2429,6 +2477,29 @@ class RecoveryMessageService extends MessageServiceBase {
         await this.sendMessage({ type: AirRecoveryMessageTypes.LOGOUT_REQUEST });
         return response;
     }
+    async sendGetAgentKeysRequest() {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.GET_AGENT_KEYS_RESPONSE)));
+        await this.sendMessage({
+            type: AirRecoveryMessageTypes.GET_AGENT_KEYS_REQUEST,
+        });
+        return response;
+    }
+    async sendRegisterAgentKeyRequest(payload) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.REGISTER_AGENT_KEY_RESPONSE)));
+        await this.sendMessage({
+            type: AirRecoveryMessageTypes.REGISTER_AGENT_KEY_REQUEST,
+            payload,
+        });
+        return response;
+    }
+    async sendRemoveAgentKeyRequest(payload) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.REMOVE_AGENT_KEY_RESPONSE)));
+        await this.sendMessage({
+            type: AirRecoveryMessageTypes.REMOVE_AGENT_KEY_REQUEST,
+            payload,
+        });
+        return response;
+    }
     async open(element) {
         await this._open({ window: element.contentWindow, origin: new URL(element.src).origin });
     }
@@ -3095,6 +3166,35 @@ class AirService {
             throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
         }
     }
+    async getAgentKeys() {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendGetAgentKeysRequest();
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
+        }
+        return payload.agentKeys;
+    }
+    async registerAgentKey(publicKey) {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendRegisterAgentKeyRequest({
+            publicKey,
+        });
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
+        }
+        return {
+            id: payload.id,
+            publicKey: payload.publicKey,
+            createdAt: payload.createdAt,
+        };
+    }
+    async removeAgentKey(id) {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+        const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendRemoveAgentKeyRequest({ id });
+        if (payload.success === false) {
+            throw new AirServiceError(payload.errorName, payload.errorMessage);
+        }
+    }
     async getUserInfo() {
         __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
         const info = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
@@ -3487,6 +3587,7 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         isLoggedIn: true,
         id: payload.id,
         abstractAccountAddress: payload.abstractAccountAddress,
+        abstractAccountAddresses: payload.abstractAccountAddresses,
         token: payload.partnerAccessToken,
         isMFASetup: payload.activeMfaMethods.length > 0,
     };

package/dist/airkit.umd.js

@@ -101,7 +101,7 @@
       return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
     };
 
-    var version = "1.9.0-beta.2";
+    var version = "1.9.0-beta.3";
     var airkitPackage = {
     	version: version};
 
@@ -181,6 +181,12 @@
       RECOVERY_IFRAME_VISIBILITY_REQUEST: "air_recovery_iframe_visibility_request",
       UPDATE_SESSION_CONFIG_REQUEST: "air_recovery_update_session_config_request",
       UPDATE_SESSION_CONFIG_RESPONSE: "air_recovery_update_session_config_response",
+      GET_AGENT_KEYS_REQUEST: "air_recovery_get_agent_keys_request",
+      GET_AGENT_KEYS_RESPONSE: "air_recovery_get_agent_keys_response",
+      REGISTER_AGENT_KEY_REQUEST: "air_recovery_register_agent_key_request",
+      REGISTER_AGENT_KEY_RESPONSE: "air_recovery_register_agent_key_response",
+      REMOVE_AGENT_KEY_REQUEST: "air_recovery_remove_agent_key_request",
+      REMOVE_AGENT_KEY_RESPONSE: "air_recovery_remove_agent_key_response",
       LOGOUT_REQUEST: "air_recovery_logout_request",
       LOGOUT_RESPONSE: "air_recovery_logout_response"
     };
@@ -2016,7 +2022,7 @@
     _a$4 = ProviderMessageService;
     _ProviderMessageService_instance = { value: void 0 };
 
-    var _AirWalletProvider_instances, _AirWalletProvider_providerMessageService, _AirWalletProvider_isWalletInitialized, _AirWalletProvider_getLoginResult, _AirWalletProvider_ensureWallet, _AirWalletProvider_eventListeners, _AirWalletProvider_emit;
+    var _AirWalletProvider_instances, _AirWalletProvider_providerMessageService, _AirWalletProvider_isWalletInitialized, _AirWalletProvider_getLoginResult, _AirWalletProvider_ensureWallet, _AirWalletProvider_eventListeners, _AirWalletProvider_currentChainId, _AirWalletProvider_emit, _AirWalletProvider_getAddressForCurrentChain, _AirWalletProvider_parseChainId;
     class AirWalletProvider {
         constructor({ ensureWallet, isWalletInitialized, getLoginResult, }) {
             _AirWalletProvider_instances.add(this);
@@ -2025,11 +2031,18 @@
             _AirWalletProvider_getLoginResult.set(this, void 0);
             _AirWalletProvider_ensureWallet.set(this, void 0);
             _AirWalletProvider_eventListeners.set(this, void 0);
+            _AirWalletProvider_currentChainId.set(this, null);
             this.startEventMessageListening = async (walletIframe) => {
                 await __classPrivateFieldGet(this, _AirWalletProvider_providerMessageService, "f").open(walletIframe);
                 __classPrivateFieldGet(this, _AirWalletProvider_providerMessageService, "f").messages$
                     .pipe(filter((msg) => msg.type === AirWalletProviderMessageTypes.EVENT))
                     .subscribe((message) => {
+                    if (message.payload.event === "chainChanged") {
+                        const parsedChainId = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, message.payload.data);
+                        if (parsedChainId !== null) {
+                            __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId, "f");
+                        }
+                    }
                     __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
                 });
             };
@@ -2065,10 +2078,13 @@
             if (!loginResult) {
                 throw new UnauthorizedProviderError("User is not logged in");
             }
+            // Early return optimization: return cached address from login result if wallet not yet initialized
             if ((method === "eth_accounts" || method === "eth_requestAccounts") &&
-                !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this) &&
-                loginResult?.abstractAccountAddress) {
-                return [loginResult.abstractAccountAddress];
+                !__classPrivateFieldGet(this, _AirWalletProvider_isWalletInitialized, "f").call(this)) {
+                const address = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_getAddressForCurrentChain).call(this, loginResult);
+                if (address) {
+                    return [address];
+                }
             }
             const skipWalletLoginMethods = ["eth_chainId"];
             try {
@@ -2090,6 +2106,12 @@
             if (!response.success) {
                 throw ensureProviderRpcError(response.payload);
             }
+            if (method === "eth_chainId") {
+                const parsedChainId = __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, response.payload.response);
+                if (parsedChainId !== null) {
+                    __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId, "f");
+                }
+            }
             return response.payload.response;
         }
         on(eventName, listener) {
@@ -2113,7 +2135,7 @@
             }, "f");
         }
     }
-    _AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_isWalletInitialized = new WeakMap(), _AirWalletProvider_getLoginResult = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_eventListeners = new WeakMap(), _AirWalletProvider_instances = new WeakSet(), _AirWalletProvider_emit = function _AirWalletProvider_emit(eventName, ...args) {
+    _AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_isWalletInitialized = new WeakMap(), _AirWalletProvider_getLoginResult = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_eventListeners = new WeakMap(), _AirWalletProvider_currentChainId = new WeakMap(), _AirWalletProvider_instances = new WeakSet(), _AirWalletProvider_emit = function _AirWalletProvider_emit(eventName, ...args) {
         (__classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] || []).forEach((listener) => {
             try {
                 return listener(...args);
@@ -2122,6 +2144,32 @@
                 log.warn(error);
             }
         });
+    }, _AirWalletProvider_getAddressForCurrentChain = function _AirWalletProvider_getAddressForCurrentChain(loginResult) {
+        const currentChainId = __classPrivateFieldGet(this, _AirWalletProvider_currentChainId, "f");
+        // If we have the new addresses array and current chainId, look up by chain
+        if (loginResult.abstractAccountAddresses && currentChainId !== null) {
+            const chainIdStr = String(currentChainId);
+            const addressEntry = loginResult.abstractAccountAddresses.find((entry) => entry.chainIds.includes(chainIdStr));
+            if (addressEntry) {
+                return addressEntry.address;
+            }
+        }
+        // Fallback to legacy single address (backward compatibility)
+        return loginResult.abstractAccountAddress;
+    }, _AirWalletProvider_parseChainId = function _AirWalletProvider_parseChainId(chainId) {
+        if (typeof chainId === "number") {
+            return Number.isFinite(chainId) ? chainId : null;
+        }
+        if (typeof chainId === "bigint") {
+            return Number(chainId);
+        }
+        if (typeof chainId !== "string" || !chainId) {
+            return null;
+        }
+        const parsed = chainId.startsWith("0x")
+            ? parseInt(chainId, 16)
+            : parseInt(chainId, 10);
+        return Number.isNaN(parsed) ? null : parsed;
     };
 
     var _a$3, _AuthMessageService_instance;
@@ -2435,6 +2483,29 @@
             await this.sendMessage({ type: AirRecoveryMessageTypes.LOGOUT_REQUEST });
             return response;
         }
+        async sendGetAgentKeysRequest() {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.GET_AGENT_KEYS_RESPONSE)));
+            await this.sendMessage({
+                type: AirRecoveryMessageTypes.GET_AGENT_KEYS_REQUEST,
+            });
+            return response;
+        }
+        async sendRegisterAgentKeyRequest(payload) {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.REGISTER_AGENT_KEY_RESPONSE)));
+            await this.sendMessage({
+                type: AirRecoveryMessageTypes.REGISTER_AGENT_KEY_REQUEST,
+                payload,
+            });
+            return response;
+        }
+        async sendRemoveAgentKeyRequest(payload) {
+            const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirRecoveryMessageTypes.REMOVE_AGENT_KEY_RESPONSE)));
+            await this.sendMessage({
+                type: AirRecoveryMessageTypes.REMOVE_AGENT_KEY_REQUEST,
+                payload,
+            });
+            return response;
+        }
         async open(element) {
             await this._open({ window: element.contentWindow, origin: new URL(element.src).origin });
         }
@@ -3101,6 +3172,35 @@
                 throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
             }
         }
+        async getAgentKeys() {
+            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+            const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendGetAgentKeysRequest();
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
+            }
+            return payload.agentKeys;
+        }
+        async registerAgentKey(publicKey) {
+            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+            const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendRegisterAgentKeyRequest({
+                publicKey,
+            });
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
+            }
+            return {
+                id: payload.id,
+                publicKey: payload.publicKey,
+                createdAt: payload.createdAt,
+            };
+        }
+        async removeAgentKey(id) {
+            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+            const { payload } = await __classPrivateFieldGet(this, _AirService_recoveryMessagingService, "f").sendRemoveAgentKeyRequest({ id });
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
+            }
+        }
         async getUserInfo() {
             __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
             const info = await __classPrivateFieldGet(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
@@ -3493,6 +3593,7 @@
             isLoggedIn: true,
             id: payload.id,
             abstractAccountAddress: payload.abstractAccountAddress,
+            abstractAccountAddresses: payload.abstractAccountAddresses,
             token: payload.partnerAccessToken,
             isMFASetup: payload.activeMfaMethods.length > 0,
         };

package/dist/types/airService.d.ts

@@ -1,6 +1,6 @@
 import { AirAuthStartRecoveryRequestPayload } from "@mocanetwork/common/src/air/messaging/auth";
 import { Token } from "@mocanetwork/common/src/types";
-import { AirEventListener, AirLoginResult, AirSessionConfig, AirUserDetails, BUILD_ENV, BUILD_ENV_TYPE, ClaimAirIdOptions, ClaimAirIdResult, CredentialNetwork, CredentialVerificationResult, EIP1193Provider, ShowSwapUIOptions, ShowTransferUIOptions, ShowTransferUIResult } from "./interfaces";
+import { AgentPublicKey, AirEventListener, AirLoginResult, AirSessionConfig, AirUserDetails, BUILD_ENV, BUILD_ENV_TYPE, ClaimAirIdOptions, ClaimAirIdResult, CredentialNetwork, CredentialVerificationResult, EIP1193Provider, ShowSwapUIOptions, ShowTransferUIOptions, ShowTransferUIResult } from "./interfaces";
 declare class AirService {
     #private;
     constructor({ partnerId }: {
@@ -73,6 +73,9 @@ declare class AirService {
      * @experimental This feature has not been officially released and might change in the future.
      */
     showReceiveUI(): Promise<void>;
+    getAgentKeys(): Promise<AgentPublicKey[]>;
+    registerAgentKey(publicKey: string): Promise<AgentPublicKey>;
+    removeAgentKey(id: string): Promise<void>;
     getUserInfo(): Promise<AirUserDetails>;
     updateSessionConfig(config: Partial<AirSessionConfig>): Promise<AirSessionConfig>;
     goToPartner(partnerUrl: string): Promise<{

package/dist/types/airWalletProvider.d.ts

@@ -4,7 +4,9 @@ declare class AirWalletProvider implements EIP1193Provider {
     #private;
     constructor({ ensureWallet, isWalletInitialized, getLoginResult, }: {
         isWalletInitialized: () => boolean;
-        ensureWallet: () => Promise<AirWalletInitializedResult>;
+        ensureWallet: (option?: {
+            skipWalletLogin: boolean;
+        }) => Promise<AirWalletInitializedResult>;
         getLoginResult: () => AirLoginResult;
     });
     request(request: AirProviderParameters): Promise<unknown>;

package/dist/types/common/air/messaging/messageServiceBase.d.ts

@@ -27,7 +27,7 @@ export declare abstract class MessageServiceBase<TMessage extends AirMessageBase
         type: T;
         payload: {
             success: false;
-            errorName: import("../error/codes").AuthErrorName | import("../error/codes").PartnerAccessTokenErrorName | import("../error/codes").RealmIDErrorName | import("../error/codes").ParameterErrorName | import("../error/codes").ServerErrorName | import("../error/codes").PasskeyErrorName | import("../error/codes").PasswordlessErrorName | import("../error/codes").AuthWalletErrorName | import("../error/codes").WalletLinkErrorName | import("../error/codes").IntentErrorName | import("../error/codes").PrivyErrorName | import("../error/codes").AirIDErrorName | import("../error/codes").WindowErrorName | "USER_CANCELLED" | "CONFIG_ERROR" | "CLIENT_ERROR" | "UNKNOWN_ERROR" | "PERMISSION_NOT_ENABLED" | "SMART_ACCOUNT_NOT_DEPLOYED" | "ACCOUNT_DELETION_PENDING" | "SWAP_TO_ONRAMP" | "USER_REJECTED";
+            errorName: "USER_CANCELLED" | "CONFIG_ERROR" | "CLIENT_ERROR" | "UNKNOWN_ERROR" | "PERMISSION_NOT_ENABLED" | "SMART_ACCOUNT_NOT_DEPLOYED" | "ACCOUNT_DELETION_PENDING" | "SWAP_TO_ONRAMP" | "USER_REJECTED" | import("../error/codes").AuthErrorName | import("../error/codes").PartnerAccessTokenErrorName | import("../error/codes").RealmIDErrorName | import("../error/codes").ParameterErrorName | import("../error/codes").ServerErrorName | import("../error/codes").PasskeyErrorName | import("../error/codes").PasswordlessErrorName | import("../error/codes").AuthWalletErrorName | import("../error/codes").WalletLinkErrorName | import("../error/codes").IntentErrorName | import("../error/codes").PrivyErrorName | import("../error/codes").AirIDErrorName | import("../error/codes").WindowErrorName;
             errorMessage: string;
         };
     };

package/dist/types/common/air/messaging/recovery.d.ts

@@ -7,6 +7,12 @@ export declare const AirRecoveryMessageTypes: {
     readonly RECOVERY_IFRAME_VISIBILITY_REQUEST: "air_recovery_iframe_visibility_request";
     readonly UPDATE_SESSION_CONFIG_REQUEST: "air_recovery_update_session_config_request";
     readonly UPDATE_SESSION_CONFIG_RESPONSE: "air_recovery_update_session_config_response";
+    readonly GET_AGENT_KEYS_REQUEST: "air_recovery_get_agent_keys_request";
+    readonly GET_AGENT_KEYS_RESPONSE: "air_recovery_get_agent_keys_response";
+    readonly REGISTER_AGENT_KEY_REQUEST: "air_recovery_register_agent_key_request";
+    readonly REGISTER_AGENT_KEY_RESPONSE: "air_recovery_register_agent_key_response";
+    readonly REMOVE_AGENT_KEY_REQUEST: "air_recovery_remove_agent_key_request";
+    readonly REMOVE_AGENT_KEY_RESPONSE: "air_recovery_remove_agent_key_response";
     readonly LOGOUT_REQUEST: "air_recovery_logout_request";
     readonly LOGOUT_RESPONSE: "air_recovery_logout_response";
 };
@@ -30,6 +36,23 @@ export type AirRecoveryIframeVisibilityRequestMessage = AirRecoveryMessageBase<"
 }>;
 export type AirRecoveryUpdateSessionConfigRequestMessage = AirRecoveryMessageBase<"air_recovery_update_session_config_request", Partial<SessionConfig>>;
 export type AirRecoveryUpdateSessionConfigResponseMessage = AirRecoveryMessageBase<"air_recovery_update_session_config_response", (AirMessageSuccessPayload & SessionConfig) | AirMessageErrorPayload>;
+export type AgentPublicKey = {
+    id: string;
+    publicKey: string;
+    createdAt: string;
+};
+export type AirGetAgentKeysRequestMessage = AirRecoveryMessageBaseWithoutPayload<"air_recovery_get_agent_keys_request">;
+export type AirGetAgentKeysResponseMessage = AirRecoveryMessageBase<"air_recovery_get_agent_keys_response", (AirMessageSuccessPayload & {
+    agentKeys: AgentPublicKey[];
+}) | AirMessageErrorPayload>;
+export type AirRegisterAgentKeyRequestMessage = AirRecoveryMessageBase<"air_recovery_register_agent_key_request", {
+    publicKey: string;
+}>;
+export type AirRegisterAgentKeyResponseMessage = AirRecoveryMessageBase<"air_recovery_register_agent_key_response", (AirMessageSuccessPayload & AgentPublicKey) | AirMessageErrorPayload>;
+export type AirRemoveAgentKeyRequestMessage = AirRecoveryMessageBase<"air_recovery_remove_agent_key_request", {
+    id: string;
+}>;
+export type AirRemoveAgentKeyResponseMessage = AirRecoveryMessageBase<"air_recovery_remove_agent_key_response", AirMessageSuccessPayload | AirMessageErrorPayload>;
 export type AirLogoutRequestMessage = AirRecoveryMessageBaseWithoutPayload<"air_recovery_logout_request">;
 export type AirLogoutResponseMessage = AirRecoveryMessageBase<"air_recovery_logout_response", AirMessageSuccessPayload | AirMessageErrorPayload>;
-export type AirRecoveryMessage = AirInitializationRequestMessage | AirInitializationResponseMessage | AirRecoveryInitializedMessage | AirRecoveryIframeVisibilityRequestMessage | AirRecoveryUpdateSessionConfigRequestMessage | AirRecoveryUpdateSessionConfigResponseMessage | AirLogoutRequestMessage | AirLogoutResponseMessage;
+export type AirRecoveryMessage = AirInitializationRequestMessage | AirInitializationResponseMessage | AirRecoveryInitializedMessage | AirRecoveryIframeVisibilityRequestMessage | AirRecoveryUpdateSessionConfigRequestMessage | AirRecoveryUpdateSessionConfigResponseMessage | AirGetAgentKeysRequestMessage | AirGetAgentKeysResponseMessage | AirRegisterAgentKeyRequestMessage | AirRegisterAgentKeyResponseMessage | AirRemoveAgentKeyRequestMessage | AirRemoveAgentKeyResponseMessage | AirLogoutRequestMessage | AirLogoutResponseMessage;

package/dist/types/common/realm/user/types.d.ts

@@ -10,9 +10,14 @@ export type AirIdDetails = {
     chainId: number;
     imageUrl?: string;
 };
+export type AbstractAccountAddressEntry = {
+    readonly address: string;
+    readonly chainIds: readonly string[];
+};
 export type GlobalId = {
     id: string;
     abstractAccountAddress?: string;
+    abstractAccountAddresses?: readonly AbstractAccountAddressEntry[];
     signerQuorumId?: string | null;
 };
 export type LoggedInLoginResponse = {

package/dist/types/common/utils.d.ts

@@ -6,6 +6,15 @@ export type PromiseHandle<T> = {
 export declare function promiseCreator<T>(): PromiseHandle<T>;
 export declare const sleep: (ms: number) => Promise<unknown>;
 export declare const formatPublicKey: (publicKey: string) => string;
+export type PublicKeyValidationResult = {
+    ok: true;
+    format: 'pem' | 'base64';
+    normalizedKey: string;
+} | {
+    ok: false;
+    reason: string;
+};
+export declare function validateAndNormalizePublicKey(input: string): PublicKeyValidationResult;
 /**
  * Returns a random number. Don't use for cryptographic purposes.
  * @returns a random number

package/dist/types/interfaces.d.ts

@@ -39,10 +39,15 @@ export type AirSessionConfig = {
     currency: SupportedCurrencyCode;
 };
 export type CredentialNetwork = "devnet" | "testnet";
+export type AbstractAccountAddressEntry = {
+    readonly address: string;
+    readonly chainIds: readonly string[];
+};
 export type AirLoginResult = {
     isLoggedIn: boolean;
     id: string;
     abstractAccountAddress?: string;
+    abstractAccountAddresses?: readonly AbstractAccountAddressEntry[];
     token: string;
     isMFASetup: boolean;
 };
@@ -53,6 +58,11 @@ export type AirWalletInitializedResult = {
 export type ClaimAirIdResult = {
     airId: AirIdDetails;
 };
+export type AgentPublicKey = {
+    id: string;
+    publicKey: string;
+    createdAt: string;
+};
 export type AirEventOnInitialized = {
     event: "initialized";
     result: AirInitializationResult;

package/dist/types/recoveryMessageService.d.ts

@@ -1,5 +1,5 @@
 import { MessageServiceBase } from "./common/air/messaging/messageServiceBase";
-import { AirInitializationRequestMessage, AirRecoveryMessage, AirRecoveryUpdateSessionConfigRequestMessage } from "./common/air/messaging/recovery";
+import { AirGetAgentKeysResponseMessage, AirInitializationRequestMessage, AirRecoveryMessage, AirRegisterAgentKeyResponseMessage, AirRemoveAgentKeyResponseMessage, AirRecoveryUpdateSessionConfigRequestMessage } from "./common/air/messaging/recovery";
 export declare class RecoveryMessageService extends MessageServiceBase<AirRecoveryMessage> {
     #private;
     static create(): RecoveryMessageService;
@@ -7,6 +7,13 @@ export declare class RecoveryMessageService extends MessageServiceBase<AirRecove
     onInitialized(): Promise<import("./common/air/messaging/recovery").AirRecoveryInitializedMessage>;
     sendUpdateSessionConfigRequest(payload?: AirRecoveryUpdateSessionConfigRequestMessage["payload"]): Promise<import("./common/air/messaging/recovery").AirRecoveryUpdateSessionConfigResponseMessage>;
     logout(): Promise<import("./common/air/messaging/recovery").AirLogoutResponseMessage>;
+    sendGetAgentKeysRequest(): Promise<AirGetAgentKeysResponseMessage>;
+    sendRegisterAgentKeyRequest(payload: {
+        publicKey: string;
+    }): Promise<AirRegisterAgentKeyResponseMessage>;
+    sendRemoveAgentKeyRequest(payload: {
+        id: string;
+    }): Promise<AirRemoveAgentKeyResponseMessage>;
     open(element: HTMLIFrameElement): Promise<void>;
     close(): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mocanetwork/airkit",
-  "version": "1.9.0-beta.2",
+  "version": "1.9.0-beta.3",
   "description": "Air kit to interact with the Moca Network",
   "main": "dist/airkit.cjs.js",
   "module": "dist/airkit.esm.js",