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

package/dist/airkitConnector.cjs.js

@@ -94,7 +94,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   var e = new Error(message);
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
-var version$2 = "1.9.0-beta.2";
+var version$2 = "1.9.0-beta.3";
 var airkitPackage = {
   version: version$2
 };
@@ -172,6 +172,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"
 };
@@ -1866,7 +1872,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,
@@ -1879,9 +1885,16 @@ 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$1(this, _AirWalletProvider_providerMessageService, "f").open(walletIframe);
       __classPrivateFieldGet$1(this, _AirWalletProvider_providerMessageService, "f").messages$.pipe(filter(msg => msg.type === AirWalletProviderMessageTypes.EVENT)).subscribe(message => {
+        if (message.payload.event === "chainChanged") {
+          const parsedChainId = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, message.payload.data);
+          if (parsedChainId !== null) {
+            __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId);
+          }
+        }
         __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
       });
     };
@@ -1918,8 +1931,12 @@ class AirWalletProvider {
     if (!loginResult) {
       throw new UnauthorizedProviderError("User is not logged in");
     }
-    if ((method === "eth_accounts" || method === "eth_requestAccounts") && !__classPrivateFieldGet$1(this, _AirWalletProvider_isWalletInitialized, "f").call(this) && loginResult?.abstractAccountAddress) {
-      return [loginResult.abstractAccountAddress];
+    // Early return optimization: return cached address from login result if wallet not yet initialized
+    if ((method === "eth_accounts" || method === "eth_requestAccounts") && !__classPrivateFieldGet$1(this, _AirWalletProvider_isWalletInitialized, "f").call(this)) {
+      const address = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_getAddressForCurrentChain).call(this, loginResult);
+      if (address) {
+        return [address];
+      }
     }
     const skipWalletLoginMethods = ["eth_chainId"];
     try {
@@ -1941,6 +1958,12 @@ class AirWalletProvider {
     if (!response.success) {
       throw ensureProviderRpcError(response.payload);
     }
+    if (method === "eth_chainId") {
+      const parsedChainId = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, response.payload.response);
+      if (parsedChainId !== null) {
+        __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId);
+      }
+    }
     return response.payload.response;
   }
   on(eventName, listener) {
@@ -1964,7 +1987,7 @@ class AirWalletProvider {
     });
   }
 }
-_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$1(this, _AirWalletProvider_eventListeners, "f")[eventName] || []).forEach(listener => {
     try {
       return listener(...args);
@@ -1972,6 +1995,30 @@ _AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_is
       log$1.warn(error);
     }
   });
+}, _AirWalletProvider_getAddressForCurrentChain = function _AirWalletProvider_getAddressForCurrentChain(loginResult) {
+  const currentChainId = __classPrivateFieldGet$1(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;
 const ALLOWED_AUTH_MESSAGES = [AirAuthMessageTypes.INITIALIZATION_RESPONSE, AirAuthMessageTypes.LOGIN_RESPONSE, AirAuthMessageTypes.SETUP_WALLET_REQUEST, AirAuthMessageTypes.SETUP_RECOVERY_REQUEST, AirAuthMessageTypes.SETUP_CREDENTIAL_REQUEST, AirAuthMessageTypes.LOGOUT_RESPONSE, AirAuthMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE, AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE, AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE, AirAuthMessageTypes.PARTNER_ACCESS_TOKEN_RESPONSE, AirAuthMessageTypes.IFRAME_VISIBILITY_REQUEST, AirAuthMessageTypes.START_RECOVERY_RESPONSE, AirAuthMessageTypes.EXPIRED_LOGOUT_REQUEST];
@@ -2279,6 +2326,29 @@ class RecoveryMessageService extends MessageServiceBase {
     });
     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,
@@ -2992,6 +3062,43 @@ class AirService {
       throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
     }
   }
+  async getAgentKeys() {
+    await __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+    const {
+      payload
+    } = await __classPrivateFieldGet$1(this, _AirService_recoveryMessagingService, "f").sendGetAgentKeysRequest();
+    if (payload.success === false) {
+      throw new AirServiceError(payload.errorName, payload.errorMessage);
+    }
+    return payload.agentKeys;
+  }
+  async registerAgentKey(publicKey) {
+    await __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+    const {
+      payload
+    } = await __classPrivateFieldGet$1(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$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+    const {
+      payload
+    } = await __classPrivateFieldGet$1(this, _AirService_recoveryMessagingService, "f").sendRemoveAgentKeyRequest({
+      id
+    });
+    if (payload.success === false) {
+      throw new AirServiceError(payload.errorName, payload.errorMessage);
+    }
+  }
   async getUserInfo() {
     __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
     const info = await __classPrivateFieldGet$1(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
@@ -3401,6 +3508,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/airkitConnector.esm.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   var e = new Error(message);
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
-var version$2 = "1.9.0-beta.2";
+var version$2 = "1.9.0-beta.3";
 var airkitPackage = {
   version: version$2
 };
@@ -170,6 +170,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"
 };
@@ -1864,7 +1870,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,
@@ -1877,9 +1883,16 @@ 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$1(this, _AirWalletProvider_providerMessageService, "f").open(walletIframe);
       __classPrivateFieldGet$1(this, _AirWalletProvider_providerMessageService, "f").messages$.pipe(filter(msg => msg.type === AirWalletProviderMessageTypes.EVENT)).subscribe(message => {
+        if (message.payload.event === "chainChanged") {
+          const parsedChainId = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, message.payload.data);
+          if (parsedChainId !== null) {
+            __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId);
+          }
+        }
         __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
       });
     };
@@ -1916,8 +1929,12 @@ class AirWalletProvider {
     if (!loginResult) {
       throw new UnauthorizedProviderError("User is not logged in");
     }
-    if ((method === "eth_accounts" || method === "eth_requestAccounts") && !__classPrivateFieldGet$1(this, _AirWalletProvider_isWalletInitialized, "f").call(this) && loginResult?.abstractAccountAddress) {
-      return [loginResult.abstractAccountAddress];
+    // Early return optimization: return cached address from login result if wallet not yet initialized
+    if ((method === "eth_accounts" || method === "eth_requestAccounts") && !__classPrivateFieldGet$1(this, _AirWalletProvider_isWalletInitialized, "f").call(this)) {
+      const address = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_getAddressForCurrentChain).call(this, loginResult);
+      if (address) {
+        return [address];
+      }
     }
     const skipWalletLoginMethods = ["eth_chainId"];
     try {
@@ -1939,6 +1956,12 @@ class AirWalletProvider {
     if (!response.success) {
       throw ensureProviderRpcError(response.payload);
     }
+    if (method === "eth_chainId") {
+      const parsedChainId = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, response.payload.response);
+      if (parsedChainId !== null) {
+        __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId);
+      }
+    }
     return response.payload.response;
   }
   on(eventName, listener) {
@@ -1962,7 +1985,7 @@ class AirWalletProvider {
     });
   }
 }
-_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$1(this, _AirWalletProvider_eventListeners, "f")[eventName] || []).forEach(listener => {
     try {
       return listener(...args);
@@ -1970,6 +1993,30 @@ _AirWalletProvider_providerMessageService = new WeakMap(), _AirWalletProvider_is
       log$1.warn(error);
     }
   });
+}, _AirWalletProvider_getAddressForCurrentChain = function _AirWalletProvider_getAddressForCurrentChain(loginResult) {
+  const currentChainId = __classPrivateFieldGet$1(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;
 const ALLOWED_AUTH_MESSAGES = [AirAuthMessageTypes.INITIALIZATION_RESPONSE, AirAuthMessageTypes.LOGIN_RESPONSE, AirAuthMessageTypes.SETUP_WALLET_REQUEST, AirAuthMessageTypes.SETUP_RECOVERY_REQUEST, AirAuthMessageTypes.SETUP_CREDENTIAL_REQUEST, AirAuthMessageTypes.LOGOUT_RESPONSE, AirAuthMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE, AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE, AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE, AirAuthMessageTypes.PARTNER_ACCESS_TOKEN_RESPONSE, AirAuthMessageTypes.IFRAME_VISIBILITY_REQUEST, AirAuthMessageTypes.START_RECOVERY_RESPONSE, AirAuthMessageTypes.EXPIRED_LOGOUT_REQUEST];
@@ -2277,6 +2324,29 @@ class RecoveryMessageService extends MessageServiceBase {
     });
     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,
@@ -2990,6 +3060,43 @@ class AirService {
       throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
     }
   }
+  async getAgentKeys() {
+    await __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+    const {
+      payload
+    } = await __classPrivateFieldGet$1(this, _AirService_recoveryMessagingService, "f").sendGetAgentKeysRequest();
+    if (payload.success === false) {
+      throw new AirServiceError(payload.errorName, payload.errorMessage);
+    }
+    return payload.agentKeys;
+  }
+  async registerAgentKey(publicKey) {
+    await __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+    const {
+      payload
+    } = await __classPrivateFieldGet$1(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$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+    const {
+      payload
+    } = await __classPrivateFieldGet$1(this, _AirService_recoveryMessagingService, "f").sendRemoveAgentKeyRequest({
+      id
+    });
+    if (payload.success === false) {
+      throw new AirServiceError(payload.errorName, payload.errorMessage);
+    }
+  }
   async getUserInfo() {
     __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
     const info = await __classPrivateFieldGet$1(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
@@ -3399,6 +3506,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/airkitConnector.umd.js

@@ -98,7 +98,7 @@
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
   };
-  var version$2 = "1.9.0-beta.2";
+  var version$2 = "1.9.0-beta.3";
   var airkitPackage = {
     version: version$2
   };
@@ -176,6 +176,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"
   };
@@ -1870,7 +1876,7 @@
   _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,
@@ -1883,9 +1889,16 @@
       _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$1(this, _AirWalletProvider_providerMessageService, "f").open(walletIframe);
         __classPrivateFieldGet$1(this, _AirWalletProvider_providerMessageService, "f").messages$.pipe(filter(msg => msg.type === AirWalletProviderMessageTypes.EVENT)).subscribe(message => {
+          if (message.payload.event === "chainChanged") {
+            const parsedChainId = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, message.payload.data);
+            if (parsedChainId !== null) {
+              __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId);
+            }
+          }
           __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
         });
       };
@@ -1922,8 +1935,12 @@
       if (!loginResult) {
         throw new UnauthorizedProviderError("User is not logged in");
       }
-      if ((method === "eth_accounts" || method === "eth_requestAccounts") && !__classPrivateFieldGet$1(this, _AirWalletProvider_isWalletInitialized, "f").call(this) && loginResult?.abstractAccountAddress) {
-        return [loginResult.abstractAccountAddress];
+      // Early return optimization: return cached address from login result if wallet not yet initialized
+      if ((method === "eth_accounts" || method === "eth_requestAccounts") && !__classPrivateFieldGet$1(this, _AirWalletProvider_isWalletInitialized, "f").call(this)) {
+        const address = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_getAddressForCurrentChain).call(this, loginResult);
+        if (address) {
+          return [address];
+        }
       }
       const skipWalletLoginMethods = ["eth_chainId"];
       try {
@@ -1945,6 +1962,12 @@
       if (!response.success) {
         throw ensureProviderRpcError(response.payload);
       }
+      if (method === "eth_chainId") {
+        const parsedChainId = __classPrivateFieldGet$1(this, _AirWalletProvider_instances, "m", _AirWalletProvider_parseChainId).call(this, response.payload.response);
+        if (parsedChainId !== null) {
+          __classPrivateFieldSet(this, _AirWalletProvider_currentChainId, parsedChainId);
+        }
+      }
       return response.payload.response;
     }
     on(eventName, listener) {
@@ -1968,7 +1991,7 @@
       });
     }
   }
-  _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$1(this, _AirWalletProvider_eventListeners, "f")[eventName] || []).forEach(listener => {
       try {
         return listener(...args);
@@ -1976,6 +1999,30 @@
         log$1.warn(error);
       }
     });
+  }, _AirWalletProvider_getAddressForCurrentChain = function _AirWalletProvider_getAddressForCurrentChain(loginResult) {
+    const currentChainId = __classPrivateFieldGet$1(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;
   const ALLOWED_AUTH_MESSAGES = [AirAuthMessageTypes.INITIALIZATION_RESPONSE, AirAuthMessageTypes.LOGIN_RESPONSE, AirAuthMessageTypes.SETUP_WALLET_REQUEST, AirAuthMessageTypes.SETUP_RECOVERY_REQUEST, AirAuthMessageTypes.SETUP_CREDENTIAL_REQUEST, AirAuthMessageTypes.LOGOUT_RESPONSE, AirAuthMessageTypes.UPDATE_SESSION_CONFIG_RESPONSE, AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE, AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE, AirAuthMessageTypes.PARTNER_ACCESS_TOKEN_RESPONSE, AirAuthMessageTypes.IFRAME_VISIBILITY_REQUEST, AirAuthMessageTypes.START_RECOVERY_RESPONSE, AirAuthMessageTypes.EXPIRED_LOGOUT_REQUEST];
@@ -2283,6 +2330,29 @@
       });
       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,
@@ -2996,6 +3066,43 @@
         throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
       }
     }
+    async getAgentKeys() {
+      await __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+      const {
+        payload
+      } = await __classPrivateFieldGet$1(this, _AirService_recoveryMessagingService, "f").sendGetAgentKeysRequest();
+      if (payload.success === false) {
+        throw new AirServiceError(payload.errorName, payload.errorMessage);
+      }
+      return payload.agentKeys;
+    }
+    async registerAgentKey(publicKey) {
+      await __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+      const {
+        payload
+      } = await __classPrivateFieldGet$1(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$1(this, _AirService_instances, "m", _AirService_ensureRecovery).call(this);
+      const {
+        payload
+      } = await __classPrivateFieldGet$1(this, _AirService_recoveryMessagingService, "f").sendRemoveAgentKeyRequest({
+        id
+      });
+      if (payload.success === false) {
+        throw new AirServiceError(payload.errorName, payload.errorMessage);
+      }
+    }
     async getUserInfo() {
       __classPrivateFieldGet$1(this, _AirService_instances, "m", _AirService_assertLoggedIn).call(this);
       const info = await __classPrivateFieldGet$1(this, _AirService_authMessagingService, "f").sendPartnerUserInfoRequest();
@@ -3405,6 +3512,7 @@
       isLoggedIn: true,
       id: payload.id,
       abstractAccountAddress: payload.abstractAccountAddress,
+      abstractAccountAddresses: payload.abstractAccountAddresses,
       token: payload.partnerAccessToken,
       isMFASetup: payload.activeMfaMethods.length > 0
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mocanetwork/airkit-connector",
-  "version": "1.9.0-beta.2",
+  "version": "1.9.0-beta.3",
   "description": "AirKit wagmi connector to connect with the AirService",
   "main": "dist/airkitConnector.cjs.js",
   "unpkg": "dist/airkitConnector.umd.min.js",
@@ -24,7 +24,7 @@
     "check-circular": "madge -c --ts-config=tsconfig.json --extensions ts ./src"
   },
   "dependencies": {
-    "@mocanetwork/airkit": "^1.9.0-beta.2",
+    "@mocanetwork/airkit": "^1.9.0-beta.3",
     "@wagmi/core": "^2.x",
     "loglevel": "^1.8.1",
     "viem": "^2.x"