@cartridge/controller 0.7.11 → 0.7.12

package/dist/index.js

@@ -1,6 +1,6 @@
 import { WalletAccount as L, shortString as M, num as O } from "starknet";
-import { R as A, t as Y, K as $, P as W, B as H, N as u, p as K, A as q } from "./provider-CyO7_h7r.js";
-import { F as Oe, h as Ye, n as $e, a as We, b as He } from "./provider-CyO7_h7r.js";
+import { R as A, t as Y, K as $, P as W, B as H, N as u, p as K, A as q } from "./provider-BN3lM6-S.js";
+import { F as Oe, h as Ye, n as $e, a as We, b as He } from "./provider-BN3lM6-S.js";
 import { MetaMaskSDK as G } from "@metamask/sdk";
 import { Transaction as V } from "@solana/web3.js";
 import { connect as J } from "starknetkit";
@@ -86,10 +86,10 @@ var C;
 (function(o) {
   o.Fulfilled = "fulfilled", o.Rejected = "rejected";
 })(C || (C = {}));
-var E;
+var R;
 (function(o) {
   o.ConnectionDestroyed = "ConnectionDestroyed", o.ConnectionTimeout = "ConnectionTimeout", o.NoIframeSrc = "NoIframeSrc";
-})(E || (E = {}));
+})(R || (R = {}));
 var D;
 (function(o) {
   o.DataCloneError = "DataCloneError";
@@ -117,7 +117,7 @@ const Z = (o, e) => {
   "http:": "80",
   "https:": "443"
 }, ne = /^(https?:)?\/\/([^/:]+)?(:(\d+))?/, oe = ["file:", "data:"], re = (o) => {
-  if (o && oe.find((s) => o.startsWith(s)))
+  if (o && oe.find((i) => o.startsWith(i)))
     return "null";
   const e = document.location, t = ne.exec(o);
   let n, r, a;
@@ -132,31 +132,31 @@ const Z = (o, e) => {
   const e = new Error();
   return Object.keys(o).forEach((t) => e[t] = o[t]), e;
 }, ie = (o, e, t) => {
-  const { localName: n, local: r, remote: a, originForSending: c, originForReceiving: s } = o;
-  let i = !1;
+  const { localName: n, local: r, remote: a, originForSending: c, originForReceiving: i } = o;
+  let s = !1;
   const l = (d) => {
     if (d.source !== a || d.data.penpal !== y.Call)
       return;
-    if (s !== "*" && d.origin !== s) {
-      t(`${n} received message from origin ${d.origin} which did not match expected origin ${s}`);
+    if (i !== "*" && d.origin !== i) {
+      t(`${n} received message from origin ${d.origin} which did not match expected origin ${i}`);
       return;
     }
     const p = d.data, { methodName: h, args: g, id: f } = p;
     t(`${n}: Received ${h}() call`);
-    const w = (b) => (k) => {
-      if (t(`${n}: Sending ${h}() reply`), i) {
+    const v = (b) => (k) => {
+      if (t(`${n}: Sending ${h}() reply`), s) {
         t(`${n}: Unable to send ${h}() reply due to destroyed connection`);
         return;
       }
-      const v = {
+      const w = {
         penpal: y.Reply,
         id: f,
         resolution: b,
         returnValue: k
       };
-      b === C.Rejected && k instanceof Error && (v.returnValue = N(k), v.returnValueIsError = !0);
+      b === C.Rejected && k instanceof Error && (w.returnValue = N(k), w.returnValueIsError = !0);
       try {
-        a.postMessage(v, c);
+        a.postMessage(w, c);
       } catch (m) {
         if (m.name === D.DataCloneError) {
           const I = {
@@ -171,10 +171,10 @@ const Z = (o, e) => {
         throw m;
       }
     };
-    new Promise((b) => b(e[h].call(e, d.origin).apply(e, g))).then(w(C.Fulfilled), w(C.Rejected));
+    new Promise((b) => b(e[h].call(e, d.origin).apply(e, g))).then(v(C.Fulfilled), v(C.Rejected));
   };
   return r.addEventListener(_.Message, l), () => {
-    i = !0, r.removeEventListener(_.Message, l);
+    s = !0, r.removeEventListener(_.Message, l);
   };
 };
 let se = 0;
@@ -196,42 +196,42 @@ const ce = () => ++se, j = ".", B = (o) => o ? o.split(j) : [], de = (o) => o.jo
     le(e, t, o[t]);
   return e;
 }, me = (o, e, t, n, r) => {
-  const { localName: a, local: c, remote: s, originForSending: i, originForReceiving: l } = e;
+  const { localName: a, local: c, remote: i, originForSending: s, originForReceiving: l } = e;
   let d = !1;
   r(`${a}: Connecting call sender`);
   const p = (g) => (...f) => {
     r(`${a}: Sending ${g}() call`);
-    let w;
+    let v;
     try {
-      s.closed && (w = !0);
+      i.closed && (v = !0);
     } catch {
-      w = !0;
+      v = !0;
     }
-    if (w && n(), d) {
+    if (v && n(), d) {
       const b = new Error(`Unable to send ${g}() call due to destroyed connection`);
-      throw b.code = E.ConnectionDestroyed, b;
+      throw b.code = R.ConnectionDestroyed, b;
     }
     return new Promise((b, k) => {
-      const v = ce(), m = (x) => {
-        if (x.source !== s || x.data.penpal !== y.Reply || x.data.id !== v)
+      const w = ce(), m = (x) => {
+        if (x.source !== i || x.data.penpal !== y.Reply || x.data.id !== w)
           return;
         if (l !== "*" && x.origin !== l) {
           r(`${a} received message from origin ${x.origin} which did not match expected origin ${l}`);
           return;
         }
-        const R = x.data;
+        const E = x.data;
         r(`${a}: Received ${g}() reply`), c.removeEventListener(_.Message, m);
-        let P = R.returnValue;
-        R.returnValueIsError && (P = ae(P)), (R.resolution === C.Fulfilled ? b : k)(P);
+        let P = E.returnValue;
+        E.returnValueIsError && (P = ae(P)), (E.resolution === C.Fulfilled ? b : k)(P);
       };
       c.addEventListener(_.Message, m);
       const I = {
         penpal: y.Call,
-        id: v,
+        id: w,
         methodName: g,
         args: f
       };
-      s.postMessage(I, i);
+      i.postMessage(I, s);
     });
   }, h = t.reduce((g, f) => (g[f] = p(f), g), {});
   return Object.assign(o, ge(h)), () => {
@@ -239,7 +239,7 @@ const ce = () => ++se, j = ".", B = (o) => o ? o.split(j) : [], de = (o) => o.jo
   };
 }, he = (o, e, t, n, r) => {
   const { destroy: a, onDestroy: c } = n;
-  let s, i;
+  let i, s;
   const l = {};
   return (d) => {
     if (e !== "*" && d.origin !== e) {
@@ -254,10 +254,10 @@ const ce = () => ++se, j = ".", B = (o) => o ? o.split(j) : [], de = (o) => o.jo
       originForSending: t,
       originForReceiving: e
     };
-    s && s(), s = ie(p, o, r), c(s), i && i.forEach((g) => {
+    i && i(), i = ie(p, o, r), c(i), s && s.forEach((g) => {
       delete l[g];
-    }), i = d.data.methodNames;
-    const h = me(l, p, i, a, r);
+    }), s = d.data.methodNames;
+    const h = me(l, p, s, a, r);
     return c(h), l;
   };
 }, fe = (o, e, t, n) => (r) => {
@@ -284,23 +284,23 @@ const ce = () => ++se, j = ".", B = (o) => o ? o.split(j) : [], de = (o) => o.jo
   let t;
   return o !== void 0 && (t = window.setTimeout(() => {
     const n = new Error(`Connection timed out after ${o}ms`);
-    n.code = E.ConnectionTimeout, e(n);
+    n.code = R.ConnectionTimeout, e(n);
   }, o)), () => {
     clearTimeout(t);
   };
-}, ve = (o) => {
+}, we = (o) => {
   if (!o.src && !o.srcdoc) {
     const e = new Error("Iframe must have src or srcdoc property defined.");
-    throw e.code = E.NoIframeSrc, e;
+    throw e.code = R.NoIframeSrc, e;
   }
-}, we = (o) => {
+}, ve = (o) => {
   let { iframe: e, methods: t = {}, childOrigin: n, timeout: r, debug: a = !1 } = o;
-  const c = ee(a), s = Z("Parent", c), { onDestroy: i, destroy: l } = s;
-  n || (ve(e), n = re(e.src));
-  const d = n === "null" ? "*" : n, p = T(t), h = fe(c, p, n, d), g = he(p, n, d, s, c);
+  const c = ee(a), i = Z("Parent", c), { onDestroy: s, destroy: l } = i;
+  n || (we(e), n = re(e.src));
+  const d = n === "null" ? "*" : n, p = T(t), h = fe(c, p, n, d), g = he(p, n, d, i, c);
   return {
-    promise: new Promise((w, b) => {
-      const k = ye(r, l), v = (m) => {
+    promise: new Promise((v, b) => {
+      const k = ye(r, l), w = (m) => {
         if (!(m.source !== e.contentWindow || !m.data)) {
           if (m.data.penpal === y.Syn) {
             h(m);
@@ -308,13 +308,13 @@ const ce = () => ++se, j = ".", B = (o) => o ? o.split(j) : [], de = (o) => o.jo
           }
           if (m.data.penpal === y.Ack) {
             const I = g(m);
-            I && (k(), w(I));
+            I && (k(), v(I));
             return;
           }
         }
       };
-      window.addEventListener(_.Message, v), c("Parent: Awaiting handshake"), ue(e, s), i((m) => {
-        window.removeEventListener(_.Message, v), m && b(m);
+      window.addEventListener(_.Message, w), c("Parent: Awaiting handshake"), ue(e, i), s((m) => {
+        window.removeEventListener(_.Message, w), m && b(m);
       });
     }),
     destroy() {
@@ -338,10 +338,10 @@ class Q {
     if (typeof document > "u")
       return;
     n && t.searchParams.set("preset", n), this.url = t;
-    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-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 i = document.createElement("div");
-    i.id = "controller", i.style.position = "fixed", i.style.height = "100%", i.style.width = "100%", i.style.top = "0", i.style.left = "0", i.style.zIndex = "10000", i.style.backgroundColor = "rgba(0,0,0,0.6)", i.style.display = "flex", i.style.alignItems = "center", i.style.justifyContent = "center", i.style.visibility = "hidden", i.style.opacity = "0", i.style.transition = "opacity 0.2s ease", i.style.pointerEvents = "auto", i.appendChild(s), this.iframe = s, this.container = i, we({
+    const i = document.createElement("iframe");
+    i.src = t.toString(), i.id = e, i.style.border = "none", i.sandbox.add("allow-forms"), i.sandbox.add("allow-popups"), i.sandbox.add("allow-scripts"), i.sandbox.add("allow-same-origin"), i.allow = "publickey-credentials-create *; publickey-credentials-get *; clipboard-write", document.hasStorageAccess && i.sandbox.add("allow-storage-access-by-user-activation");
+    const s = document.createElement("div");
+    s.id = "controller", s.style.position = "fixed", s.style.height = "100%", s.style.width = "100%", s.style.top = "0", s.style.left = "0", s.style.zIndex = "10000", s.style.backgroundColor = "rgba(0,0,0,0.6)", s.style.display = "flex", s.style.alignItems = "center", s.style.justifyContent = "center", s.style.visibility = "hidden", s.style.opacity = "0", s.style.transition = "opacity 0.2s ease", s.style.pointerEvents = "auto", s.appendChild(i), this.iframe = i, this.container = s, ve({
       iframe: this.iframe,
       methods: {
         close: (p) => () => this.close(),
@@ -359,14 +359,14 @@ class Q {
     }).promise.then(a), this.resize(), window.addEventListener("resize", () => this.resize());
     const l = new MutationObserver(() => {
       const p = document.getElementById("controller");
-      document.body && (e === "controller-keychain" && !p || e === "controller-profile") && (document.body.appendChild(i), l.disconnect());
+      document.body && (e === "controller-keychain" && !p || e === "controller-profile") && (document.body.appendChild(s), l.disconnect());
     });
     l.observe(document.documentElement, {
       childList: !0,
       subtree: !0
     });
     const d = document.getElementById("controller");
-    document.body && (e === "controller-keychain" && !d || e === "controller-profile") && document.body.appendChild(i), this.onClose = r;
+    document.body && (e === "controller-keychain" && !d || e === "controller-profile") && document.body.appendChild(s), this.onClose = r;
   }
   open() {
     this.container && (document.body.style.overflow = "hidden", this.container.style.visibility = "visible", this.container.style.opacity = "1");
@@ -733,7 +733,8 @@ class Ae {
 }
 class Ce {
   walletAdapters;
-  connectedWallets = /* @__PURE__ */ new Map();
+  connectedWalletsByType = /* @__PURE__ */ new Map();
+  connectedWalletsByAddress = /* @__PURE__ */ new Map();
   constructor() {
     this.walletAdapters = /* @__PURE__ */ new Map(), this.walletAdapters.set("metamask", new _e()), this.walletAdapters.set("phantom", new ke()), this.walletAdapters.set("argent", new Ae()), typeof window < "u" && (window.wallet_bridge = this);
   }
@@ -752,64 +753,114 @@ class Ce {
       (t) => t.getInfo()
     );
   }
-  getWalletAdapter(e) {
+  getWalletAdapterByType(e) {
     const t = this.walletAdapters.get(e);
     if (!t)
       throw new Error(`Unsupported wallet type: ${e}`);
     return t;
   }
-  handleError(e, t, n) {
-    const r = t instanceof Error ? t.message : "Unknown error";
-    return console.error(`Error ${n} with ${e} wallet:`, t), { success: !1, wallet: e, error: r };
+  handleError(e, t, n, r) {
+    const a = t instanceof Error ? t.message : "Unknown error";
+    let c = "unknown";
+    if (typeof e == "string") {
+      const i = this.connectedWalletsByAddress.get(e);
+      c = r ?? i?.type ?? e;
+    } else
+      c = e;
+    return console.error(`Error ${n} with ${e} wallet:`, t), {
+      success: !1,
+      wallet: c,
+      error: a
+    };
   }
   async connectWallet(e) {
     try {
-      const t = this.getWalletAdapter(e), n = await t.connect();
-      return n.success && this.connectedWallets.set(e, t), n;
+      const t = this.getWalletAdapterByType(e), n = await t.connect();
+      if (n.success && n.account)
+        this.connectedWalletsByType.set(e, t), this.connectedWalletsByAddress.set(n.account, t), console.log(
+          `Wallet ${e} connected with address ${n.account}`
+        );
+      else if (n.success && !n.account)
+        return console.error(
+          `Wallet ${e} connected successfully but did not provide an address.`
+        ), {
+          ...n,
+          success: !1,
+          error: "Wallet connected but address not found."
+        };
+      return n;
     } catch (t) {
       return this.handleError(e, t, "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
+    )), !t)
+      throw new Error(
+        `Wallet with identifier ${e} is not connected or supported`
+      );
+    return t;
+  }
   async signMessage(e, t) {
+    let n;
     try {
-      if (!this.connectedWallets.has(e))
-        throw new Error(`Wallet ${e} is not connected`);
-      const n = this.connectedWallets.get(e);
-      if (!n.signMessage)
-        throw new Error(`Wallet ${e} does not support signing messages`);
+      if (n = this.getConnectedWalletAdapter(e), !n.signMessage)
+        throw new Error(
+          `Wallet type ${n.type} (identifier: ${e}) does not support signing messages`
+        );
       return await n.signMessage(t);
-    } catch (n) {
-      return this.handleError(e, n, "signing message with");
+    } catch (r) {
+      return this.handleError(
+        e,
+        r,
+        "signing message with",
+        n?.type
+      );
     }
   }
   async signTypedData(e, t) {
+    let n;
     try {
-      if (!this.connectedWallets.has(e))
-        throw new Error(`Wallet ${e} is not connected`);
-      const n = this.connectedWallets.get(e);
-      if (!n.signTypedData)
-        throw new Error(`Wallet ${e} does not support signing typed data`);
+      if (n = this.getConnectedWalletAdapter(e), !n.signTypedData)
+        throw new Error(
+          `Wallet type ${n.type} (identifier: ${e}) does not support signing typed data`
+        );
       return await n.signTypedData(t);
-    } catch (n) {
-      return this.handleError(e, n, "signing typed data with");
+    } catch (r) {
+      return this.handleError(
+        e,
+        r,
+        "signing typed data with",
+        n?.type
+      );
     }
   }
   async sendTransaction(e, t) {
+    let n;
     try {
-      if (!this.connectedWallets.has(e))
-        throw new Error(`Wallet ${e} is not connected`);
-      return await this.connectedWallets.get(e).sendTransaction(t);
-    } catch (n) {
-      return this.handleError(e, n, "sending transaction with");
+      return n = this.getConnectedWalletAdapter(e), await n.sendTransaction(t);
+    } catch (r) {
+      return this.handleError(
+        e,
+        r,
+        "sending transaction with",
+        n?.type
+      );
     }
   }
   async getBalance(e, t) {
+    let n;
     try {
-      if (!this.connectedWallets.has(e))
-        throw new Error(`Wallet ${e} is not connected`);
-      return await this.connectedWallets.get(e).getBalance(t);
-    } catch (n) {
-      return this.handleError(e, n, "getting balance from");
+      return n = this.getConnectedWalletAdapter(e), await n.getBalance(t);
+    } catch (r) {
+      return this.handleError(
+        e,
+        r,
+        "getting balance from",
+        n?.type
+      );
     }
   }
 }
@@ -825,7 +876,7 @@ class Ie extends Q {
       id: "controller-keychain",
       url: r,
       methods: a.getIFrameMethods()
-    }), this.walletBridge = a;
+    }), this.walletBridge = a, typeof window < "u" && (window.external_wallets = this.walletBridge);
   }
   getWalletBridge() {
     return this.walletBridge;
@@ -839,19 +890,19 @@ class xe extends Q {
     username: r,
     slot: a,
     namespace: c,
-    tokens: s,
-    policies: i,
+    tokens: i,
+    policies: s,
     ...l
   }) {
     const d = (e || W).replace(/\/$/, "");
     let p = new URL(
       a ? `${d}/account/${r}/slot/${a}` : `${d}/account/${r}`
     );
-    if (a && p.searchParams.set("ps", encodeURIComponent(a)), c && p.searchParams.set("ns", encodeURIComponent(c)), n && p.searchParams.set("v", encodeURIComponent(n)), p.searchParams.set("rpcUrl", encodeURIComponent(t)), s?.erc20 && p.searchParams.set(
+    if (a && p.searchParams.set("ps", encodeURIComponent(a)), c && p.searchParams.set("ns", encodeURIComponent(c)), n && p.searchParams.set("v", encodeURIComponent(n)), p.searchParams.set("rpcUrl", encodeURIComponent(t)), i?.erc20 && p.searchParams.set(
       "erc20",
-      encodeURIComponent(s.erc20.toString())
-    ), i?.contracts) {
-      const h = Object.values(i.contracts).flatMap(
+      encodeURIComponent(i.erc20.toString())
+    ), s?.contracts) {
+      const h = Object.values(s.contracts).flatMap(
         (g) => g.methods
       );
       p.searchParams.set(
@@ -1047,7 +1098,7 @@ class Ne extends H {
     }
     this.iframes.profile.close(), this.iframes.keychain.open(), this.keychain.openPurchaseCredits();
   }
-  openStarterPack() {
+  openStarterPack(e) {
     if (!this.keychain || !this.iframes.keychain) {
       console.error(new u().message);
       return;
@@ -1056,7 +1107,7 @@ class Ne extends H {
       console.error("Profile is not ready");
       return;
     }
-    this.iframes.profile.close(), this.iframes.keychain.open(), this.keychain.openStarterPack();
+    this.iframes.profile.close(), this.iframes.keychain.open(), this.keychain.openStarterPack(e);
   }
   async openExecute(e, t) {
     if (!this.keychain || !this.iframes.keychain) {
@@ -1070,7 +1121,10 @@ class Ne extends H {
     let n = this.selectedChain;
     t && this.switchStarknetChain(t), this.iframes.profile?.sendBackward(), this.iframes.keychain.open(), this.iframes.profile?.close();
     const r = await this.keychain.execute(e, void 0, void 0, !0);
-    return this.iframes.profile?.open(), this.iframes.keychain.close(), this.iframes.profile?.sendForward(), t && this.switchStarknetChain(n), !(r && (r.code === A.NOT_CONNECTED || r.code === A.CANCELED));
+    return this.iframes.profile?.open(), this.iframes.keychain.close(), this.iframes.profile?.sendForward(), t && this.switchStarknetChain(n), {
+      status: !(r && (r.code === A.NOT_CONNECTED || r.code === A.CANCELED)),
+      transactionHash: r?.transaction_hash
+    };
   }
   async delegateAccount() {
     return this.keychain ? await this.keychain.delegateAccount() : (console.error(new u().message), null);