@mocanetwork/airkit 0.6.0-beta.0 → 1.1.0-beta.0

package/dist/airkit.cjs.js

@@ -34,117 +34,6 @@ function __extends(d, b) {
   }
   d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 }
-function __awaiter(thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-}
-function __generator(thisArg, body) {
-  var _ = {
-      label: 0,
-      sent: function () {
-        if (t[0] & 1) throw t[1];
-        return t[1];
-      },
-      trys: [],
-      ops: []
-    },
-    f,
-    y,
-    t,
-    g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-  return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (g && (g = 0, op[0] && (_ = 0)), _) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0:
-        case 1:
-          t = op;
-          break;
-        case 4:
-          _.label++;
-          return {
-            value: op[1],
-            done: false
-          };
-        case 5:
-          _.label++;
-          y = op[1];
-          op = [0];
-          continue;
-        case 7:
-          op = _.ops.pop();
-          _.trys.pop();
-          continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-            _ = 0;
-            continue;
-          }
-          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-            _.label = op[1];
-            break;
-          }
-          if (op[0] === 6 && _.label < t[1]) {
-            _.label = t[1];
-            t = op;
-            break;
-          }
-          if (t && _.label < t[2]) {
-            _.label = t[2];
-            _.ops.push(op);
-            break;
-          }
-          if (t[2]) _.ops.pop();
-          _.trys.pop();
-          continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) {
-      op = [6, e];
-      y = 0;
-    } finally {
-      f = t = 0;
-    }
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : undefined,
-      done: true
-    };
-  }
-}
 function __values(o) {
   var s = typeof Symbol === "function" && Symbol.iterator,
     m = s && o[s],
@@ -192,75 +81,6 @@ function __spreadArray(to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 }
-function __await(v) {
-  return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-function __asyncGenerator(thisArg, _arguments, generator) {
-  if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-  var g = generator.apply(thisArg, _arguments || []),
-    i,
-    q = [];
-  return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () {
-    return this;
-  }, i;
-  function awaitReturn(f) {
-    return function (v) {
-      return Promise.resolve(v).then(f, reject);
-    };
-  }
-  function verb(n, f) {
-    if (g[n]) {
-      i[n] = function (v) {
-        return new Promise(function (a, b) {
-          q.push([n, v, a, b]) > 1 || resume(n, v);
-        });
-      };
-      if (f) i[n] = f(i[n]);
-    }
-  }
-  function resume(n, v) {
-    try {
-      step(g[n](v));
-    } catch (e) {
-      settle(q[0][3], e);
-    }
-  }
-  function step(r) {
-    r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r);
-  }
-  function fulfill(value) {
-    resume("next", value);
-  }
-  function reject(value) {
-    resume("throw", value);
-  }
-  function settle(f, v) {
-    if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]);
-  }
-}
-function __asyncValues(o) {
-  if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-  var m = o[Symbol.asyncIterator],
-    i;
-  return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () {
-    return this;
-  }, i);
-  function verb(n) {
-    i[n] = o[n] && function (v) {
-      return new Promise(function (resolve, reject) {
-        v = o[n](v), settle(resolve, reject, v.done, v.value);
-      });
-    };
-  }
-  function settle(resolve, reject, d, v) {
-    Promise.resolve(v).then(function (v) {
-      resolve({
-        value: v,
-        done: d
-      });
-    }, reject);
-  }
-}
 function __classPrivateFieldGet(receiver, state, kind, f) {
   if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
   if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -298,8 +118,11 @@ const AirAuthMessageTypes = {
   SETUP_WALLET_RESPONSE: "air_auth_setup_wallet_response",
   SIGN_SIWE_MESSAGE_REQUEST: "air_auth_sign_siwe_message_request",
   SIGN_SIWE_MESSAGE_RESPONSE: "air_auth_sign_siwe_message_response",
+  CROSS_PARTNER_TOKEN_REQUEST: "air_auth_cross_partner_token_request",
+  CROSS_PARTNER_TOKEN_RESPONSE: "air_auth_cross_partner_token_response",
   LOGOUT_REQUEST: "air_auth_logout_request",
-  LOGOUT_RESPONSE: "air_auth_logout_response"
+  LOGOUT_RESPONSE: "air_auth_logout_response",
+  RESET_WALLET_COMMUNICATION: "air_auth_reset_wallet_communication"
 };
 
 const AirMessageTypes = {
@@ -308,10 +131,8 @@ const AirMessageTypes = {
   INITIALIZATION_RESPONSE: "air_initialization_response",
   INIT_AUTH_COMMUNICATION: "air_init_auth_communication",
   WALLET_INITIALIZED: "air_wallet_initialized",
-  LOGIN_REQUEST: "air_login_request",
-  CLAIM_REQUEST: "air_claim_request",
-  LOGIN_CLAIM_STATE: "air_login_claim_state",
-  CLOSE_MODAL: "air_close_modal",
+  CLAIM_ID_REQUEST: "air_claim_id_request",
+  CLAIM_ID_RESPONSE: "air_claim_id_response",
   DEPLOY_SMART_ACCOUNT_REQUEST: "air_deploy_smart_account_request",
   DEPLOY_SMART_ACCOUNT_RESPONSE: "air_deploy_smart_account_response",
   GRANT_PERMISSIONS_REQUEST: "air_grant_permissions_request",
@@ -320,54 +141,159 @@ const AirMessageTypes = {
   EXECUTE_ACTION_RESPONSE: "air_execute_action_response",
   REVOKE_PERMISSIONS_REQUEST: "air_revoke_permissions_request",
   REVOKE_PERMISSIONS_RESPONSE: "air_revoke_permissions_response",
-  WALLET_IFRAME_VISIBILITY_REQUEST: "air_wallet_iframe_visibility_request"
+  WALLET_IFRAME_VISIBILITY_REQUEST: "air_wallet_iframe_visibility_request",
+  IS_SMART_ACCOUNT_DEPLOYED_REQUEST: "air_is_smart_account_deployed_request",
+  IS_SMART_ACCOUNT_DEPLOYED_RESPONSE: "air_is_smart_account_deployed_response",
+  LOGOUT_REQUEST: "air_logout_request",
+  LOGOUT_RESPONSE: "air_logout_response",
+  SETUP_MFA_REQUEST: "air_setup_mfa_request"
 };
 
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+class BaseError extends Error {
+  constructor(name, message, options = {}) {
+    const {
+      cause,
+      context
+    } = options;
+    super(message || name);
+    this.name = name;
+    this.stack = cause?.stack;
+    this.cause = cause;
+    this.context = context;
+  }
+  toJSON() {
+    return {
+      name: this.name,
+      message: this.message,
+      context: this.context,
+      cause: this.cause
+    };
+  }
 }
 
-var fastDeepEqual;
-var hasRequiredFastDeepEqual;
-function requireFastDeepEqual() {
-  if (hasRequiredFastDeepEqual) return fastDeepEqual;
-  hasRequiredFastDeepEqual = 1;
-
-  // do not edit .js files directly - edit src/index.jst
-
-  fastDeepEqual = function equal(a, b) {
-    if (a === b) return true;
-    if (a && b && typeof a == 'object' && typeof b == 'object') {
-      if (a.constructor !== b.constructor) return false;
-      var length, i, keys;
-      if (Array.isArray(a)) {
-        length = a.length;
-        if (length != b.length) return false;
-        for (i = length; i-- !== 0;) if (!equal(a[i], b[i])) return false;
-        return true;
-      }
-      if (a.constructor === RegExp) return a.source === b.source && a.flags === b.flags;
-      if (a.valueOf !== Object.prototype.valueOf) return a.valueOf() === b.valueOf();
-      if (a.toString !== Object.prototype.toString) return a.toString() === b.toString();
-      keys = Object.keys(a);
-      length = keys.length;
-      if (length !== Object.keys(b).length) return false;
-      for (i = length; i-- !== 0;) if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;
-      for (i = length; i-- !== 0;) {
-        var key = keys[i];
-        if (!equal(a[key], b[key])) return false;
-      }
-      return true;
+class AirServiceError extends BaseError {
+    static from(error) {
+        if (error instanceof AirServiceError) {
+            return error;
+        }
+        else if (error instanceof Object && "message" in error) {
+            if (error.message === "User cancelled login") {
+                return new AirServiceError("USER_CANCELLED", error.message);
+            }
+            return new AirServiceError("UNKNOWN_ERROR", error.message.toString());
+        }
+        return new AirServiceError("UNKNOWN_ERROR");
     }
-
-    // true if both NaN, false otherwise
-    return a !== a && b !== b;
-  };
-  return fastDeepEqual;
 }
-
-var fastDeepEqualExports = requireFastDeepEqual();
-var equal = /*@__PURE__*/getDefaultExportFromCjs(fastDeepEqualExports);
+class ProviderRpcError extends Error {
+    constructor(message) {
+        super(message);
+    }
+}
+class UserRejectedRequestError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = 4001;
+        this.name = "UserRejectedRequestError";
+    }
+}
+class UnauthorizedProviderError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = 4100;
+        this.name = "UnauthorizedProviderError";
+    }
+}
+class UnsupportedProviderMethodError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = 4200;
+        this.name = "UnsupportedProviderMethodError";
+    }
+}
+class ProviderDisconnectedError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = 4900;
+        this.name = "ProviderDisconnectedError";
+    }
+}
+class ChainDisconnectedError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = 4901;
+        this.name = "ChainDisconnectedError";
+    }
+}
+class SwitchChainError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = 4902;
+        this.name = "SwitchChainError";
+    }
+}
+class InvalidRequestRpcError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = -32600;
+        this.name = "InvalidRequestRpcError";
+    }
+}
+class MethodNotFoundRpcError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = -32601;
+        this.name = "MethodNotFoundRpcError";
+    }
+}
+class InvalidParamsRpcError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = -32602;
+        this.name = "InvalidParamsRpcError";
+    }
+}
+class InternalRpcError extends ProviderRpcError {
+    constructor() {
+        super(...arguments);
+        this.code = -32603;
+        this.name = "InternalRpcError";
+    }
+}
+function ensureProviderRpcError(value) {
+    if (value instanceof ProviderRpcError) {
+        return value;
+    }
+    if (typeof value === "object" &&
+        value !== null &&
+        "errorCode" in value &&
+        "errorMessage" in value) {
+        if (typeof value.errorCode === "number" && typeof value.errorMessage === "string") {
+            switch (value.errorCode) {
+                case 4001:
+                    return new UserRejectedRequestError(value.errorMessage);
+                case 4100:
+                    return new UnauthorizedProviderError(value.errorMessage);
+                case 4200:
+                    return new UnsupportedProviderMethodError(value.errorMessage);
+                case 4900:
+                    return new ProviderDisconnectedError(value.errorMessage);
+                case 4901:
+                    return new ChainDisconnectedError(value.errorMessage);
+                case 4902:
+                    return new SwitchChainError(value.errorMessage);
+            }
+        }
+    }
+    let stringified = "[Unable to stringify the thrown value]";
+    try {
+        stringified = JSON.stringify(value);
+    }
+    catch {
+        // ignoring failed stringify
+    }
+    return new InternalRpcError(`Invalid value for ProviderRpcError: ${stringified}`);
+}
 
 function isFunction(value) {
   return typeof value === 'function';
@@ -1049,609 +975,58 @@ var AnonymousSubject = function (_super) {
   AnonymousSubject.prototype.error = function (err) {
     var _a, _b;
     (_b = (_a = this.destination) === null || _a === undefined ? undefined : _a.error) === null || _b === undefined ? undefined : _b.call(_a, err);
-  };
-  AnonymousSubject.prototype.complete = function () {
-    var _a, _b;
-    (_b = (_a = this.destination) === null || _a === undefined ? undefined : _a.complete) === null || _b === undefined ? undefined : _b.call(_a);
-  };
-  AnonymousSubject.prototype._subscribe = function (subscriber) {
-    var _a, _b;
-    return (_b = (_a = this.source) === null || _a === undefined ? undefined : _a.subscribe(subscriber)) !== null && _b !== undefined ? _b : EMPTY_SUBSCRIPTION;
-  };
-  return AnonymousSubject;
-}(Subject);
-
-var EMPTY = new Observable(function (subscriber) {
-  return subscriber.complete();
-});
-
-function last$1(arr) {
-  return arr[arr.length - 1];
-}
-function popResultSelector(args) {
-  return isFunction(last$1(args)) ? args.pop() : undefined;
-}
-
-var isArrayLike = function (x) {
-  return x && typeof x.length === 'number' && typeof x !== 'function';
-};
-
-function isPromise(value) {
-  return isFunction(value === null || value === undefined ? undefined : value.then);
-}
-
-function isInteropObservable(input) {
-  return isFunction(input[observable]);
-}
-
-function isAsyncIterable(obj) {
-  return Symbol.asyncIterator && isFunction(obj === null || obj === undefined ? undefined : obj[Symbol.asyncIterator]);
-}
-
-function createInvalidObservableTypeError(input) {
-  return new TypeError("You provided " + (input !== null && typeof input === 'object' ? 'an invalid object' : "'" + input + "'") + " where a stream was expected. You can provide an Observable, Promise, ReadableStream, Array, AsyncIterable, or Iterable.");
-}
-
-function getSymbolIterator() {
-  if (typeof Symbol !== 'function' || !Symbol.iterator) {
-    return '@@iterator';
-  }
-  return Symbol.iterator;
-}
-var iterator = getSymbolIterator();
-
-function isIterable(input) {
-  return isFunction(input === null || input === undefined ? undefined : input[iterator]);
-}
-
-function readableStreamLikeToAsyncGenerator(readableStream) {
-  return __asyncGenerator(this, arguments, function readableStreamLikeToAsyncGenerator_1() {
-    var reader, _a, value, done;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          reader = readableStream.getReader();
-          _b.label = 1;
-        case 1:
-          _b.trys.push([1,, 9, 10]);
-          _b.label = 2;
-        case 2:
-          return [4, __await(reader.read())];
-        case 3:
-          _a = _b.sent(), value = _a.value, done = _a.done;
-          if (!done) return [3, 5];
-          return [4, __await(undefined)];
-        case 4:
-          return [2, _b.sent()];
-        case 5:
-          return [4, __await(value)];
-        case 6:
-          return [4, _b.sent()];
-        case 7:
-          _b.sent();
-          return [3, 2];
-        case 8:
-          return [3, 10];
-        case 9:
-          reader.releaseLock();
-          return [7];
-        case 10:
-          return [2];
-      }
-    });
-  });
-}
-function isReadableStreamLike(obj) {
-  return isFunction(obj === null || obj === undefined ? undefined : obj.getReader);
-}
-
-function innerFrom(input) {
-  if (input instanceof Observable) {
-    return input;
-  }
-  if (input != null) {
-    if (isInteropObservable(input)) {
-      return fromInteropObservable(input);
-    }
-    if (isArrayLike(input)) {
-      return fromArrayLike(input);
-    }
-    if (isPromise(input)) {
-      return fromPromise(input);
-    }
-    if (isAsyncIterable(input)) {
-      return fromAsyncIterable(input);
-    }
-    if (isIterable(input)) {
-      return fromIterable(input);
-    }
-    if (isReadableStreamLike(input)) {
-      return fromReadableStreamLike(input);
-    }
-  }
-  throw createInvalidObservableTypeError(input);
-}
-function fromInteropObservable(obj) {
-  return new Observable(function (subscriber) {
-    var obs = obj[observable]();
-    if (isFunction(obs.subscribe)) {
-      return obs.subscribe(subscriber);
-    }
-    throw new TypeError('Provided object does not correctly implement Symbol.observable');
-  });
-}
-function fromArrayLike(array) {
-  return new Observable(function (subscriber) {
-    for (var i = 0; i < array.length && !subscriber.closed; i++) {
-      subscriber.next(array[i]);
-    }
-    subscriber.complete();
-  });
-}
-function fromPromise(promise) {
-  return new Observable(function (subscriber) {
-    promise.then(function (value) {
-      if (!subscriber.closed) {
-        subscriber.next(value);
-        subscriber.complete();
-      }
-    }, function (err) {
-      return subscriber.error(err);
-    }).then(null, reportUnhandledError);
-  });
-}
-function fromIterable(iterable) {
-  return new Observable(function (subscriber) {
-    var e_1, _a;
-    try {
-      for (var iterable_1 = __values(iterable), iterable_1_1 = iterable_1.next(); !iterable_1_1.done; iterable_1_1 = iterable_1.next()) {
-        var value = iterable_1_1.value;
-        subscriber.next(value);
-        if (subscriber.closed) {
-          return;
-        }
-      }
-    } catch (e_1_1) {
-      e_1 = {
-        error: e_1_1
-      };
-    } finally {
-      try {
-        if (iterable_1_1 && !iterable_1_1.done && (_a = iterable_1.return)) _a.call(iterable_1);
-      } finally {
-        if (e_1) throw e_1.error;
-      }
-    }
-    subscriber.complete();
-  });
-}
-function fromAsyncIterable(asyncIterable) {
-  return new Observable(function (subscriber) {
-    process(asyncIterable, subscriber).catch(function (err) {
-      return subscriber.error(err);
-    });
-  });
-}
-function fromReadableStreamLike(readableStream) {
-  return fromAsyncIterable(readableStreamLikeToAsyncGenerator(readableStream));
-}
-function process(asyncIterable, subscriber) {
-  var asyncIterable_1, asyncIterable_1_1;
-  var e_2, _a;
-  return __awaiter(this, undefined, undefined, function () {
-    var value, e_2_1;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          _b.trys.push([0, 5, 6, 11]);
-          asyncIterable_1 = __asyncValues(asyncIterable);
-          _b.label = 1;
-        case 1:
-          return [4, asyncIterable_1.next()];
-        case 2:
-          if (!(asyncIterable_1_1 = _b.sent(), !asyncIterable_1_1.done)) return [3, 4];
-          value = asyncIterable_1_1.value;
-          subscriber.next(value);
-          if (subscriber.closed) {
-            return [2];
-          }
-          _b.label = 3;
-        case 3:
-          return [3, 1];
-        case 4:
-          return [3, 11];
-        case 5:
-          e_2_1 = _b.sent();
-          e_2 = {
-            error: e_2_1
-          };
-          return [3, 11];
-        case 6:
-          _b.trys.push([6,, 9, 10]);
-          if (!(asyncIterable_1_1 && !asyncIterable_1_1.done && (_a = asyncIterable_1.return))) return [3, 8];
-          return [4, _a.call(asyncIterable_1)];
-        case 7:
-          _b.sent();
-          _b.label = 8;
-        case 8:
-          return [3, 10];
-        case 9:
-          if (e_2) throw e_2.error;
-          return [7];
-        case 10:
-          return [7];
-        case 11:
-          subscriber.complete();
-          return [2];
-      }
-    });
-  });
-}
-
-var EmptyError = createErrorClass(function (_super) {
-  return function EmptyErrorImpl() {
-    _super(this);
-    this.name = 'EmptyError';
-    this.message = 'no elements in sequence';
-  };
-});
-
-function lastValueFrom(source, config) {
-  return new Promise(function (resolve, reject) {
-    var _hasValue = false;
-    var _value;
-    source.subscribe({
-      next: function (value) {
-        _value = value;
-        _hasValue = true;
-      },
-      error: reject,
-      complete: function () {
-        if (_hasValue) {
-          resolve(_value);
-        } else {
-          reject(new EmptyError());
-        }
-      }
-    });
-  });
-}
-
-function firstValueFrom(source, config) {
-  return new Promise(function (resolve, reject) {
-    var subscriber = new SafeSubscriber({
-      next: function (value) {
-        resolve(value);
-        subscriber.unsubscribe();
-      },
-      error: reject,
-      complete: function () {
-        {
-          reject(new EmptyError());
-        }
-      }
-    });
-    source.subscribe(subscriber);
-  });
-}
-
-function map(project, thisArg) {
-  return operate(function (source, subscriber) {
-    var index = 0;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      subscriber.next(project.call(thisArg, value, index++));
-    }));
-  });
-}
-
-var isArray$1 = Array.isArray;
-function callOrApply(fn, args) {
-  return isArray$1(args) ? fn.apply(undefined, __spreadArray([], __read(args))) : fn(args);
-}
-function mapOneOrManyArgs(fn) {
-  return map(function (args) {
-    return callOrApply(fn, args);
-  });
-}
-
-var isArray = Array.isArray;
-var getPrototypeOf = Object.getPrototypeOf,
-  objectProto = Object.prototype,
-  getKeys = Object.keys;
-function argsArgArrayOrObject(args) {
-  if (args.length === 1) {
-    var first_1 = args[0];
-    if (isArray(first_1)) {
-      return {
-        args: first_1,
-        keys: null
-      };
-    }
-    if (isPOJO(first_1)) {
-      var keys = getKeys(first_1);
-      return {
-        args: keys.map(function (key) {
-          return first_1[key];
-        }),
-        keys: keys
-      };
-    }
-  }
-  return {
-    args: args,
-    keys: null
-  };
-}
-function isPOJO(obj) {
-  return obj && typeof obj === 'object' && getPrototypeOf(obj) === objectProto;
-}
-
-function createObject(keys, values) {
-  return keys.reduce(function (result, key, i) {
-    return result[key] = values[i], result;
-  }, {});
-}
-
-function forkJoin() {
-  var args = [];
-  for (var _i = 0; _i < arguments.length; _i++) {
-    args[_i] = arguments[_i];
-  }
-  var resultSelector = popResultSelector(args);
-  var _a = argsArgArrayOrObject(args),
-    sources = _a.args,
-    keys = _a.keys;
-  var result = new Observable(function (subscriber) {
-    var length = sources.length;
-    if (!length) {
-      subscriber.complete();
-      return;
-    }
-    var values = new Array(length);
-    var remainingCompletions = length;
-    var remainingEmissions = length;
-    var _loop_1 = function (sourceIndex) {
-      var hasValue = false;
-      innerFrom(sources[sourceIndex]).subscribe(createOperatorSubscriber(subscriber, function (value) {
-        if (!hasValue) {
-          hasValue = true;
-          remainingEmissions--;
-        }
-        values[sourceIndex] = value;
-      }, function () {
-        return remainingCompletions--;
-      }, undefined, function () {
-        if (!remainingCompletions || !hasValue) {
-          if (!remainingEmissions) {
-            subscriber.next(keys ? createObject(keys, values) : values);
-          }
-          subscriber.complete();
-        }
-      }));
-    };
-    for (var sourceIndex = 0; sourceIndex < length; sourceIndex++) {
-      _loop_1(sourceIndex);
-    }
-  });
-  return resultSelector ? result.pipe(mapOneOrManyArgs(resultSelector)) : result;
-}
-
-function filter(predicate, thisArg) {
-  return operate(function (source, subscriber) {
-    var index = 0;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      return predicate.call(thisArg, value, index++) && subscriber.next(value);
-    }));
-  });
-}
-
-function defaultIfEmpty(defaultValue) {
-  return operate(function (source, subscriber) {
-    var hasValue = false;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      hasValue = true;
-      subscriber.next(value);
-    }, function () {
-      if (!hasValue) {
-        subscriber.next(defaultValue);
-      }
-      subscriber.complete();
-    }));
-  });
-}
-
-function take(count) {
-  return count <= 0 ? function () {
-    return EMPTY;
-  } : operate(function (source, subscriber) {
-    var seen = 0;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      if (++seen <= count) {
-        subscriber.next(value);
-        if (count <= seen) {
-          subscriber.complete();
-        }
-      }
-    }));
-  });
-}
-
-function distinctUntilChanged(comparator, keySelector) {
-  if (keySelector === undefined) {
-    keySelector = identity;
-  }
-  comparator = comparator !== null && comparator !== undefined ? comparator : defaultCompare;
-  return operate(function (source, subscriber) {
-    var previousKey;
-    var first = true;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      var currentKey = keySelector(value);
-      if (first || !comparator(previousKey, currentKey)) {
-        first = false;
-        previousKey = currentKey;
-        subscriber.next(value);
-      }
-    }));
-  });
-}
-function defaultCompare(a, b) {
-  return a === b;
-}
-
-function throwIfEmpty(errorFactory) {
-  if (errorFactory === undefined) {
-    errorFactory = defaultErrorFactory;
-  }
-  return operate(function (source, subscriber) {
-    var hasValue = false;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      hasValue = true;
-      subscriber.next(value);
-    }, function () {
-      return hasValue ? subscriber.complete() : subscriber.error(errorFactory());
-    }));
-  });
-}
-function defaultErrorFactory() {
-  return new EmptyError();
-}
+  };
+  AnonymousSubject.prototype.complete = function () {
+    var _a, _b;
+    (_b = (_a = this.destination) === null || _a === undefined ? undefined : _a.complete) === null || _b === undefined ? undefined : _b.call(_a);
+  };
+  AnonymousSubject.prototype._subscribe = function (subscriber) {
+    var _a, _b;
+    return (_b = (_a = this.source) === null || _a === undefined ? undefined : _a.subscribe(subscriber)) !== null && _b !== undefined ? _b : EMPTY_SUBSCRIPTION;
+  };
+  return AnonymousSubject;
+}(Subject);
 
-function first(predicate, defaultValue) {
-  var hasDefaultValue = arguments.length >= 2;
-  return function (source) {
-    return source.pipe(identity, take(1), hasDefaultValue ? defaultIfEmpty(defaultValue) : throwIfEmpty(function () {
-      return new EmptyError();
-    }));
+var EmptyError = createErrorClass(function (_super) {
+  return function EmptyErrorImpl() {
+    _super(this);
+    this.name = 'EmptyError';
+    this.message = 'no elements in sequence';
   };
-}
+});
 
-function takeLast(count) {
-  return count <= 0 ? function () {
-    return EMPTY;
-  } : operate(function (source, subscriber) {
-    var buffer = [];
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      buffer.push(value);
-      count < buffer.length && buffer.shift();
-    }, function () {
-      var e_1, _a;
-      try {
-        for (var buffer_1 = __values(buffer), buffer_1_1 = buffer_1.next(); !buffer_1_1.done; buffer_1_1 = buffer_1.next()) {
-          var value = buffer_1_1.value;
-          subscriber.next(value);
-        }
-      } catch (e_1_1) {
-        e_1 = {
-          error: e_1_1
-        };
-      } finally {
-        try {
-          if (buffer_1_1 && !buffer_1_1.done && (_a = buffer_1.return)) _a.call(buffer_1);
-        } finally {
-          if (e_1) throw e_1.error;
+function firstValueFrom(source, config) {
+  return new Promise(function (resolve, reject) {
+    var subscriber = new SafeSubscriber({
+      next: function (value) {
+        resolve(value);
+        subscriber.unsubscribe();
+      },
+      error: reject,
+      complete: function () {
+        {
+          reject(new EmptyError());
         }
       }
-      subscriber.complete();
-    }, undefined, function () {
-      buffer = null;
-    }));
+    });
+    source.subscribe(subscriber);
   });
 }
 
-function last(predicate, defaultValue) {
-  var hasDefaultValue = arguments.length >= 2;
-  return function (source) {
-    return source.pipe(identity, takeLast(1), hasDefaultValue ? defaultIfEmpty(defaultValue) : throwIfEmpty(function () {
-      return new EmptyError();
-    }));
-  };
-}
-
-function takeWhile(predicate, inclusive) {
+function filter(predicate, thisArg) {
   return operate(function (source, subscriber) {
     var index = 0;
     source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      var result = predicate(value, index++);
-      (result || inclusive) && subscriber.next(value);
-      !result && subscriber.complete();
+      return predicate.call(thisArg, value, index++) && subscriber.next(value);
     }));
   });
 }
 
-function tap(observerOrNext, error, complete) {
-  var tapObserver = isFunction(observerOrNext) || error || complete ? {
-    next: observerOrNext,
-    error: error,
-    complete: complete
-  } : observerOrNext;
-  return tapObserver ? operate(function (source, subscriber) {
-    var _a;
-    (_a = tapObserver.subscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
-    var isUnsub = true;
-    source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-      var _a;
-      (_a = tapObserver.next) === null || _a === void 0 ? void 0 : _a.call(tapObserver, value);
-      subscriber.next(value);
-    }, function () {
-      var _a;
-      isUnsub = false;
-      (_a = tapObserver.complete) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
-      subscriber.complete();
-    }, function (err) {
-      var _a;
-      isUnsub = false;
-      (_a = tapObserver.error) === null || _a === void 0 ? void 0 : _a.call(tapObserver, err);
-      subscriber.error(err);
-    }, function () {
-      var _a, _b;
-      if (isUnsub) {
-        (_a = tapObserver.unsubscribe) === null || _a === void 0 ? void 0 : _a.call(tapObserver);
-      }
-      (_b = tapObserver.finalize) === null || _b === void 0 ? void 0 : _b.call(tapObserver);
-    }));
-  }) : identity;
-}
-
-class BaseError extends Error {
-  constructor(name, message, options = {}) {
-    const {
-      cause,
-      context
-    } = options;
-    super(message || name);
-    this.name = name;
-    this.stack = cause?.stack;
-    this.cause = cause;
-    this.context = context;
-  }
-  toJSON() {
-    return {
-      name: this.name,
-      message: this.message,
-      context: this.context,
-      cause: this.cause
-    };
-  }
-}
-
-class AirServiceError extends BaseError {
-    static from(error) {
-        if (error instanceof AirServiceError) {
-            return error;
-        }
-        else if (error instanceof Object && "message" in error) {
-            if (error.message === "User cancelled login") {
-                return new AirServiceError("USER_CANCELLED", error.message);
-            }
-            return new AirServiceError("UNKNOWN_ERROR", error.message.toString());
-        }
-        return new AirServiceError("UNKNOWN_ERROR");
-    }
-}
-class RealmEmbedError extends AirServiceError {
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
 
-var loglevel$2 = {exports: {}};
+var loglevel$1 = {exports: {}};
 
 /*
 * loglevel - https://github.com/pimterry/loglevel
@@ -1659,10 +1034,10 @@ var loglevel$2 = {exports: {}};
 * Copyright (c) 2013 Tim Perry
 * Licensed under the MIT license.
 */
-var loglevel$1 = loglevel$2.exports;
+var loglevel = loglevel$1.exports;
 var hasRequiredLoglevel;
 function requireLoglevel() {
-  if (hasRequiredLoglevel) return loglevel$2.exports;
+  if (hasRequiredLoglevel) return loglevel$1.exports;
   hasRequiredLoglevel = 1;
   (function (module) {
     (function (root, definition) {
@@ -1672,7 +1047,7 @@ function requireLoglevel() {
       } else {
         root.log = definition();
       }
-    })(loglevel$1, function () {
+    })(loglevel, function () {
 
       // Slightly dubious tricks to cut down minimized file size
       var noop = function () {};
@@ -1971,42 +1346,44 @@ function requireLoglevel() {
       defaultLogger['default'] = defaultLogger;
       return defaultLogger;
     });
-  })(loglevel$2);
-  return loglevel$2.exports;
+  })(loglevel$1);
+  return loglevel$1.exports;
 }
 
 var loglevelExports = requireLoglevel();
-var loglevel = /*@__PURE__*/getDefaultExportFromCjs(loglevelExports);
+var log$1 = /*@__PURE__*/getDefaultExportFromCjs(loglevelExports);
 
-var log = loglevel.getLogger("airkit");
+var log = log$1.getLogger("airkit");
 
 var AirWalletProviderMessageTypes;
 (function (AirWalletProviderMessageTypes) {
   AirWalletProviderMessageTypes["REQUEST"] = "JRPC_REQUEST";
   AirWalletProviderMessageTypes["RESPONSE"] = "JRPC_RESPONSE";
+  AirWalletProviderMessageTypes["EVENT"] = "JRPC_EVENT";
 })(AirWalletProviderMessageTypes || (AirWalletProviderMessageTypes = {}));
 
 const ACCOUNT_MESSAGES = [
     AirMessageTypes.INITIALIZATION_RESPONSE,
     AirMessageTypes.WALLET_INITIALIZED,
-    AirMessageTypes.LOGIN_CLAIM_STATE,
-    AirMessageTypes.CLOSE_MODAL,
+    AirMessageTypes.CLAIM_ID_RESPONSE,
+    AirMessageTypes.IS_SMART_ACCOUNT_DEPLOYED_RESPONSE,
     AirMessageTypes.DEPLOY_SMART_ACCOUNT_RESPONSE,
     AirMessageTypes.EXECUTE_ACTION_RESPONSE,
     AirMessageTypes.REVOKE_PERMISSIONS_RESPONSE,
     AirMessageTypes.GRANT_PERMISSIONS_RESPONSE,
     AirMessageTypes.WALLET_INITIALIZED,
-    AirMessageTypes.WALLET_IFRAME_VISIBILITY_REQUEST
+    AirMessageTypes.WALLET_IFRAME_VISIBILITY_REQUEST,
+    AirMessageTypes.LOGOUT_RESPONSE,
 ];
 const AUTH_MESSAGES = [
+    AirAuthMessageTypes.INITIALIZATION_RESPONSE,
     AirAuthMessageTypes.LOGIN_RESPONSE,
-    AirAuthMessageTypes.USER_INFO_RESPONSE,
-    AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE,
     AirAuthMessageTypes.REFRESH_TOKEN_RESPONSE,
-    AirAuthMessageTypes.INITIALIZATION_RESPONSE,
+    AirAuthMessageTypes.SETUP_WALLET_REQUEST,
     AirAuthMessageTypes.LOGOUT_RESPONSE,
+    AirAuthMessageTypes.PARTNER_USER_INFO_RESPONSE,
+    AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE,
     AirAuthMessageTypes.IFRAME_VISIBILITY_REQUEST,
-    AirAuthMessageTypes.SETUP_WALLET_REQUEST,
 ];
 class AirMessageService {
     constructor() {
@@ -2023,15 +1400,15 @@ class AirMessageService {
     get messages$() {
         return this.airMessages$.asObservable();
     }
-    get loginState$() {
-        return this._loginState$;
-    }
     get authMessage$() {
         return this._authMessage$.asObservable();
     }
     get providerMessage$() {
         return this._providerMessage$.asObservable();
     }
+    get providerEvent$() {
+        return this._providerEvent$.asObservable();
+    }
     async openAuthObservables({ authIframeOrigin }) {
         this.closeAuthObservables();
         this.setupAuthObservables();
@@ -2054,11 +1431,7 @@ class AirMessageService {
         const handleMessage = async (ev) => {
             if (ev.origin !== walletIframeOrigin || !ev.data || !(ev.data instanceof Object))
                 return;
-            // filter out torus and communication provider messages
-            if ("target" in ev.data &&
-                (ev.data.target === "embed_torus" || ev.data.target === "embed_communication"))
-                return;
-            log.debug("Embed message received from wallet", ev.data);
+            log.debug("Account messages received from wallet frontend", ev.data);
             if (ACCOUNT_MESSAGES.includes(ev.data.type)) {
                 this.airMessages$.next(ev.data);
             }
@@ -2072,16 +1445,20 @@ class AirMessageService {
         const handleWalletMessage = async (ev) => {
             if (ev.origin !== walletIframeOrigin || !ev.data || !(ev.data instanceof Object))
                 return;
-            log.debug("Embed wallet message received from wallet", ev.data);
-            if (ev.data.type === AirWalletProviderMessageTypes.RESPONSE)
+            log.debug("Wallet provider messages received from wallet frontend", ev.data);
+            if (ev.data.type === AirWalletProviderMessageTypes.RESPONSE) {
                 this._providerMessage$.next(ev.data);
+            }
+            if (ev.data.type === AirWalletProviderMessageTypes.EVENT) {
+                this._providerEvent$.next(ev.data);
+            }
         };
         window.addEventListener("message", handleWalletMessage);
         this.closeWalletMessageListeners = () => {
             window.removeEventListener("message", handleWalletMessage);
         };
     }
-    setupIframeCommunication(authIframe, walletIframe) {
+    setupIframeCommunication(authIframe, walletIframe, skipWalletLogin) {
         const channel = new MessageChannel();
         const authOrigin = new URL(authIframe.src).origin;
         authIframe.contentWindow.postMessage({
@@ -2090,42 +1467,10 @@ class AirMessageService {
         const walletOrigin = new URL(walletIframe.src).origin;
         walletIframe.contentWindow.postMessage({
             type: AirMessageTypes.INIT_AUTH_COMMUNICATION,
-        }, walletOrigin, [channel.port2]);
-    }
-    sendLoginRequest(walletIframe, payload) {
-        const response = lastValueFrom(this.loginState$.pipe(takeWhile((msg) => (!payload.skipClaimFlow || msg.payload.state !== "connected") &&
-            msg.payload.state !== "logged_in" &&
-            msg.payload.state !== "claim_flow_cancelled", true), tap((msg) => {
-            switch (msg.payload.state) {
-                case "claim_flow_cancelled":
-                    throw new RealmEmbedError(msg.payload.errorName, msg.payload.errorMessage);
-            }
-        })));
-        const { origin } = new URL(walletIframe.src);
-        walletIframe.contentWindow.postMessage({
-            type: AirMessageTypes.LOGIN_REQUEST,
-            payload,
-        }, origin);
-        return response;
-    }
-    sendClaimRequest(walletIframe, options) {
-        const response = lastValueFrom(forkJoin([
-            this.loginState$.pipe(takeWhile((msg) => !["logged_in", "claim_flow_cancelled"].includes(msg.payload.state), true), tap((msg) => {
-                if (msg.payload.state === "claim_flow_cancelled") {
-                    throw new RealmEmbedError(msg.payload.errorName, msg.payload.errorMessage);
-                }
-            }), last()),
-            this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.CLOSE_MODAL), first()),
-        ]));
-        const { origin } = new URL(walletIframe.src);
-        walletIframe.contentWindow.postMessage({
-            type: AirMessageTypes.CLAIM_REQUEST,
             payload: {
-                token: options?.token,
-                claimInBackground: options?.background,
+                skipWalletLogin,
             },
-        }, origin);
-        return response;
+        }, walletOrigin, [channel.port2]);
     }
     async sendGrantPermissionRequest(walletIframe, policies) {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.GRANT_PERMISSIONS_RESPONSE)));
@@ -2138,7 +1483,7 @@ class AirMessageService {
         }, origin);
         const result = await response;
         if (result.payload.success === false) {
-            throw new RealmEmbedError(result.payload.errorName, result.payload.errorMessage);
+            throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
         }
         return result.payload.sessionData;
     }
@@ -2159,7 +1504,7 @@ class AirMessageService {
         }, origin);
         const result = await response;
         if (result.payload.success === false) {
-            throw new RealmEmbedError(result.payload.errorName, result.payload.errorMessage);
+            throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
         }
         return result.payload.txHash;
     }
@@ -2174,7 +1519,7 @@ class AirMessageService {
         }, origin);
         const result = await response;
         if (result.payload.success === false) {
-            throw new RealmEmbedError(result.payload.errorName, result.payload.errorMessage);
+            throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
         }
         return result.payload.txHash;
     }
@@ -2186,10 +1531,12 @@ class AirMessageService {
         }, origin);
         return response;
     }
-    async sendUserInfoRequest(authIframe) {
-        const response = firstValueFrom(this.authMessage$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.USER_INFO_RESPONSE)));
-        const { origin } = new URL(authIframe.src);
-        authIframe.contentWindow.postMessage({ type: AirAuthMessageTypes.USER_INFO_REQUEST }, origin);
+    async sendIsSmartAccountDeployedRequest(walletIframe) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.IS_SMART_ACCOUNT_DEPLOYED_RESPONSE)));
+        const { origin } = new URL(walletIframe.src);
+        walletIframe.contentWindow.postMessage({
+            type: AirMessageTypes.IS_SMART_ACCOUNT_DEPLOYED_REQUEST,
+        }, origin);
         return response;
     }
     async sendPartnerUserInfoRequest(authIframe) {
@@ -2210,6 +1557,16 @@ class AirMessageService {
         authIframe.contentWindow.postMessage({ type: AirAuthMessageTypes.LOGOUT_REQUEST }, origin);
         return response;
     }
+    async logoutWallet(walletIframe) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.LOGOUT_RESPONSE)));
+        const { origin } = new URL(walletIframe.src);
+        walletIframe.contentWindow.postMessage({ type: AirMessageTypes.LOGOUT_REQUEST }, origin);
+        return response;
+    }
+    sendResetAuthServiceWalletCommunication(authIframe) {
+        const { origin: authOrigin } = new URL(authIframe.src);
+        authIframe.contentWindow.postMessage({ type: AirAuthMessageTypes.RESET_WALLET_COMMUNICATION }, authOrigin);
+    }
     async sendAuthInitializationRequest(authIframe, payload) {
         const response = firstValueFrom(this._authMessage$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.INITIALIZATION_RESPONSE)));
         const { origin } = new URL(authIframe.src);
@@ -2222,6 +1579,17 @@ class AirMessageService {
         walletIframe.contentWindow.postMessage({ type: AirMessageTypes.INITIALIZATION_REQUEST, payload }, origin);
         return response;
     }
+    async sendCrossPartnerTokenRequest(authIframe, targetPartnerUrl) {
+        const response = firstValueFrom(this.authMessage$.pipe(filter((msg) => msg.type === AirAuthMessageTypes.CROSS_PARTNER_TOKEN_RESPONSE)));
+        const { origin } = new URL(authIframe.src);
+        authIframe.contentWindow.postMessage({
+            type: AirAuthMessageTypes.CROSS_PARTNER_TOKEN_REQUEST,
+            payload: {
+                targetPartnerUrl,
+            },
+        }, origin);
+        return response;
+    }
     async sendGrantPermissionsRequest(walletIframe, payload) {
         const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.GRANT_PERMISSIONS_RESPONSE)));
         const { origin } = new URL(walletIframe.src);
@@ -2231,6 +1599,12 @@ class AirMessageService {
     onWalletInitialized() {
         return firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.WALLET_INITIALIZED)));
     }
+    async sendClaimIdRequest(walletIframe, payload) {
+        const response = firstValueFrom(this.messages$.pipe(filter((msg) => msg.type === AirMessageTypes.CLAIM_ID_RESPONSE)));
+        const { origin } = new URL(walletIframe.src);
+        walletIframe.contentWindow.postMessage({ type: AirMessageTypes.CLAIM_ID_REQUEST, payload }, origin);
+        return response;
+    }
     async sendWalletProviderRequest(walletIframe, payload) {
         const response = firstValueFrom(this.providerMessage$.pipe(filter((msg) => msg.type === AirWalletProviderMessageTypes.RESPONSE &&
             msg.payload.requestId === payload.requestId)));
@@ -2256,6 +1630,8 @@ class AirMessageService {
     closeWalletObservables() {
         if (this._providerMessage$ && !this._providerMessage$.closed)
             this._providerMessage$.complete();
+        if (this._providerEvent$ && !this._providerEvent$.closed)
+            this._providerEvent$.complete();
         if (this.closeWalletMessageListeners)
             this.closeWalletMessageListeners();
     }
@@ -2264,42 +1640,14 @@ class AirMessageService {
     }
     setupAirObservables() {
         this.airMessages$ = new Subject();
-        this._loginState$ = this.airMessages$.pipe(filter((msg) => msg.type === AirMessageTypes.LOGIN_CLAIM_STATE), distinctUntilChanged(equal));
     }
     setupWalletObservables() {
         this._providerMessage$ = new Subject();
+        this._providerEvent$ = new Subject();
     }
 }
 var AirMessageService$1 = AirMessageService.instance;
 
-class ProviderRpcError extends Error {
-  constructor(message, code, data) {
-    super(message);
-    this.code = code;
-    this.data = data;
-  }
-}
-new ProviderRpcError("Invalid JSON", -32700);
-const ProviderRpcInvalidRequestError = new ProviderRpcError("Invalid request", -32600);
-const ProviderRpcMethodNotFoundError = new ProviderRpcError("Method not found", -32601);
-const ProviderRpcInvalidParamsError = new ProviderRpcError("Invalid params", -32602);
-new ProviderRpcError("Internal error", -32603);
-new ProviderRpcError("User rejected request", 4001);
-new ProviderRpcError("Unauthorized", 4100);
-new ProviderRpcError("Unsupported method", 4200);
-new ProviderRpcError("Disconnected", 4900);
-new ProviderRpcError("Chain Disconnected", 4901);
-function ensureProviderRpcError(value) {
-  if (value instanceof ProviderRpcError) return value;
-  let stringified = "[Unable to stringify the thrown value]";
-  try {
-    stringified = JSON.stringify(value);
-  } catch {
-    // ignoring failed stringify
-  }
-  return new ProviderRpcError(`This value was not thrown as type ProviderRpcError: ${stringified}`, -32603);
-}
-
 const BUILD_ENV = {
     PRODUCTION: "production",
     STAGING: "staging",
@@ -2310,66 +1658,113 @@ const AIR_URLS = {
     [BUILD_ENV.DEVELOPMENT]: {
         authUrl: "http://localhost:8100",
         walletUrl: "http://localhost:8200",
-        legacyWalletUrl: "https://localhost:4050",
         logLevel: "debug",
     },
     [BUILD_ENV.STAGING]: {
         authUrl: "https://auth.staging.air3.com",
         walletUrl: "https://account.staging.air3.com",
-        legacyWalletUrl: "https://account.staging.realmnetwork.io",
         logLevel: "info",
     },
     [BUILD_ENV.PRODUCTION]: {
         authUrl: "https://auth.air3.com",
         walletUrl: "https://account.air3.com",
-        legacyWalletUrl: "https://account.realmnetwork.io",
         logLevel: "error",
     },
 };
 const isElement = (element) => element instanceof Element || element instanceof Document;
 const randomId = () => Math.random().toString(36).slice(2);
 
-var _AirWalletProvider_walletIframe;
+var _AirWalletProvider_instances, _AirWalletProvider_isLoggedIn, _AirWalletProvider_ensureWallet, _AirWalletProvider_getWalletIframeController, _AirWalletProvider_eventListeners, _AirWalletProvider_emit;
 class AirWalletProvider {
-    constructor(walletIframe) {
-        _AirWalletProvider_walletIframe.set(this, undefined);
-        __classPrivateFieldSet(this, _AirWalletProvider_walletIframe, walletIframe, "f");
+    constructor({ isLoggedIn, ensureWallet, getWalletIframeController, }) {
+        _AirWalletProvider_instances.add(this);
+        _AirWalletProvider_isLoggedIn.set(this, undefined);
+        _AirWalletProvider_ensureWallet.set(this, undefined);
+        _AirWalletProvider_getWalletIframeController.set(this, undefined);
+        _AirWalletProvider_eventListeners.set(this, undefined);
+        this.listenProviderEventMessage = () => {
+            AirMessageService$1.providerEvent$.subscribe((message) => {
+                __classPrivateFieldGet(this, _AirWalletProvider_instances, "m", _AirWalletProvider_emit).call(this, message.payload.event, ...[message.payload.data]);
+            });
+        };
+        __classPrivateFieldSet(this, _AirWalletProvider_isLoggedIn, isLoggedIn, "f");
+        __classPrivateFieldSet(this, _AirWalletProvider_ensureWallet, ensureWallet, "f");
+        __classPrivateFieldSet(this, _AirWalletProvider_getWalletIframeController, getWalletIframeController, "f");
+        __classPrivateFieldSet(this, _AirWalletProvider_eventListeners, {
+            connect: [],
+            disconnect: [],
+            accountsChanged: [],
+            chainChanged: [],
+            message: [],
+        }, "f");
     }
     async request(request) {
         // Check if the request is valid
         if (!request || typeof request !== "object" || Array.isArray(request)) {
-            throw ProviderRpcInvalidRequestError;
+            throw new InvalidRequestRpcError("Invalid request");
         }
         const { method, params } = request;
         // Check if the method is valid
         if (typeof method !== "string" || method.length === 0) {
-            throw ProviderRpcMethodNotFoundError;
+            throw new MethodNotFoundRpcError("Invalid method");
         }
         // Check if the params are valid
         if (params !== undefined &&
             !Array.isArray(params) &&
             (typeof params !== "object" || params === null)) {
-            throw ProviderRpcInvalidParamsError;
+            throw new InvalidParamsRpcError("Invalid params");
+        }
+        // Check if the user is logged in
+        if (!__classPrivateFieldGet(this, _AirWalletProvider_isLoggedIn, "f").call(this)) {
+            throw new UnauthorizedProviderError("User is not logged in");
+        }
+        try {
+            await __classPrivateFieldGet(this, _AirWalletProvider_ensureWallet, "f").call(this);
+        }
+        catch (error) {
+            throw ensureProviderRpcError(error);
         }
         const requestId = randomId();
-        const response = await AirMessageService$1.sendWalletProviderRequest(__classPrivateFieldGet(this, _AirWalletProvider_walletIframe, "f"), {
+        const response = await AirMessageService$1.sendWalletProviderRequest(__classPrivateFieldGet(this, _AirWalletProvider_getWalletIframeController, "f").call(this).iframeElement, {
             requestId,
             ...request,
         });
         if (!response.success) {
-            const error = ensureProviderRpcError(response.payload);
-            throw error;
+            throw ensureProviderRpcError(response.payload);
         }
         return response.payload.response;
     }
     on(eventName, listener) {
-        console.log("on", eventName, listener);
+        __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] = __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] || [];
+        __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName].push(listener);
     }
     removeListener(eventName, listener) {
-        console.log("removeListener", eventName, listener);
+        __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] = __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName] || [];
+        const index = __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName].indexOf(listener);
+        if (index >= 0) {
+            __classPrivateFieldGet(this, _AirWalletProvider_eventListeners, "f")[eventName].splice(index, 1);
+        }
+    }
+    removeAllListeners() {
+        __classPrivateFieldSet(this, _AirWalletProvider_eventListeners, {
+            connect: [],
+            disconnect: [],
+            accountsChanged: [],
+            chainChanged: [],
+            message: [],
+        }, "f");
     }
 }
-_AirWalletProvider_walletIframe = new WeakMap();
+_AirWalletProvider_isLoggedIn = new WeakMap(), _AirWalletProvider_ensureWallet = new WeakMap(), _AirWalletProvider_getWalletIframeController = new WeakMap(), _AirWalletProvider_eventListeners = 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);
+        }
+        catch (error) {
+            log$1.error(error);
+        }
+    });
+};
 
 class IframeController {
     constructor(iframeUrl, iframeId, state) {
@@ -2434,9 +1829,8 @@ IframeController.defaultState = {
     isVisible: false,
 };
 
-var _AirService_instances, _AirService_loginResult, _AirService_buildEnv, _AirService_enableLogging, _AirService_partnerId, _AirService_authIframeController, _AirService_isAuthInitialized, _AirService_airAuthListener, _AirService_walletIframeController, _AirService_walletInitialization, _AirService_isWalletInitialized, _AirService_airWalletProvider, _AirService_ensureWallet, _AirService_initializeWallet, _AirService_triggerEventListeners, _AirService_triggerAirAuthInitialized, _AirService_triggerAirAuthLoggedIn, _AirService_triggerAirAuthLoggedOut, _AirService_triggerWalletInitialized, _AirService_createLoginResult, _AirService_cleanUpAuth, _AirService_cleanUpWallet;
+var _AirService_instances, _AirService_loginResult, _AirService_buildEnv, _AirService_enableLogging, _AirService_partnerId, _AirService_authIframeController, _AirService_isAuthInitialized, _AirService_airAuthListener, _AirService_walletIframeController, _AirService_walletInitialization, _AirService_isWalletInitialized, _AirService_walletLoggedInResult, _AirService_airWalletProvider, _AirService_ensureWallet, _AirService_initializeWallet, _AirService_triggerEventListeners, _AirService_triggerAirAuthInitialized, _AirService_triggerAirAuthLoggedIn, _AirService_triggerAirAuthLoggedOut, _AirService_triggerWalletInitialized, _AirService_createLoginResult, _AirService_createWalletInitializedResult, _AirService_cleanUpAuth, _AirService_cleanUpWallet, _AirService_cleanUpAuthWalletCommunication;
 class AirService {
-    // #walletRehydrationState: AirRehydrationResult;
     constructor({ partnerId }) {
         _AirService_instances.add(this);
         _AirService_loginResult.set(this, undefined);
@@ -2450,8 +1844,14 @@ class AirService {
         _AirService_walletIframeController.set(this, undefined);
         _AirService_walletInitialization.set(this, undefined);
         _AirService_isWalletInitialized.set(this, false);
+        _AirService_walletLoggedInResult.set(this, undefined);
         _AirService_airWalletProvider.set(this, undefined);
         __classPrivateFieldSet(this, _AirService_partnerId, partnerId, "f");
+        __classPrivateFieldSet(this, _AirService_airWalletProvider, new AirWalletProvider({
+            isLoggedIn: () => this.isLoggedIn,
+            ensureWallet: __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).bind(this),
+            getWalletIframeController: () => __classPrivateFieldGet(this, _AirService_walletIframeController, "f"),
+        }), "f");
         // this.#modalZIndex = modalZIndex ?? 99999;
     }
     get buildEnv() {
@@ -2463,8 +1863,16 @@ class AirService {
     get isLoggedIn() {
         return !!__classPrivateFieldGet(this, _AirService_loginResult, "f");
     }
-    get isWalletLoaded() {
-        return __classPrivateFieldGet(this, _AirService_isWalletInitialized, "f");
+    get isWalletInitialized() {
+        return !!__classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f");
+    }
+    get provider() {
+        const provider = __classPrivateFieldGet(this, _AirService_airWalletProvider, "f");
+        return {
+            request: provider.request.bind(provider),
+            on: provider.on.bind(provider),
+            removeListener: provider.removeListener.bind(provider),
+        };
     }
     async init({ buildEnv = BUILD_ENV.PRODUCTION, enableLogging = false, skipRehydration = false, }) {
         if (!__classPrivateFieldGet(this, _AirService_partnerId, "f"))
@@ -2492,7 +1900,7 @@ class AirService {
                 }
                 case AirAuthMessageTypes.SETUP_WALLET_REQUEST: {
                     try {
-                        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
+                        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this, { skipWalletLogin: true });
                         __classPrivateFieldGet(this, _AirService_authIframeController, "f").postMessage({
                             type: AirAuthMessageTypes.SETUP_WALLET_RESPONSE,
                             payload: {
@@ -2527,6 +1935,7 @@ class AirService {
                         const { payload } = await AirMessageService$1.sendAuthInitializationRequest(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement, {
                             partnerId: __classPrivateFieldGet(this, _AirService_partnerId, "f"),
                             skipRehydration,
+                            partnerDAppUrl: window.location.href,
                         });
                         if (payload.success === true) {
                             resolve(payload);
@@ -2554,11 +1963,6 @@ class AirService {
         }
         return null;
     }
-    async cleanUp() {
-        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
-        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpAuth).call(this);
-        this.clearEventListeners();
-    }
     async login(options) {
         if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
             throw new Error("Service is not initialized");
@@ -2584,7 +1988,11 @@ class AirService {
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
         try {
             log.info("deploySmartAccount");
-            await AirMessageService$1.sendDeploySmartAccountRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement);
+            const { payload } = await AirMessageService$1.sendDeploySmartAccountRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement);
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
+            }
+            return { txHash: payload.txHash };
         }
         catch (error) {
             throw AirServiceError.from(error);
@@ -2618,7 +2026,8 @@ class AirService {
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
         try {
             log.info("executeAction", params);
-            await AirMessageService$1.sendExecuteActionRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement, params);
+            const txHash = await AirMessageService$1.sendExecuteActionRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement, params);
+            return txHash;
         }
         catch (error) {
             throw AirServiceError.from(error);
@@ -2633,65 +2042,95 @@ class AirService {
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
         try {
             log.info("revokePermission", permissionId);
-            await AirMessageService$1.sendRevokePermissionsRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement, permissionId);
+            const txHash = await AirMessageService$1.sendRevokePermissionsRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement, permissionId);
+            return txHash;
         }
         catch (error) {
             throw AirServiceError.from(error);
         }
     }
-    async logout() {
+    /**
+     * @experimental This method is experimental and will change in the future.
+     */
+    async isSmartAccountDeployed() {
         if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
             throw new Error("Service is not initialized");
-        if (!this.isLoggedIn)
-            throw new Error("No active session to logout");
-        // Clear up wallet
-        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
-        await AirMessageService$1.logoutAuth(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement);
-        __classPrivateFieldSet(this, _AirService_loginResult, undefined, "f");
-        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_triggerAirAuthLoggedOut).call(this);
-    }
-    async getProvider() {
-        if (!this.isLoggedIn)
-            return null;
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
-        return __classPrivateFieldGet(this, _AirService_airWalletProvider, "f");
+        try {
+            const { payload } = await AirMessageService$1.sendIsSmartAccountDeployedRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement);
+            if (payload.success === false) {
+                throw new AirServiceError(payload.errorName, payload.errorMessage);
+            }
+            return payload.isDeployed;
+        }
+        catch (error) {
+            throw AirServiceError.from(error);
+        }
+    }
+    getProvider() {
+        return this.provider;
     }
     async preloadWallet() {
-        return __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
+        if (__classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f"))
+            return __classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f");
+        return await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
     }
     async claimAirId(options) {
         await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_ensureWallet).call(this);
-        // return this.#realmEmbed.claimRealmId(options);
-        log.info("claimAirId", options);
-        return null;
+        const result = await AirMessageService$1.sendClaimIdRequest(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement, options ?? {});
+        if (result.payload.success === true) {
+            return { airId: result.payload.airId };
+        }
+        throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
     }
     async getUserInfo() {
         if (!this.isLoggedIn)
             throw new Error("User not logged in");
-        const info = await AirMessageService$1.sendUserInfoRequest(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement);
+        const info = await AirMessageService$1.sendPartnerUserInfoRequest(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement);
         if (info.payload.success === false) {
             throw new AirServiceError(info.payload.errorName, info.payload.errorMessage);
         }
         return {
-            id: info.payload.id,
-            abstractAccountAddress: info.payload.abstractAccountAddress,
-            email: info.payload.email,
-            airIds: info.payload.airIds,
+            partnerId: info.payload.partnerId,
+            partnerUserId: info.payload.partnerUserId,
+            airId: info.payload.airId,
+            user: {
+                id: info.payload.user.id,
+                abstractAccountAddress: info.payload.user.abstractAccountAddress,
+                email: info.payload.user.email,
+                isMFASetup: info.payload.user.isMFASetup,
+            },
         };
     }
-    async getPartnerUserInfo() {
+    async goToPartner(partnerUrl) {
+        if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
+            throw new Error("Service is not initialized");
         if (!this.isLoggedIn)
-            throw new Error("User not logged in");
-        const info = await AirMessageService$1.sendPartnerUserInfoRequest(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement);
-        if (info.payload.success === false) {
-            throw new AirServiceError(info.payload.errorName, info.payload.errorMessage);
+            throw new Error("No active session to generate token");
+        const result = await AirMessageService$1.sendCrossPartnerTokenRequest(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement, partnerUrl);
+        if (result.payload.success === false) {
+            throw new AirServiceError(result.payload.errorName, result.payload.errorMessage);
         }
         return {
-            partnerId: info.payload.partnerId,
-            partnerUserId: info.payload.partnerUserId,
-            airId: info.payload.airId,
+            urlWithToken: result.payload.urlWithToken,
         };
     }
+    async logout() {
+        if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
+            throw new Error("Service is not initialized");
+        if (!this.isLoggedIn)
+            throw new Error("No active session to logout");
+        // Clear up wallet
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
+        await AirMessageService$1.logoutAuth(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement);
+        __classPrivateFieldSet(this, _AirService_loginResult, undefined, "f");
+        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_triggerAirAuthLoggedOut).call(this);
+    }
+    async cleanUp() {
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
+        await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpAuth).call(this);
+        this.clearEventListeners();
+    }
     on(listener) {
         if (__classPrivateFieldGet(this, _AirService_airAuthListener, "f").indexOf(listener) < 0)
             __classPrivateFieldGet(this, _AirService_airAuthListener, "f").push(listener);
@@ -2712,24 +2151,39 @@ class AirService {
         return null;
     }
 }
-_AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _AirService_enableLogging = new WeakMap(), _AirService_partnerId = new WeakMap(), _AirService_authIframeController = new WeakMap(), _AirService_isAuthInitialized = new WeakMap(), _AirService_airAuthListener = new WeakMap(), _AirService_walletIframeController = new WeakMap(), _AirService_walletInitialization = new WeakMap(), _AirService_isWalletInitialized = new WeakMap(), _AirService_airWalletProvider = new WeakMap(), _AirService_instances = new WeakSet(), _AirService_ensureWallet = async function _AirService_ensureWallet() {
+_AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _AirService_enableLogging = new WeakMap(), _AirService_partnerId = new WeakMap(), _AirService_authIframeController = new WeakMap(), _AirService_isAuthInitialized = new WeakMap(), _AirService_airAuthListener = new WeakMap(), _AirService_walletIframeController = new WeakMap(), _AirService_walletInitialization = new WeakMap(), _AirService_isWalletInitialized = new WeakMap(), _AirService_walletLoggedInResult = new WeakMap(), _AirService_airWalletProvider = new WeakMap(), _AirService_instances = new WeakSet(), _AirService_ensureWallet = 
+// Result of this.#walletInitialization:
+// - If skipWalletLogin is true, it returns the result of empty abstractAccountAddress
+// - If skipWalletLogin is false, it returns the result of abstractAccountAddress from wallet initialization
+// - If #ensureWallet is called again, it returns the result of abstractAccountAddress from the second
+//   wallet initialization if this first wallet initialization doesn't have abstractAccountAddress
+async function _AirService_ensureWallet(option) {
     if (!this.isInitialized)
         throw new Error("Service not initialized");
-    if (!__classPrivateFieldGet(this, _AirService_walletInitialization, "f")) {
-        try {
-            __classPrivateFieldSet(this, _AirService_walletInitialization, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_initializeWallet).call(this), "f");
-            return await __classPrivateFieldGet(this, _AirService_walletInitialization, "f");
+    if (!this.isLoggedIn && !option?.skipWalletLogin)
+        throw new Error("User not logged in");
+    if (!__classPrivateFieldGet(this, _AirService_walletInitialization, "f"))
+        __classPrivateFieldSet(this, _AirService_walletInitialization, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_initializeWallet).call(this, option), "f");
+    try {
+        const result = await __classPrivateFieldGet(this, _AirService_walletInitialization, "f");
+        // Note: Checking for abstractAccountAddress from the result and this.#walletLoggedInResult to avoid race condition
+        if (option?.skipWalletLogin ||
+            result?.abstractAccountAddress ||
+            __classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f")?.abstractAccountAddress) {
+            return result || __classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f");
         }
-        catch (error) {
-            __classPrivateFieldSet(this, _AirService_walletInitialization, null, "f");
-            log.error("Error initializing wallet", error);
-            throw error;
+        const walletInitResult = await AirMessageService$1.onWalletInitialized();
+        if (walletInitResult.payload.success !== true) {
+            throw new AirServiceError(walletInitResult.payload.errorName, walletInitResult.payload.errorMessage);
         }
+        return __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_createWalletInitializedResult).call(this, walletInitResult.payload);
     }
-    else {
-        return __classPrivateFieldGet(this, _AirService_walletInitialization, "f");
+    catch (error) {
+        __classPrivateFieldSet(this, _AirService_walletInitialization, null, "f");
+        log.error("Error initializing wallet", error);
+        throw error;
     }
-}, _AirService_initializeWallet = async function _AirService_initializeWallet() {
+}, _AirService_initializeWallet = async function _AirService_initializeWallet(option) {
     if (__classPrivateFieldGet(this, _AirService_isWalletInitialized, "f"))
         throw new AirServiceError("ALREADY_INITIALISED", "Already initialized");
     const { walletUrl } = AIR_URLS[__classPrivateFieldGet(this, _AirService_buildEnv, "f")];
@@ -2747,6 +2201,23 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
                     walletIframeController.updateIframeState();
                     break;
                 }
+                case AirMessageTypes.WALLET_INITIALIZED: {
+                    if (msg.payload.success === true && msg.payload.addresses?.aa) {
+                        __classPrivateFieldSet(this, _AirService_walletLoggedInResult, __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_createWalletInitializedResult).call(this, msg.payload), "f");
+                        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_triggerWalletInitialized).call(this, __classPrivateFieldGet(this, _AirService_walletLoggedInResult, "f"));
+                    }
+                    if (msg.payload.success === false) {
+                        if (!__classPrivateFieldGet(this, _AirService_isWalletInitialized, "f")) {
+                            // MFA fail case, also reset wallet port
+                            __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpAuthWalletCommunication).call(this);
+                        }
+                        else {
+                            // Logout wallet and destroy the wallet iframe
+                            await __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_cleanUpWallet).call(this);
+                        }
+                    }
+                    break;
+                }
             }
         });
         await new Promise((resolve, reject) => {
@@ -2769,18 +2240,15 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
             };
             window.addEventListener("message", handleAuthMessage);
         });
+        __classPrivateFieldGet(this, _AirService_airWalletProvider, "f").listenProviderEventMessage();
         const walletInitPromise = AirMessageService$1.onWalletInitialized();
-        AirMessageService$1.setupIframeCommunication(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement, __classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement);
+        AirMessageService$1.setupIframeCommunication(__classPrivateFieldGet(this, _AirService_authIframeController, "f").iframeElement, __classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement, option?.skipWalletLogin ?? false);
         const walletInitResult = await walletInitPromise;
         if (walletInitResult.payload.success !== true) {
             throw new AirServiceError(walletInitResult.payload.errorName, walletInitResult.payload.errorMessage);
         }
-        __classPrivateFieldSet(this, _AirService_airWalletProvider, new AirWalletProvider(__classPrivateFieldGet(this, _AirService_walletIframeController, "f").iframeElement), "f");
-        const result = {
-            abstractAccountAddress: walletInitResult.payload.addresses.aa,
-        };
-        __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_triggerWalletInitialized).call(this, result);
-        return result;
+        __classPrivateFieldSet(this, _AirService_isWalletInitialized, true, "f");
+        return __classPrivateFieldGet(this, _AirService_instances, "m", _AirService_createWalletInitializedResult).call(this, walletInitResult.payload);
     }
     catch (error) {
         log.error("Error initializing wallet", error);
@@ -2811,6 +2279,12 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
         id: payload.id,
         abstractAccountAddress: payload.abstractAccountAddress,
         token: payload.partnerAccessToken,
+        isMFASetup: payload.isMFASetup,
+    };
+}, _AirService_createWalletInitializedResult = function _AirService_createWalletInitializedResult(payload) {
+    return {
+        abstractAccountAddress: payload.addresses?.aa ?? null,
+        isMFASetup: payload.isMFASetup,
     };
 }, _AirService_cleanUpAuth = async function _AirService_cleanUpAuth() {
     // Logout auth session
@@ -2827,20 +2301,38 @@ _AirService_loginResult = new WeakMap(), _AirService_buildEnv = new WeakMap(), _
 }, _AirService_cleanUpWallet = async function _AirService_cleanUpWallet() {
     if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
         return;
-    // Logout wallet session
-    // TODO need to tell wallet to clear preferences?
-    // Destroy the wallet iframe
+    // Logout wallet and destroy the wallet iframe
     const walletIframeElement = __classPrivateFieldGet(this, _AirService_walletIframeController, "f")?.iframeElement;
     if (isElement(walletIframeElement) && window.document.body.contains(walletIframeElement)) {
+        await AirMessageService$1.logoutWallet(walletIframeElement);
         __classPrivateFieldGet(this, _AirService_walletIframeController, "f").destroy();
         __classPrivateFieldSet(this, _AirService_walletIframeController, undefined, "f");
     }
     // Close the message service
     AirMessageService$1.closeAirObservables();
-    __classPrivateFieldSet(this, _AirService_walletInitialization, null, "f");
+    __classPrivateFieldSet(this, _AirService_walletLoggedInResult, undefined, "f");
+    __classPrivateFieldSet(this, _AirService_walletInitialization, undefined, "f");
     __classPrivateFieldSet(this, _AirService_isWalletInitialized, false, "f");
+}, _AirService_cleanUpAuthWalletCommunication = function _AirService_cleanUpAuthWalletCommunication() {
+    if (!__classPrivateFieldGet(this, _AirService_isAuthInitialized, "f"))
+        return;
+    const authIframeElement = __classPrivateFieldGet(this, _AirService_authIframeController, "f")?.iframeElement;
+    if (isElement(authIframeElement) && window.document.body.contains(authIframeElement)) {
+        AirMessageService$1.sendResetAuthServiceWalletCommunication(authIframeElement);
+    }
 };
 
 exports.AirService = AirService;
-exports.AirWalletProvider = AirWalletProvider;
+exports.AirServiceError = AirServiceError;
 exports.BUILD_ENV = BUILD_ENV;
+exports.ChainDisconnectedError = ChainDisconnectedError;
+exports.InternalRpcError = InternalRpcError;
+exports.InvalidParamsRpcError = InvalidParamsRpcError;
+exports.InvalidRequestRpcError = InvalidRequestRpcError;
+exports.MethodNotFoundRpcError = MethodNotFoundRpcError;
+exports.ProviderDisconnectedError = ProviderDisconnectedError;
+exports.SwitchChainError = SwitchChainError;
+exports.UnauthorizedProviderError = UnauthorizedProviderError;
+exports.UnsupportedProviderMethodError = UnsupportedProviderMethodError;
+exports.UserRejectedRequestError = UserRejectedRequestError;
+exports.ensureProviderRpcError = ensureProviderRpcError;