@cartridge/controller 0.7.13-alpha.3 → 0.7.13

package/dist/index.js

@@ -1,11 +1,11 @@
-import { WalletAccount as Se, shortString as G, num as Pe } from "starknet";
-import { R as E, t as Me, K as Ne, P as De, B as Be, N as y, p as ze, A as Te } from "./provider-M8-BWFF8.js";
-import { F as fn, h as bn, n as yn, a as wn, b as vn } from "./provider-M8-BWFF8.js";
-import { connect as je } from "starknetkit";
-import { InjectedConnector as Ue } from "starknetkit/injected";
+import { WalletAccount as Pe, shortString as G, num as Me } from "starknet";
+import { R as E, t as Ne, K as De, P as Be, B as ze, N as y, p as Te, A as je } from "./provider-C4iZV8Y5.js";
+import { F as fn, h as bn, n as yn, a as wn, b as vn } from "./provider-C4iZV8Y5.js";
+import { connect as Ue } from "starknetkit";
+import { InjectedConnector as Le } from "starknetkit/injected";
 import { MetaMaskSDK as Oe } from "@metamask/sdk";
-import { Transaction as Le } from "@solana/web3.js";
-class J extends Se {
+import { Transaction as Fe } from "@solana/web3.js";
+class J extends Pe {
   address;
   keychain;
   modal;
@@ -26,7 +26,7 @@ class J extends Se {
    * @returns response from addTransaction
    */
   async execute(e) {
-    return e = Me(e), new Promise(async (t, r) => {
+    return e = Ne(e), new Promise(async (t, r) => {
       const o = await this.keychain.execute(
         e,
         void 0,
@@ -78,10 +78,10 @@ class J extends Se {
     });
   }
 }
-var k;
+var A;
 (function(n) {
   n.Call = "call", n.Reply = "reply", n.Syn = "syn", n.SynAck = "synAck", n.Ack = "ack";
-})(k || (k = {}));
+})(A || (A = {}));
 var R;
 (function(n) {
   n.Fulfilled = "fulfilled", n.Rejected = "rejected";
@@ -94,11 +94,11 @@ var H;
 (function(n) {
   n.DataCloneError = "DataCloneError";
 })(H || (H = {}));
-var x;
+var I;
 (function(n) {
   n.Message = "message";
-})(x || (x = {}));
-const Fe = (n, e) => {
+})(I || (I = {}));
+const Qe = (n, e) => {
   const t = [];
   let r = !1;
   return {
@@ -111,31 +111,31 @@ const Fe = (n, e) => {
       r ? o() : t.push(o);
     }
   };
-}, Qe = (n) => (...e) => {
+}, We = (n) => (...e) => {
   n && console.log("[Penpal]", ...e);
-}, We = {
+}, $e = {
   "http:": "80",
   "https:": "443"
-}, $e = /^(https?:)?\/\/([^/:]+)?(:(\d+))?/, He = ["file:", "data:"], Ye = (n) => {
-  if (n && He.find((s) => n.startsWith(s)))
+}, He = /^(https?:)?\/\/([^/:]+)?(:(\d+))?/, Ye = ["file:", "data:"], qe = (n) => {
+  if (n && Ye.find((s) => n.startsWith(s)))
     return "null";
-  const e = document.location, t = $e.exec(n);
+  const e = document.location, t = He.exec(n);
   let r, o, a;
   t ? (r = t[1] ? t[1] : e.protocol, o = t[2], a = t[4]) : (r = e.protocol, o = e.hostname, a = e.port);
-  const i = a && a !== We[r] ? `:${a}` : "";
+  const i = a && a !== $e[r] ? `:${a}` : "";
   return `${r}//${o}${i}`;
 }, X = ({ name: n, message: e, stack: t }) => ({
   name: n,
   message: e,
   stack: t
-}), qe = (n) => {
+}), Ke = (n) => {
   const e = new Error();
   return Object.keys(n).forEach((t) => e[t] = n[t]), e;
-}, Ke = (n, e, t) => {
+}, Ve = (n, e, t) => {
   const { localName: r, local: o, remote: a, originForSending: i, originForReceiving: s } = n;
   let d = !1;
   const p = (c) => {
-    if (c.source !== a || c.data.penpal !== k.Call)
+    if (c.source !== a || c.data.penpal !== A.Call)
       return;
     if (s !== "*" && c.origin !== s) {
       t(`${r} received message from origin ${c.origin} which did not match expected origin ${s}`);
@@ -143,24 +143,24 @@ const Fe = (n, e) => {
     }
     const l = c.data, { methodName: g, args: m, id: f } = l;
     t(`${r}: Received ${g}() call`);
-    const I = (b) => (C) => {
+    const C = (b) => (x) => {
       if (t(`${r}: Sending ${g}() reply`), d) {
         t(`${r}: Unable to send ${g}() reply due to destroyed connection`);
         return;
       }
-      const A = {
-        penpal: k.Reply,
+      const k = {
+        penpal: A.Reply,
         id: f,
         resolution: b,
-        returnValue: C
+        returnValue: x
       };
-      b === R.Rejected && C instanceof Error && (A.returnValue = X(C), A.returnValueIsError = !0);
+      b === R.Rejected && x instanceof Error && (k.returnValue = X(x), k.returnValueIsError = !0);
       try {
-        a.postMessage(A, i);
+        a.postMessage(k, i);
       } catch (u) {
         if (u.name === H.DataCloneError) {
           const S = {
-            penpal: k.Reply,
+            penpal: A.Reply,
             id: f,
             resolution: R.Rejected,
             returnValue: X(u),
@@ -171,73 +171,73 @@ const Fe = (n, e) => {
         throw u;
       }
     };
-    new Promise((b) => b(e[g].call(e, c.origin).apply(e, m))).then(I(R.Fulfilled), I(R.Rejected));
+    new Promise((b) => b(e[g].call(e, c.origin).apply(e, m))).then(C(R.Fulfilled), C(R.Rejected));
   };
-  return o.addEventListener(x.Message, p), () => {
-    d = !0, o.removeEventListener(x.Message, p);
+  return o.addEventListener(I.Message, p), () => {
+    d = !0, o.removeEventListener(I.Message, p);
   };
 };
-let Ve = 0;
-const Ge = () => ++Ve, he = ".", ue = (n) => n ? n.split(he) : [], Je = (n) => n.join(he), Xe = (n, e) => {
+let Ge = 0;
+const Je = () => ++Ge, he = ".", ue = (n) => n ? n.split(he) : [], Xe = (n) => n.join(he), Ze = (n, e) => {
   const t = ue(e || "");
-  return t.push(n), Je(t);
-}, Ze = (n, e, t) => {
+  return t.push(n), Xe(t);
+}, et = (n, e, t) => {
   const r = ue(e);
   return r.reduce((o, a, i) => (typeof o[a] > "u" && (o[a] = {}), i === r.length - 1 && (o[a] = t), o[a]), n), n;
 }, fe = (n, e) => {
   const t = {};
   return Object.keys(n).forEach((r) => {
-    const o = n[r], a = Xe(r, e);
+    const o = n[r], a = Ze(r, e);
     typeof o == "object" && Object.assign(t, fe(o, a)), typeof o == "function" && (t[a] = o);
   }), t;
-}, et = (n) => {
+}, tt = (n) => {
   const e = {};
   for (const t in n)
-    Ze(e, t, n[t]);
+    et(e, t, n[t]);
   return e;
-}, tt = (n, e, t, r, o) => {
+}, nt = (n, e, t, r, o) => {
   const { localName: a, local: i, remote: s, originForSending: d, originForReceiving: p } = e;
   let c = !1;
   o(`${a}: Connecting call sender`);
   const l = (m) => (...f) => {
     o(`${a}: Sending ${m}() call`);
-    let I;
+    let C;
     try {
-      s.closed && (I = !0);
+      s.closed && (C = !0);
     } catch {
-      I = !0;
+      C = !0;
     }
-    if (I && r(), c) {
+    if (C && r(), c) {
       const b = new Error(`Unable to send ${m}() call due to destroyed connection`);
       throw b.code = T.ConnectionDestroyed, b;
     }
-    return new Promise((b, C) => {
-      const A = Ge(), u = (P) => {
-        if (P.source !== s || P.data.penpal !== k.Reply || P.data.id !== A)
+    return new Promise((b, x) => {
+      const k = Je(), u = (P) => {
+        if (P.source !== s || P.data.penpal !== A.Reply || P.data.id !== k)
           return;
         if (p !== "*" && P.origin !== p) {
           o(`${a} received message from origin ${P.origin} which did not match expected origin ${p}`);
           return;
         }
         const Q = P.data;
-        o(`${a}: Received ${m}() reply`), i.removeEventListener(x.Message, u);
+        o(`${a}: Received ${m}() reply`), i.removeEventListener(I.Message, u);
         let W = Q.returnValue;
-        Q.returnValueIsError && (W = qe(W)), (Q.resolution === R.Fulfilled ? b : C)(W);
+        Q.returnValueIsError && (W = Ke(W)), (Q.resolution === R.Fulfilled ? b : x)(W);
       };
-      i.addEventListener(x.Message, u);
+      i.addEventListener(I.Message, u);
       const S = {
-        penpal: k.Call,
-        id: A,
+        penpal: A.Call,
+        id: k,
         methodName: m,
         args: f
       };
       s.postMessage(S, d);
     });
   }, g = t.reduce((m, f) => (m[f] = l(f), m), {});
-  return Object.assign(n, et(g)), () => {
+  return Object.assign(n, tt(g)), () => {
     c = !0;
   };
-}, nt = (n, e, t, r, o) => {
+}, rt = (n, e, t, r, o) => {
   const { destroy: a, onDestroy: i } = r;
   let s, d;
   const p = {};
@@ -254,13 +254,13 @@ const Ge = () => ++Ve, he = ".", ue = (n) => n ? n.split(he) : [], Je = (n) => n
       originForSending: t,
       originForReceiving: e
     };
-    s && s(), s = Ke(l, n, o), i(s), d && d.forEach((m) => {
+    s && s(), s = Ve(l, n, o), i(s), d && d.forEach((m) => {
       delete p[m];
     }), d = c.data.methodNames;
-    const g = tt(p, l, d, a, o);
+    const g = nt(p, l, d, a, o);
     return i(g), p;
   };
-}, rt = (n, e, t, r) => (o) => {
+}, ot = (n, e, t, r) => (o) => {
   if (!o.source)
     return;
   if (t !== "*" && o.origin !== t) {
@@ -269,18 +269,18 @@ const Ge = () => ++Ve, he = ".", ue = (n) => n ? n.split(he) : [], Je = (n) => n
   }
   n("Parent: Handshake - Received SYN, responding with SYN-ACK");
   const a = {
-    penpal: k.SynAck,
+    penpal: A.SynAck,
     methodNames: Object.keys(e)
   };
   o.source.postMessage(a, r);
-}, ot = 6e4, at = (n, e) => {
+}, at = 6e4, it = (n, e) => {
   const { destroy: t, onDestroy: r } = e, o = setInterval(() => {
     n.isConnected || (clearInterval(o), t());
-  }, ot);
+  }, at);
   r(() => {
     clearInterval(o);
   });
-}, it = (n, e) => {
+}, st = (n, e) => {
   let t;
   return n !== void 0 && (t = window.setTimeout(() => {
     const r = new Error(`Connection timed out after ${n}ms`);
@@ -288,33 +288,33 @@ const Ge = () => ++Ve, he = ".", ue = (n) => n ? n.split(he) : [], Je = (n) => n
   }, n)), () => {
     clearTimeout(t);
   };
-}, st = (n) => {
+}, ct = (n) => {
   if (!n.src && !n.srcdoc) {
     const e = new Error("Iframe must have src or srcdoc property defined.");
     throw e.code = T.NoIframeSrc, e;
   }
-}, ct = (n) => {
+}, dt = (n) => {
   let { iframe: e, methods: t = {}, childOrigin: r, timeout: o, debug: a = !1 } = n;
-  const i = Qe(a), s = Fe("Parent", i), { onDestroy: d, destroy: p } = s;
-  r || (st(e), r = Ye(e.src));
-  const c = r === "null" ? "*" : r, l = fe(t), g = rt(i, l, r, c), m = nt(l, r, c, s, i);
+  const i = We(a), s = Qe("Parent", i), { onDestroy: d, destroy: p } = s;
+  r || (ct(e), r = qe(e.src));
+  const c = r === "null" ? "*" : r, l = fe(t), g = ot(i, l, r, c), m = rt(l, r, c, s, i);
   return {
-    promise: new Promise((I, b) => {
-      const C = it(o, p), A = (u) => {
+    promise: new Promise((C, b) => {
+      const x = st(o, p), k = (u) => {
         if (!(u.source !== e.contentWindow || !u.data)) {
-          if (u.data.penpal === k.Syn) {
+          if (u.data.penpal === A.Syn) {
             g(u);
             return;
           }
-          if (u.data.penpal === k.Ack) {
+          if (u.data.penpal === A.Ack) {
             const S = m(u);
-            S && (C(), I(S));
+            S && (x(), C(S));
             return;
           }
         }
       };
-      window.addEventListener(x.Message, A), i("Parent: Awaiting handshake"), at(e, s), d((u) => {
-        window.removeEventListener(x.Message, A), u && b(u);
+      window.addEventListener(I.Message, k), i("Parent: Awaiting handshake"), it(e, s), d((u) => {
+        window.removeEventListener(I.Message, k), u && b(u);
       });
     }),
     destroy() {
@@ -341,7 +341,7 @@ class be {
     const s = document.createElement("iframe");
     s.src = t.toString(), s.id = e, s.style.border = "none", s.sandbox.add("allow-forms"), s.sandbox.add("allow-popups"), s.sandbox.add("allow-popups-to-escape-sandbox"), s.sandbox.add("allow-scripts"), s.sandbox.add("allow-same-origin"), s.allow = "publickey-credentials-create *; publickey-credentials-get *; clipboard-write", document.hasStorageAccess && s.sandbox.add("allow-storage-access-by-user-activation");
     const d = document.createElement("div");
-    d.id = "controller", d.style.position = "fixed", d.style.height = "100%", d.style.width = "100%", d.style.top = "0", d.style.left = "0", d.style.zIndex = "10000", d.style.backgroundColor = "rgba(0,0,0,0.6)", d.style.display = "flex", d.style.alignItems = "center", d.style.justifyContent = "center", d.style.visibility = "hidden", d.style.opacity = "0", d.style.transition = "opacity 0.2s ease", d.style.pointerEvents = "auto", d.appendChild(s), this.iframe = s, this.container = d, ct({
+    d.id = "controller", d.style.position = "fixed", d.style.height = "100%", d.style.width = "100%", d.style.top = "0", d.style.left = "0", d.style.zIndex = "10000", d.style.backgroundColor = "rgba(0,0,0,0.6)", d.style.display = "flex", d.style.alignItems = "center", d.style.justifyContent = "center", d.style.visibility = "hidden", d.style.opacity = "0", d.style.transition = "opacity 0.2s ease", d.style.pointerEvents = "auto", d.appendChild(s), this.iframe = s, this.container = d, dt({
       iframe: this.iframe,
       methods: {
         close: (l) => () => this.close(),
@@ -390,11 +390,12 @@ class be {
     }
   }
 }
-class dt {
+class pt {
   type = "argent";
   platform = "starknet";
   wallet = void 0;
   account = void 0;
+  connectedAccounts = [];
   isAvailable() {
     return typeof window < "u" && !!window.starknet_argentX;
   }
@@ -415,8 +416,8 @@ class dt {
     try {
       if (!this.isAvailable())
         throw new Error("Argent is not available");
-      const { wallet: e, connectorData: t } = await je({
-        connectors: [new Ue({ options: { id: "argentX" } })]
+      const { wallet: e, connectorData: t } = await Ue({
+        connectors: [new Le({ options: { id: "argentX" } })]
       });
       if (!e)
         throw new Error("No wallet found");
@@ -429,6 +430,9 @@ class dt {
       };
     }
   }
+  getConnectedAccounts() {
+    return this.connectedAccounts;
+  }
   async signTypedData(e) {
     try {
       if (!this.isAvailable() || !this.wallet)
@@ -476,10 +480,48 @@ class dt {
     }
   }
 }
-class pt {
+function lt(n) {
+  if (typeof window > "u")
+    return;
+  const e = (t) => n(t.detail);
+  return window.addEventListener("eip6963:announceProvider", e), window.dispatchEvent(new CustomEvent("eip6963:requestProvider")), () => window.removeEventListener("eip6963:announceProvider", e);
+}
+function ye() {
+  const n = /* @__PURE__ */ new Set();
+  let e = [];
+  const t = () => lt((o) => {
+    e.some(({ info: a }) => a.uuid === o.info.uuid) || (e = [...e, o], n.forEach((a) => a(e, { added: [o] })));
+  });
+  let r = t();
+  return {
+    _listeners() {
+      return n;
+    },
+    clear() {
+      n.forEach((o) => o([], { removed: [...e] })), e = [];
+    },
+    destroy() {
+      this.clear(), n.clear(), r?.();
+    },
+    findProvider({ rdns: o }) {
+      return e.find((a) => a.info.rdns === o);
+    },
+    getProviders() {
+      return e;
+    },
+    reset() {
+      this.clear(), r?.(), r = t();
+    },
+    subscribe(o, { emitImmediately: a } = {}) {
+      return n.add(o), a && o(e, { added: e }), () => n.delete(o);
+    }
+  };
+}
+class gt {
   type = "metamask";
   platform = "ethereum";
   MMSDK;
+  store = ye();
   account = void 0;
   connectedAccounts = [];
   constructor() {
@@ -488,16 +530,18 @@ class pt {
         name: "Cartridge Controller",
         url: window.location.href
       }
-    }), this.MMSDK.sdkInitPromise?.then(() => {
+    }), this.isAvailable() && this.MMSDK.sdkInitPromise?.then(() => {
       this.MMSDK.getProvider()?.request({
         method: "eth_accounts"
       }).then((e) => {
-        e && e.length > 0 && (console.log(e), this.account = e[0], this.connectedAccounts = e);
+        e && e.length > 0 && (this.account = e[0], this.connectedAccounts = e);
+      }), this.MMSDK.getProvider()?.on("accountsChanged", (e) => {
+        Array.isArray(e) && (this.account = e?.[0], this.connectedAccounts = e);
       });
     });
   }
   isAvailable() {
-    return typeof window < "u" && !!window.ethereum?.isMetaMask;
+    return typeof window < "u" && this.store.getProviders().some((e) => e.info.rdns === "io.metamask");
   }
   getInfo() {
     const e = this.isAvailable();
@@ -511,24 +555,27 @@ class pt {
       connectedAccounts: this.connectedAccounts
     };
   }
-  async connect() {
-    if (this.account)
+  async connect(e) {
+    if (e && this.connectedAccounts.includes(e) && (this.account = e), this.account)
       return { success: !0, wallet: this.type, account: this.account };
     try {
       if (!this.isAvailable())
         throw new Error("MetaMask is not available");
-      const e = await this.MMSDK.connect();
-      if (e && e.length > 0)
-        return this.account = e[0], this.connectedAccounts = e, { success: !0, wallet: this.type, account: this.account };
+      const t = await this.MMSDK.connect();
+      if (t && t.length > 0)
+        return this.account = t[0], this.connectedAccounts = t, { success: !0, wallet: this.type, account: this.account };
       throw new Error("No accounts found");
-    } catch (e) {
-      return console.error("Error connecting to MetaMask:", e), {
+    } catch (t) {
+      return console.error("Error connecting to MetaMask:", t), {
         success: !1,
         wallet: this.type,
-        error: e.message || "Unknown error"
+        error: t.message || "Unknown error"
       };
     }
   }
+  getConnectedAccounts() {
+    return this.connectedAccounts;
+  }
   async signTransaction(e) {
     try {
       if (!this.isAvailable() || !this.account)
@@ -641,10 +688,11 @@ class pt {
     }
   }
 }
-class lt {
+class mt {
   type = "phantom";
   platform = "solana";
   account = void 0;
+  connectedAccounts = [];
   getProvider() {
     if (typeof window > "u")
       throw new Error("Not ready");
@@ -684,6 +732,9 @@ class lt {
       };
     }
   }
+  getConnectedAccounts() {
+    return this.connectedAccounts;
+  }
   async signMessage(e) {
     try {
       if (!this.isAvailable() || !this.account)
@@ -705,7 +756,7 @@ class lt {
     if (!this.isAvailable() || !this.account)
       throw new Error("Phantom is not connected");
     try {
-      const t = Le.from(e), o = await this.getProvider().signAndSendTransaction(t);
+      const t = Fe.from(e), o = await this.getProvider().signAndSendTransaction(t);
       return {
         success: !0,
         wallet: this.type,
@@ -740,49 +791,12 @@ class lt {
     }
   }
 }
-function gt(n) {
-  if (typeof window > "u")
-    return;
-  const e = (t) => n(t.detail);
-  return window.addEventListener("eip6963:announceProvider", e), window.dispatchEvent(new CustomEvent("eip6963:requestProvider")), () => window.removeEventListener("eip6963:announceProvider", e);
-}
-function mt() {
-  const n = /* @__PURE__ */ new Set();
-  let e = [];
-  const t = () => gt((o) => {
-    e.some(({ info: a }) => a.uuid === o.info.uuid) || (e = [...e, o], n.forEach((a) => a(e, { added: [o] })));
-  });
-  let r = t();
-  return {
-    _listeners() {
-      return n;
-    },
-    clear() {
-      n.forEach((o) => o([], { removed: [...e] })), e = [];
-    },
-    destroy() {
-      this.clear(), n.clear(), r?.();
-    },
-    findProvider({ rdns: o }) {
-      return e.find((a) => a.info.rdns === o);
-    },
-    getProviders() {
-      return e;
-    },
-    reset() {
-      this.clear(), r?.(), r = t();
-    },
-    subscribe(o, { emitImmediately: a } = {}) {
-      return n.add(o), a && o(e, { added: e }), () => n.delete(o);
-    }
-  };
-}
 const ht = "io.rabby";
 class ut {
   type = "rabby";
   platform = "ethereum";
   account = void 0;
-  store = mt();
+  store = ye();
   provider;
   connectedAccounts = [];
   constructor() {
@@ -790,6 +804,10 @@ class ut {
       method: "eth_accounts"
     }).then((e) => {
       this.connectedAccounts = e;
+    }), this.provider?.provider?.on("accountsChanged", (e) => {
+      e && (this.connectedAccounts = e.map(
+        (t) => t.toLowerCase()
+      ), this.account = e?.[0]?.toLowerCase());
     });
   }
   isAvailable() {
@@ -807,26 +825,29 @@ class ut {
       connectedAccounts: this.connectedAccounts
     };
   }
-  async connect() {
-    if (this.account)
+  async connect(e) {
+    if (e && this.connectedAccounts.includes(e.toLowerCase()) && (this.account = e.toLowerCase()), this.account)
       return { success: !0, wallet: this.type, account: this.account };
     try {
       if (!this.isAvailable())
         throw new Error("Rabby is not available");
-      const e = await this.provider?.provider.request({
+      const t = await this.provider?.provider.request({
         method: "eth_requestAccounts"
       });
-      if (e && e.length > 0)
-        return this.account = e[0], this.connectedAccounts = e, { success: !0, wallet: this.type, account: this.account };
+      if (t && t.length > 0)
+        return this.account = t[0], this.connectedAccounts = t, { success: !0, wallet: this.type, account: this.account };
       throw new Error("No accounts found");
-    } catch (e) {
-      return console.error("Error connecting to Rabby:", e), {
+    } catch (t) {
+      return console.error("Error connecting to Rabby:", t), {
         success: !1,
         wallet: this.type,
-        error: e.message || "Unknown error"
+        error: t.message || "Unknown error"
       };
     }
   }
+  getConnectedAccounts() {
+    return this.connectedAccounts;
+  }
   async signTransaction(e) {
     try {
       if (!this.isAvailable() || !this.account)
@@ -941,15 +962,13 @@ class ut {
 }
 class ft {
   walletAdapters;
-  connectedWalletsByType = /* @__PURE__ */ new Map();
-  connectedWalletsByAddress = /* @__PURE__ */ new Map();
   constructor() {
     this.walletAdapters = /* @__PURE__ */ new Map();
-    const e = new pt();
+    const e = new gt();
     e.isAvailable() && this.walletAdapters.set("metamask", e);
-    const t = new lt();
+    const t = new mt();
     t.isAvailable() && this.walletAdapters.set("phantom", t);
-    const r = new dt();
+    const r = new pt();
     r.isAvailable() && this.walletAdapters.set("argent", r);
     const o = new ut();
     o.isAvailable() && this.walletAdapters.set("rabby", o), typeof window < "u" && (window.wallet_bridge = this);
@@ -957,7 +976,7 @@ class ft {
   getIFrameMethods() {
     return {
       externalDetectWallets: (e) => () => this.detectWallets(),
-      externalConnectWallet: (e) => (t) => this.connectWallet(t),
+      externalConnectWallet: (e) => (t, r) => this.connectWallet(t, r),
       externalSignMessage: (e) => (t, r) => this.signMessage(t, r),
       externalSignTypedData: (e) => (t, r) => this.signTypedData(t, r),
       externalSendTransaction: (e) => (t, r) => this.sendTransaction(t, r),
@@ -979,7 +998,7 @@ class ft {
     const a = t instanceof Error ? t.message : "Unknown error";
     let i = "unknown";
     if (typeof e == "string") {
-      const s = this.connectedWalletsByAddress.get(e);
+      const s = this.getConnectedWalletAdapter(e);
       i = o ?? s?.type ?? e;
     } else
       i = e;
@@ -989,30 +1008,32 @@ class ft {
       error: a
     };
   }
-  async connectWallet(e) {
+  async connectWallet(e, t) {
     try {
-      const t = this.getWalletAdapterByType(e), r = await t.connect();
-      if (r.success && r.account)
-        this.connectedWalletsByType.set(e, t), this.connectedWalletsByAddress.set(r.account, t), console.log(
-          `Wallet ${e} connected with address ${r.account}`
+      const o = await this.getWalletAdapterByType(e).connect(t);
+      if (o.success && o.account)
+        console.log(
+          `Wallet ${e} connected with address ${o.account}`
         );
-      else if (r.success && !r.account)
+      else if (o.success && !o.account)
         return console.error(
           `Wallet ${e} connected successfully but did not provide an address.`
         ), {
-          ...r,
+          ...o,
           success: !1,
           error: "Wallet connected but address not found."
         };
-      return r;
-    } catch (t) {
-      return this.handleError(e, t, "connecting to");
+      return o;
+    } catch (r) {
+      return this.handleError(e, r, "connecting to");
     }
   }
   getConnectedWalletAdapter(e) {
     let t;
-    if (typeof e == "string" ? t = this.connectedWalletsByAddress.get(e) : t = this.connectedWalletsByType.get(e), !t && typeof e == "string" && (t = this.connectedWalletsByType.get(
-      e
+    if (typeof e == "string" ? t = this.walletAdapters.values().find(
+      (r) => r.getConnectedAccounts().includes(e.toLowerCase())
+    ) : t = this.walletAdapters.get(e), !t && typeof e == "string" && (t = this.walletAdapters.values().find(
+      (r) => r.getConnectedAccounts().includes(e.toLowerCase())
     )), !t)
       throw new Error(
         `Wallet with identifier ${e} is not connected or supported`
@@ -1083,7 +1104,7 @@ class ft {
 class bt extends be {
   walletBridge;
   constructor({ url: e, policies: t, ...r }) {
-    const o = new URL(e ?? Ne), a = new ft();
+    const o = new URL(e ?? De), a = new ft();
     t && o.searchParams.set(
       "policies",
       encodeURIComponent(JSON.stringify(t))
@@ -1110,7 +1131,7 @@ class yt extends be {
     policies: d,
     ...p
   }) {
-    const c = (e || De).replace(/\/$/, "");
+    const c = (e || Be).replace(/\/$/, "");
     let l = new URL(
       a ? `${c}/account/${o}/slot/${a}` : `${c}/account/${o}`
     );
@@ -1133,7 +1154,7 @@ class yt extends be {
     });
   }
 }
-class an extends Be {
+class an extends ze {
   keychain;
   profile;
   options;
@@ -1348,7 +1369,7 @@ class an extends Be {
   async validateChains(e) {
     for (const t of e)
       try {
-        const r = new URL(t.rpcUrl), o = await ze(r);
+        const r = new URL(t.rpcUrl), o = await Te(r);
         this.chains.set(o, t);
       } catch (r) {
         console.error(`Failed to parse chainId for ${t.rpcUrl}:`, r);
@@ -1373,10 +1394,10 @@ class an extends Be {
   }
 }
 const D = /* @__PURE__ */ new Map();
-async function ye(n) {
+async function we(n) {
   if (!n.addresses?.length && !n.usernames?.length)
     return { results: [] };
-  const e = await fetch(`${Te}/lookup`, {
+  const e = await fetch(`${je}/lookup`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -1389,16 +1410,16 @@ async function ye(n) {
 }
 async function sn(n) {
   const e = n.filter((t) => !D.has(t));
-  return e.length > 0 && (await ye({ usernames: e })).results.forEach((r) => {
+  return e.length > 0 && (await we({ usernames: e })).results.forEach((r) => {
     D.set(r.username, r.addresses[0]);
   }), new Map(
     n.map((t) => [t, D.get(t)]).filter((t) => t[1] !== void 0)
   );
 }
 async function cn(n) {
-  n = n.map(Pe.toHex);
+  n = n.map(Me.toHex);
   const e = n.filter((t) => !D.has(t));
-  return e.length > 0 && (await ye({
+  return e.length > 0 && (await we({
     addresses: e
   })).results.forEach((r) => {
     D.set(r.addresses[0], r.username);
@@ -1500,7 +1521,7 @@ function _t(n, e, t) {
     });
   }
 }
-function kt(n, e, t) {
+function At(n, e, t) {
   if (n instanceof Uint8Array)
     return n;
   if (typeof n == "string" && n.match(/^0x(?:[0-9a-f][0-9a-f])*$/i)) {
@@ -1513,7 +1534,7 @@ function kt(n, e, t) {
   h(!1, "invalid BytesLike value", e || "value", n);
 }
 function _(n, e) {
-  return kt(n, e);
+  return At(n, e);
 }
 function Y(n, e) {
   return !(typeof n != "string" || !n.match(/^0x[0-9A-Fa-f]*$/) || typeof e == "number" && n.length !== 2 + 2 * e || e === !0 && n.length % 2 !== 0);
@@ -1534,7 +1555,7 @@ function q(n) {
 function te(n) {
   return Y(n, !0) ? (n.length - 2) / 2 : _(n).length;
 }
-function At(n, e, t) {
+function kt(n, e, t) {
   const r = _(n);
   F(e >= r.length, "padding exceeds data length", "BUFFER_OVERRUN", {
     buffer: new Uint8Array(r),
@@ -1544,10 +1565,10 @@ function At(n, e, t) {
   const o = new Uint8Array(e);
   return o.fill(0), o.set(r, e - r.length), v(o);
 }
-function It(n, e) {
-  return At(n, e);
+function Ct(n, e) {
+  return kt(n, e);
 }
-const we = BigInt(0);
+const ve = BigInt(0);
 BigInt(1);
 const K = 9007199254740991;
 function z(n, e) {
@@ -1567,15 +1588,15 @@ function z(n, e) {
   }
   h(!1, "invalid BigNumberish value", e || "value", n);
 }
-function xt(n, e) {
+function It(n, e) {
   const t = z(n, e);
-  return F(t >= we, "unsigned value cannot be negative", "NUMERIC_FAULT", {
+  return F(t >= ve, "unsigned value cannot be negative", "NUMERIC_FAULT", {
     fault: "overflow",
     operation: "getUint",
     value: n
   }), t;
 }
-function L(n, e) {
+function O(n, e) {
   switch (typeof n) {
     case "bigint":
       return h(n >= -9007199254740991 && n <= K, "overflow", e || "value", n), Number(n);
@@ -1585,16 +1606,16 @@ function L(n, e) {
       try {
         if (n === "")
           throw new Error("empty string");
-        return L(BigInt(n), e);
+        return O(BigInt(n), e);
       } catch (t) {
         h(!1, `invalid numeric string: ${t.message}`, e || "value", n);
       }
   }
   h(!1, "invalid numeric value", e || "value", n);
 }
-function Ct(n) {
-  const e = xt(n, "value");
-  if (e === we)
+function xt(n) {
+  const e = It(n, "value");
+  if (e === ve)
     return new Uint8Array([]);
   let t = e.toString(16);
   t.length % 2 && (t = "0" + t);
@@ -1629,7 +1650,7 @@ function ne(n) {
   if (!Number.isSafeInteger(n) || n < 0)
     throw new Error(`Wrong positive integer: ${n}`);
 }
-function ve(n, ...e) {
+function _e(n, ...e) {
   if (!(n instanceof Uint8Array))
     throw new Error("Expected Uint8Array");
   if (e.length > 0 && !e.includes(n.length))
@@ -1642,7 +1663,7 @@ function re(n, e = !0) {
     throw new Error("Hash#digest() has already been called");
 }
 function Et(n, e) {
-  ve(n);
+  _e(n);
   const t = e.outputLen;
   if (n.length < t)
     throw new Error(`digestInto() expects output buffer of length at least ${t}`);
@@ -1656,7 +1677,7 @@ function Mt(n) {
     throw new Error(`utf8ToBytes expected string, got ${typeof n}`);
   return new Uint8Array(new TextEncoder().encode(n));
 }
-function _e(n) {
+function Ae(n) {
   if (typeof n == "string" && (n = Mt(n)), !Rt(n))
     throw new Error(`expected Uint8Array, got ${typeof n}`);
   return n;
@@ -1668,7 +1689,7 @@ class Nt {
   }
 }
 function Dt(n) {
-  const e = (r) => n().update(_e(r)).digest(), t = n();
+  const e = (r) => n().update(Ae(r)).digest(), t = n();
   return e.outputLen = t.outputLen, e.blockLen = t.blockLen, e.create = () => n(), e;
 }
 const U = /* @__PURE__ */ BigInt(2 ** 32 - 1), oe = /* @__PURE__ */ BigInt(32);
@@ -1683,15 +1704,15 @@ function zt(n, e = !1) {
   }
   return [t, r];
 }
-const Tt = (n, e, t) => n << t | e >>> 32 - t, jt = (n, e, t) => e << t | n >>> 32 - t, Ut = (n, e, t) => e << t - 32 | n >>> 64 - t, Ot = (n, e, t) => n << t - 32 | e >>> 64 - t, [ke, Ae, Ie] = [[], [], []], Lt = /* @__PURE__ */ BigInt(0), B = /* @__PURE__ */ BigInt(1), Ft = /* @__PURE__ */ BigInt(2), Qt = /* @__PURE__ */ BigInt(7), Wt = /* @__PURE__ */ BigInt(256), $t = /* @__PURE__ */ BigInt(113);
+const Tt = (n, e, t) => n << t | e >>> 32 - t, jt = (n, e, t) => e << t | n >>> 32 - t, Ut = (n, e, t) => e << t - 32 | n >>> 64 - t, Lt = (n, e, t) => n << t - 32 | e >>> 64 - t, [ke, Ce, Ie] = [[], [], []], Ot = /* @__PURE__ */ BigInt(0), B = /* @__PURE__ */ BigInt(1), Ft = /* @__PURE__ */ BigInt(2), Qt = /* @__PURE__ */ BigInt(7), Wt = /* @__PURE__ */ BigInt(256), $t = /* @__PURE__ */ BigInt(113);
 for (let n = 0, e = B, t = 1, r = 0; n < 24; n++) {
-  [t, r] = [r, (2 * t + 3 * r) % 5], ke.push(2 * (5 * r + t)), Ae.push((n + 1) * (n + 2) / 2 % 64);
-  let o = Lt;
+  [t, r] = [r, (2 * t + 3 * r) % 5], ke.push(2 * (5 * r + t)), Ce.push((n + 1) * (n + 2) / 2 % 64);
+  let o = Ot;
   for (let a = 0; a < 7; a++)
     e = (e << B ^ (e >> Qt) * $t) % Wt, e & Ft && (o ^= B << (B << /* @__PURE__ */ BigInt(a)) - B);
   Ie.push(o);
 }
-const [Ht, Yt] = /* @__PURE__ */ zt(Ie, !0), ae = (n, e, t) => t > 32 ? Ut(n, e, t) : Tt(n, e, t), ie = (n, e, t) => t > 32 ? Ot(n, e, t) : jt(n, e, t);
+const [Ht, Yt] = /* @__PURE__ */ zt(Ie, !0), ae = (n, e, t) => t > 32 ? Ut(n, e, t) : Tt(n, e, t), ie = (n, e, t) => t > 32 ? Lt(n, e, t) : jt(n, e, t);
 function qt(n, e = 24) {
   const t = new Uint32Array(10);
   for (let r = 24 - e; r < 24; r++) {
@@ -1704,7 +1725,7 @@ function qt(n, e = 24) {
     }
     let o = n[2], a = n[3];
     for (let i = 0; i < 24; i++) {
-      const s = Ae[i], d = ae(o, a, s), p = ie(o, a, s), c = ke[i];
+      const s = Ce[i], d = ae(o, a, s), p = ie(o, a, s), c = ke[i];
       o = n[c], a = n[c + 1], n[c] = d, n[c + 1] = p;
     }
     for (let i = 0; i < 50; i += 10) {
@@ -1730,7 +1751,7 @@ class V extends Nt {
   update(e) {
     re(this);
     const { blockLen: t, state: r } = this;
-    e = _e(e);
+    e = Ae(e);
     const o = e.length;
     for (let a = 0; a < o; ) {
       const i = Math.min(t - this.pos, o - a);
@@ -1748,7 +1769,7 @@ class V extends Nt {
     e[r] ^= t, (t & 128) !== 0 && r === o - 1 && this.keccak(), e[o - 1] ^= 128, this.keccak();
   }
   writeInto(e) {
-    re(this, !1), ve(e), this.finish();
+    re(this, !1), _e(e), this.finish();
     const t = this.state, { blockLen: r } = this;
     for (let o = 0, a = e.length; o < a; ) {
       this.posOut >= r && this.keccak();
@@ -1783,28 +1804,28 @@ class V extends Nt {
 }
 const Kt = (n, e, t) => Dt(() => new V(e, n, t)), Vt = /* @__PURE__ */ Kt(1, 136, 256 / 8);
 let xe = !1;
-const Ce = function(n) {
+const Ee = function(n) {
   return Vt(n);
 };
-let Ee = Ce;
+let Re = Ee;
 function j(n) {
   const e = _(n, "data");
-  return v(Ee(e));
+  return v(Re(e));
 }
-j._ = Ce;
+j._ = Ee;
 j.lock = function() {
   xe = !0;
 };
 j.register = function(n) {
   if (xe)
     throw new TypeError("keccak256 is locked");
-  Ee = n;
+  Re = n;
 };
 Object.freeze(j);
 const se = "0x0000000000000000000000000000000000000000000000000000000000000000", Gt = `Ethereum Signed Message:
-`, ce = BigInt(0), de = BigInt(1), pe = BigInt(2), le = BigInt(27), ge = BigInt(28), O = BigInt(35), M = {};
+`, ce = BigInt(0), de = BigInt(1), pe = BigInt(2), le = BigInt(27), ge = BigInt(28), L = BigInt(35), M = {};
 function me(n) {
-  return It(Ct(n), 32);
+  return Ct(xt(n), 32);
 }
 class w {
   #t;
@@ -1848,7 +1869,7 @@ class w {
     return this.#r;
   }
   set v(e) {
-    const t = L(e, "value");
+    const t = O(e, "value");
     h(t === 27 || t === 28, "invalid v", "v", e), this.#r = t;
   }
   /**
@@ -1935,7 +1956,7 @@ class w {
    */
   static getChainId(e) {
     const t = z(e, "v");
-    return t == le || t == ge ? ce : (h(t >= O, "invalid EIP-155 v", "v", e), (t - O) / pe);
+    return t == le || t == ge ? ce : (h(t >= L, "invalid EIP-155 v", "v", e), (t - L) / pe);
   }
   /**
    *  Compute the ``v`` for a chain ID for a legacy EIP-155 transactions.
@@ -1977,7 +1998,7 @@ class w {
    */
   static getNormalizedV(e) {
     const t = z(e);
-    return t === ce || t === le ? 27 : t === de || t === ge ? 28 : (h(t >= O, "invalid v", "v", e), t & de ? 27 : 28);
+    return t === ce || t === le ? 27 : t === de || t === ge ? 28 : (h(t >= L, "invalid v", "v", e), t & de ? 27 : 28);
   }
   /**
    *  Creates a new [[Signature]].
@@ -2026,14 +2047,14 @@ class w {
       if (p != null) {
         const g = z(p);
         return {
-          networkV: g >= O ? g : void 0,
+          networkV: g >= L ? g : void 0,
           v: w.getNormalizedV(g)
         };
       }
       if (c != null)
         return t(Y(c, 32), "invalid yParityAndS"), { v: _(c)[0] & 128 ? 28 : 27 };
       if (l != null) {
-        switch (L(l, "sig.yParity")) {
+        switch (O(l, "sig.yParity")) {
           case 0:
             return { v: 27 };
           case 1:
@@ -2043,7 +2064,7 @@ class w {
       }
       t(!1, "missing v");
     }(e.v, e.yParityAndS, e.yParity), d = new w(M, o, a, s);
-    return i && (d.#e = i), t(e.yParity == null || L(e.yParity, "sig.yParity") === d.yParity, "yParity mismatch"), t(e.yParityAndS == null || e.yParityAndS === d.yParityAndS, "yParityAndS mismatch"), d;
+    return i && (d.#e = i), t(e.yParity == null || O(e.yParity, "sig.yParity") === d.yParity, "yParity mismatch"), t(e.yParityAndS == null || e.yParityAndS === d.yParityAndS, "yParityAndS mismatch"), d;
   }
 }
 function Jt(n) {
@@ -2095,6 +2116,9 @@ class dn {
       };
     }
   }
+  getConnectedAccounts() {
+    return this.account ? [this.account] : [];
+  }
   async signTransaction(e) {
     try {
       if (!this.isAvailable() || !this.account)
@@ -2179,11 +2203,14 @@ class dn {
 }
 class pn {
   constructor(e, t) {
-    this.provider = e, this.account = t;
+    this.provider = e, this.account = t?.toLowerCase();
   }
   type = "walletconnect";
   platform = "ethereum";
   account = void 0;
+  getConnectedAccounts() {
+    return this.account ? [this.account] : [];
+  }
   isAvailable() {
     return !!this.provider;
   }
@@ -2241,7 +2268,7 @@ class pn {
         throw new Error("WalletConnect is not connected");
       const t = await this.provider.request({
         method: "personal_sign",
-        params: [this.account, e]
+        params: [e, this.account]
       });
       return { success: !0, wallet: this.type, result: t };
     } catch (t) {
@@ -2318,7 +2345,7 @@ class pn {
     }
   }
 }
-var Re = {
+var Se = {
   "blob-arena": {
     origin: ["*.blobarena.xyz", "blobarena.xyz", "development.blobarena.xyz"],
     theme: {
@@ -6472,13 +6499,13 @@ var Re = {
     total_supply: null,
     logo_url: "https://assets.underware.gg/pistols/fame.svg"
   }
-], ln = Re, gn = Xt, mn = Re.cartridge.theme;
+], ln = Se, gn = Xt, mn = Se.cartridge.theme;
 export {
-  dt as ArgentWallet,
+  pt as ArgentWallet,
   fn as FeeSource,
-  pt as MetaMaskWallet,
+  gt as MetaMaskWallet,
   y as NotReadyToConnect,
-  lt as PhantomWallet,
+  mt as PhantomWallet,
   ut as RabbyWallet,
   E as ResponseCodes,
   dn as TurnkeyWallet,
@@ -6492,8 +6519,8 @@ export {
   cn as lookupAddresses,
   sn as lookupUsernames,
   yn as normalizeCalls,
-  ze as parseChainId,
-  Me as toArray,
+  Te as parseChainId,
+  Ne as toArray,
   wn as toSessionPolicies,
   vn as toWasmPolicies
 };