@burnt-labs/abstraxion 0.1.0-alpha.21 → 0.1.0-alpha.23

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @burnt-labs/abstraxion@0.1.0-alpha.21 build /home/runner/work/xion.js/xion.js/packages/abstraxion
+> @burnt-labs/abstraxion@0.1.0-alpha.23 build /home/runner/work/xion.js/xion.js/packages/abstraxion
 > tsup
 
 CLI Building entry: src/index.ts
@@ -12,10 +12,10 @@
 CJS Build start
 DTS Build start
 ESM dist/index.css 7.41 KB
-ESM dist/index.mjs 11.29 KB
-ESM ⚡️ Build success in 1010ms
+ESM dist/index.mjs 13.34 KB
+ESM ⚡️ Build success in 943ms
 CJS dist/index.css 7.41 KB
-CJS dist/index.js  11.74 KB
-CJS ⚡️ Build success in 1011ms
-DTS ⚡️ Build success in 3364ms
-DTS dist/index.d.ts 2.23 KB
+CJS dist/index.js  13.76 KB
+CJS ⚡️ Build success in 943ms
+DTS ⚡️ Build success in 3287ms
+DTS dist/index.d.ts 2.30 KB

package/CHANGELOG.md

@@ -1,12 +1,36 @@
 # @burnt-labs/abstraxion
 
+## 0.1.0-alpha.23
+
+### Minor Changes
+
+- [#53](https://github.com/burnt-labs/xion.js/pull/53) [`2257a1f`](https://github.com/burnt-labs/xion.js/commit/2257a1f5249a1efaa6f7d15522ee330981ae8952) Thanks [@justinbarry](https://github.com/justinbarry)! - Add getAccount method in GranteeSignerClient to parse abstractaccount.v1.AbstractAccount type accounts
+
+### Patch Changes
+
+- Updated dependencies [[`2257a1f`](https://github.com/burnt-labs/xion.js/commit/2257a1f5249a1efaa6f7d15522ee330981ae8952)]:
+  - @burnt-labs/signers@0.1.0-alpha.4
+
+## 0.1.0-alpha.22
+
+### Minor Changes
+
+- [#42](https://github.com/burnt-labs/xion.js/pull/42) [`6a6fdd2`](https://github.com/burnt-labs/xion.js/commit/6a6fdd253a1dc81873d271d2ac5e87100ef18ff1) Thanks [@BurntVal](https://github.com/BurntVal)! - remove unnecessary packages from abstraxion and optimize modal backdrop
+
+- [#47](https://github.com/burnt-labs/xion.js/pull/47) [`dd8680f`](https://github.com/burnt-labs/xion.js/commit/dd8680f6bc18e15a531993be048e9db83d79b488) Thanks [@BurntVal](https://github.com/BurntVal)! - persistence and related state cleanup
+
+### Patch Changes
+
+- Updated dependencies [[`6a6fdd2`](https://github.com/burnt-labs/xion.js/commit/6a6fdd253a1dc81873d271d2ac5e87100ef18ff1)]:
+  - @burnt-labs/ui@0.1.0-alpha.4
+
 ## 0.1.0-alpha.21
 
 ### Minor Changes
 
 - [#41](https://github.com/burnt-labs/xion.js/pull/41) [`a269cdf`](https://github.com/burnt-labs/xion.js/commit/a269cdf88722408e91b643d12ce4181ce26296f3) Thanks [@BurntVal](https://github.com/BurntVal)! - abstraxion dynamic url for grant creation on dashboard
 
-- [#44](https://github.com/burnt-labs/xion.js/pull/44) [`56b9f87`](https://github.com/burnt-labs/xion.js/commit/56b9f87482a7210072eaa279960d1ff01ad5b4e0) Thanks [@justinbarry](https://github.com/justinbarry)! - Add grantee signer client to seamlessly handle grantor/grantee relationships
+- [#44](https://github.com/burnt-labs/xion.js/pull/44) [`56b9f87`](https://github.com/burnt-labs/xion.js/commit/56b9f87482a7210072eaa279960d1ff01ad5b4e0) Thanks [@justinbarry](https://github.com/justinbarry)! - Add grantee signer client to seamlessly handle granter/grantee relationships
 
 ### Patch Changes
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { SigningCosmWasmClient, SigningCosmWasmClientOptions, DeliverTxResponse } from '@cosmjs/cosmwasm-stargate';
 import { OfflineSigner, EncodeObject } from '@cosmjs/proto-signing';
-import { StdFee, SignerData } from '@cosmjs/stargate';
+import { Account, StdFee, SignerData } from '@cosmjs/stargate';
 import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
 import { HttpEndpoint, TendermintClient } from '@cosmjs/tendermint-rpc';
 
@@ -28,15 +28,16 @@ interface useAbstraxionAccountProps {
 declare const useAbstraxionAccount: () => useAbstraxionAccountProps;
 
 interface GranteeSignerOptions {
-    readonly grantorAddress: string;
+    readonly granterAddress: string;
     readonly granteeAddress: string;
 }
 declare class GranteeSignerClient extends SigningCosmWasmClient {
-    protected readonly grantorAddress: string;
+    protected readonly granterAddress: string;
     protected readonly granteeAddress: string;
     static connectWithSigner(endpoint: string | HttpEndpoint, signer: OfflineSigner, options: SigningCosmWasmClientOptions & GranteeSignerOptions): Promise<GranteeSignerClient>;
     static createWithSigner(cometClient: TendermintClient, signer: OfflineSigner, options: SigningCosmWasmClientOptions & GranteeSignerOptions): Promise<GranteeSignerClient>;
-    protected constructor(cometClient: TendermintClient | undefined, signer: OfflineSigner, { grantorAddress, granteeAddress, ...options }: SigningCosmWasmClientOptions & GranteeSignerOptions);
+    protected constructor(cometClient: TendermintClient | undefined, signer: OfflineSigner, { granterAddress, granteeAddress, ...options }: SigningCosmWasmClientOptions & GranteeSignerOptions);
+    getAccount(searchAddress: string): Promise<Account | null>;
     signAndBroadcast(signerAddress: string, messages: readonly EncodeObject[], fee: StdFee | "auto" | number, memo?: string): Promise<DeliverTxResponse>;
     sign(signerAddress: string, messages: readonly EncodeObject[], fee: StdFee, memo: string, explicitSignerData?: SignerData): Promise<TxRaw>;
 }

package/dist/index.js

@@ -5,10 +5,12 @@ var react = require('react');
 var ui = require('@burnt-labs/ui');
 var jsxRuntime = require('react/jsx-runtime');
 var cosmjs = require('graz/dist/cosmjs');
+var protoSigning = require('@cosmjs/proto-signing');
 var constants = require('@burnt-labs/constants');
 var cosmwasmStargate = require('@cosmjs/cosmwasm-stargate');
 var tx = require('cosmjs-types/cosmos/authz/v1beta1/tx');
 var tendermintRpc = require('@cosmjs/tendermint-rpc');
+var signers = require('@burnt-labs/signers');
 
 // src/index.ts
 var AbstraxionContext = react.createContext(
@@ -23,7 +25,7 @@ var AbstraxionContextProvider = ({
   const [isConnected, setIsConnected] = react.useState(false);
   const [isConnecting, setIsConnecting] = react.useState(false);
   const [abstraxionAccount, setAbstraxionAccount] = react.useState(void 0);
-  const [grantorAddress, setGrantorAddress] = react.useState("");
+  const [granterAddress, setgranterAddress] = react.useState("");
   return /* @__PURE__ */ jsxRuntime.jsx(
     AbstraxionContext.Provider,
     {
@@ -36,8 +38,8 @@ var AbstraxionContextProvider = ({
         setAbstraxionError,
         abstraxionAccount,
         setAbstraxionAccount,
-        grantorAddress,
-        setGrantorAddress,
+        granterAddress,
+        setgranterAddress,
         contracts,
         dashboardUrl
       },
@@ -57,11 +59,16 @@ function AbstraxionSignin() {
     setIsConnecting,
     setIsConnected,
     setAbstraxionAccount,
-    setGrantorAddress,
+    setgranterAddress,
     contracts,
     dashboardUrl
   } = react.useContext(AbstraxionContext);
   const isMounted = react.useRef(false);
+  const [tempAccountAddress, setTempAccountAddress] = react.useState("");
+  function configuregranter(address) {
+    setgranterAddress(address);
+    localStorage.setItem("xion-authz-granter-account", address);
+  }
   function openDashboardTab(userAddress, contracts2) {
     const urlParams = new URLSearchParams();
     urlParams.set("grantee", userAddress);
@@ -77,13 +84,10 @@ function AbstraxionSignin() {
     localStorage.setItem("xion-authz-temp-account", serializedKeypair);
     return keypair;
   }
-  async function pollForGrants(keypair) {
-    if (!keypair) {
-      throw new Error("No keypair");
+  async function pollForGrants(address) {
+    if (!address) {
+      throw new Error("No keypair address");
     }
-    setIsConnecting(true);
-    const accounts = await keypair.getAccounts();
-    const address = accounts[0].address;
     const shouldContinue = true;
     while (shouldContinue) {
       try {
@@ -96,38 +100,44 @@ function AbstraxionSignin() {
         );
         const data = await res.json();
         if (data.grants?.length > 0) {
+          setIsConnecting(true);
           const granterAddresses = data.grants.map((grant) => grant.granter);
           const uniqueGranters = [...new Set(granterAddresses)];
           if (uniqueGranters.length > 1) {
             console.error("More than one granter found. Taking first.");
           }
-          setGrantorAddress(uniqueGranters[0]);
+          configuregranter(uniqueGranters[0]);
           break;
         }
       } catch (error) {
-        console.log("There was an error polling for grants: ", error);
+        throw error;
       }
     }
-    setIsConnecting(false);
-    setIsConnected(true);
-    setAbstraxionAccount(keypair);
   }
   react.useEffect(() => {
     async function onStartup() {
-      const existingKeypair = localStorage.getItem("xion-authz-temp-account");
-      let keypair;
-      if (existingKeypair) {
-        keypair = await cosmjs.DirectSecp256k1HdWallet.deserialize(
-          existingKeypair,
-          "abstraxion"
-        );
-      } else {
-        keypair = await generateAndStoreTempAccount();
+      try {
+        const existingKeypair = localStorage.getItem("xion-authz-temp-account");
+        let keypair;
+        if (existingKeypair) {
+          keypair = await cosmjs.DirectSecp256k1HdWallet.deserialize(
+            existingKeypair,
+            "abstraxion"
+          );
+        } else {
+          keypair = await generateAndStoreTempAccount();
+        }
+        const accounts = await keypair.getAccounts();
+        const address = accounts[0].address;
+        setTempAccountAddress(address);
+        openDashboardTab(address, contracts);
+        await pollForGrants(address);
+        setIsConnecting(false);
+        setIsConnected(true);
+        setAbstraxionAccount(keypair);
+      } catch (error) {
+        console.log("Something went wrong: ", error);
       }
-      const accounts = await keypair.getAccounts();
-      const address = accounts[0].address;
-      openDashboardTab(address, contracts);
-      pollForGrants(keypair);
     }
     if (!isMounted.current) {
       onStartup();
@@ -140,7 +150,14 @@ function AbstraxionSignin() {
       /* @__PURE__ */ jsxRuntime.jsx("h2", { className: "ui-w-full ui-tracking-tighter ui-text-sm ui-mb-4 ui-text-neutral-500", children: "Please switch to the newly opened tab and enter your credentials to securely complete your account creation" })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsx(ui.BrowserIcon, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { structure: "naked", children: "Have a Problem? Try Again" })
+    /* @__PURE__ */ jsxRuntime.jsx(
+      ui.Button,
+      {
+        onClick: () => openDashboardTab(tempAccountAddress, contracts),
+        structure: "naked",
+        children: "Have a Problem? Try Again"
+      }
+    )
   ] });
 }
 var Loading = () => {
@@ -169,13 +186,15 @@ function ErrorDisplay() {
     )
   ] });
 }
-function Connected() {
-  const { setIsConnected } = react.useContext(
-    AbstraxionContext
-  );
+function Connected({ onClose }) {
+  const { setIsConnected, setAbstraxionAccount, setgranterAddress } = react.useContext(AbstraxionContext);
   function handleLogout() {
-    localStorage.removeItem("xion-authz-temp-account");
     setIsConnected(false);
+    localStorage.removeItem("xion-authz-temp-account");
+    localStorage.removeItem("xion-authz-granter-account");
+    setAbstraxionAccount(void 0);
+    setgranterAddress("");
+    onClose();
   }
   return /* @__PURE__ */ jsxRuntime.jsx(ui.ModalSection, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "ui-flex ui-flex-col ui-h-full ui-w-full ui-items-center ui-justify-center ui-text-white", children: [
     /* @__PURE__ */ jsxRuntime.jsx("h1", { className: "ui-tracking-tighter ui-text-3xl ui-font-bold ui-text-white ui-uppercase ui-mb-3", children: "Connected" }),
@@ -198,7 +217,7 @@ function Abstraxion({
   }, [onClose]);
   if (!isOpen)
     return null;
-  return /* @__PURE__ */ jsxRuntime.jsx(ui.Dialog, { open: isOpen, onOpenChange: onClose, children: /* @__PURE__ */ jsxRuntime.jsx(ui.DialogContent, { children: abstraxionError ? /* @__PURE__ */ jsxRuntime.jsx(ErrorDisplay, {}) : isConnecting ? /* @__PURE__ */ jsxRuntime.jsx(Loading, {}) : isConnected ? /* @__PURE__ */ jsxRuntime.jsx(Connected, {}) : /* @__PURE__ */ jsxRuntime.jsx(AbstraxionSignin, {}) }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(ui.Dialog, { open: isOpen, onOpenChange: onClose, children: /* @__PURE__ */ jsxRuntime.jsx(ui.DialogContent, { children: abstraxionError ? /* @__PURE__ */ jsxRuntime.jsx(ErrorDisplay, {}) : isConnecting ? /* @__PURE__ */ jsxRuntime.jsx(Loading, {}) : isConnected ? /* @__PURE__ */ jsxRuntime.jsx(Connected, { onClose }) : /* @__PURE__ */ jsxRuntime.jsx(AbstraxionSignin, {}) }) });
 }
 function AbstraxionProvider({
   children,
@@ -214,18 +233,53 @@ function AbstraxionProvider({
   );
 }
 var useAbstraxionAccount = () => {
-  const { isConnected, grantorAddress } = react.useContext(
-    AbstraxionContext
-  );
+  const {
+    isConnected,
+    granterAddress,
+    abstraxionAccount,
+    isConnecting,
+    setgranterAddress,
+    setAbstraxionAccount,
+    setIsConnected,
+    setIsConnecting
+  } = react.useContext(AbstraxionContext);
+  react.useEffect(() => {
+    async function configureAccount() {
+      setIsConnecting(true);
+      const tempKeypair = localStorage.getItem("xion-authz-temp-account");
+      if (tempKeypair) {
+        const deserializedKeypair = await protoSigning.DirectSecp256k1HdWallet.deserialize(
+          tempKeypair,
+          "abstraxion"
+        );
+        setAbstraxionAccount(deserializedKeypair);
+        const granterAccount = localStorage.getItem(
+          "xion-authz-granter-account"
+        );
+        if (granterAccount) {
+          setgranterAddress(granterAccount);
+          setIsConnected(true);
+        }
+      } else {
+        localStorage.removeItem("xion-authz-granter-account");
+        setAbstraxionAccount(void 0);
+        setgranterAddress("");
+      }
+      setIsConnecting(false);
+    }
+    if (!isConnecting && !abstraxionAccount && !granterAddress) {
+      configureAccount();
+    }
+  }, [isConnected, abstraxionAccount, granterAddress]);
   return {
     data: {
-      bech32Address: grantorAddress
+      bech32Address: granterAddress
     },
     isConnected
   };
 };
 var GranteeSignerClient = class extends cosmwasmStargate.SigningCosmWasmClient {
-  grantorAddress;
+  granterAddress;
   granteeAddress;
   static async connectWithSigner(endpoint, signer, options) {
     const tmClient = await tendermintRpc.Tendermint37Client.connect(endpoint);
@@ -235,22 +289,29 @@ var GranteeSignerClient = class extends cosmwasmStargate.SigningCosmWasmClient {
     return new GranteeSignerClient(cometClient, signer, options);
   }
   constructor(cometClient, signer, {
-    grantorAddress,
+    granterAddress,
     granteeAddress,
     ...options
   }) {
     super(cometClient, signer, options);
-    if (grantorAddress === void 0) {
-      throw new Error("grantorAddress is required");
+    if (granterAddress === void 0) {
+      throw new Error("granterAddress is required");
     }
-    this.grantorAddress = grantorAddress;
+    this.granterAddress = granterAddress;
     if (granteeAddress === void 0) {
       throw new Error("granteeAddress is required");
     }
     this.granteeAddress = granteeAddress;
   }
+  async getAccount(searchAddress) {
+    const account = await this.forceGetQueryClient().auth.account(searchAddress);
+    if (!account) {
+      return null;
+    }
+    return signers.customAccountFromAny(account);
+  }
   async signAndBroadcast(signerAddress, messages, fee, memo = "") {
-    if (signerAddress === this.grantorAddress) {
+    if (signerAddress === this.granterAddress) {
       signerAddress = this.granteeAddress;
       messages = [
         {
@@ -265,7 +326,7 @@ var GranteeSignerClient = class extends cosmwasmStargate.SigningCosmWasmClient {
     return super.signAndBroadcast(signerAddress, messages, fee, memo);
   }
   async sign(signerAddress, messages, fee, memo, explicitSignerData) {
-    if (signerAddress === this.grantorAddress) {
+    if (signerAddress === this.granterAddress) {
       signerAddress = this.granteeAddress;
       messages = [
         {
@@ -283,7 +344,7 @@ var GranteeSignerClient = class extends cosmwasmStargate.SigningCosmWasmClient {
 
 // src/hooks/useAbstraxionSigningClient.ts
 var useAbstraxionSigningClient = () => {
-  const { isConnected, abstraxionAccount, grantorAddress } = react.useContext(
+  const { isConnected, abstraxionAccount, granterAddress } = react.useContext(
     AbstraxionContext
   );
   const [abstractClient, setAbstractClient] = react.useState(void 0);
@@ -293,6 +354,9 @@ var useAbstraxionSigningClient = () => {
         if (!abstraxionAccount) {
           throw new Error("No account found.");
         }
+        if (!granterAddress) {
+          throw new Error("No granter found.");
+        }
         const granteeAddress = await abstraxionAccount.getAccounts().then((accounts) => {
           if (accounts.length === 0) {
             throw new Error("No account found.");
@@ -304,19 +368,18 @@ var useAbstraxionSigningClient = () => {
           abstraxionAccount,
           {
             gasPrice: cosmjs.GasPrice.fromString("0uxion"),
-            grantorAddress,
+            granterAddress,
             granteeAddress
           }
         );
         setAbstractClient(directClient);
       } catch (error) {
         console.log("Something went wrong: ", error);
+        setAbstractClient(void 0);
       }
     }
-    if (isConnected && abstraxionAccount) {
-      getSigner();
-    }
-  }, [abstraxionAccount, isConnected]);
+    getSigner();
+  }, [isConnected, abstraxionAccount, granterAddress]);
   return { client: abstractClient };
 };
 

package/dist/index.mjs

@@ -2,11 +2,13 @@ import '@burnt-labs/ui/styles.css';
 import { createContext, useContext, useEffect, useState, useRef } from 'react';
 import { Dialog, DialogContent, ModalSection, BrowserIcon, Button, Spinner } from '@burnt-labs/ui';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { GasPrice, DirectSecp256k1HdWallet } from 'graz/dist/cosmjs';
+import { GasPrice, DirectSecp256k1HdWallet as DirectSecp256k1HdWallet$1 } from 'graz/dist/cosmjs';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
 import { testnetChainInfo } from '@burnt-labs/constants';
 import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate';
 import { MsgExec } from 'cosmjs-types/cosmos/authz/v1beta1/tx';
 import { Tendermint37Client } from '@cosmjs/tendermint-rpc';
+import { customAccountFromAny } from '@burnt-labs/signers';
 
 // src/index.ts
 var AbstraxionContext = createContext(
@@ -21,7 +23,7 @@ var AbstraxionContextProvider = ({
   const [isConnected, setIsConnected] = useState(false);
   const [isConnecting, setIsConnecting] = useState(false);
   const [abstraxionAccount, setAbstraxionAccount] = useState(void 0);
-  const [grantorAddress, setGrantorAddress] = useState("");
+  const [granterAddress, setgranterAddress] = useState("");
   return /* @__PURE__ */ jsx(
     AbstraxionContext.Provider,
     {
@@ -34,8 +36,8 @@ var AbstraxionContextProvider = ({
         setAbstraxionError,
         abstraxionAccount,
         setAbstraxionAccount,
-        grantorAddress,
-        setGrantorAddress,
+        granterAddress,
+        setgranterAddress,
         contracts,
         dashboardUrl
       },
@@ -55,11 +57,16 @@ function AbstraxionSignin() {
     setIsConnecting,
     setIsConnected,
     setAbstraxionAccount,
-    setGrantorAddress,
+    setgranterAddress,
     contracts,
     dashboardUrl
   } = useContext(AbstraxionContext);
   const isMounted = useRef(false);
+  const [tempAccountAddress, setTempAccountAddress] = useState("");
+  function configuregranter(address) {
+    setgranterAddress(address);
+    localStorage.setItem("xion-authz-granter-account", address);
+  }
   function openDashboardTab(userAddress, contracts2) {
     const urlParams = new URLSearchParams();
     urlParams.set("grantee", userAddress);
@@ -68,20 +75,17 @@ function AbstraxionSignin() {
     window.open(`${dashboardUrl}?${urlParams}`, "_blank");
   }
   async function generateAndStoreTempAccount() {
-    const keypair = await DirectSecp256k1HdWallet.generate(12, {
+    const keypair = await DirectSecp256k1HdWallet$1.generate(12, {
       prefix: "xion"
     });
     const serializedKeypair = await keypair.serialize("abstraxion");
     localStorage.setItem("xion-authz-temp-account", serializedKeypair);
     return keypair;
   }
-  async function pollForGrants(keypair) {
-    if (!keypair) {
-      throw new Error("No keypair");
+  async function pollForGrants(address) {
+    if (!address) {
+      throw new Error("No keypair address");
     }
-    setIsConnecting(true);
-    const accounts = await keypair.getAccounts();
-    const address = accounts[0].address;
     const shouldContinue = true;
     while (shouldContinue) {
       try {
@@ -94,38 +98,44 @@ function AbstraxionSignin() {
         );
         const data = await res.json();
         if (data.grants?.length > 0) {
+          setIsConnecting(true);
           const granterAddresses = data.grants.map((grant) => grant.granter);
           const uniqueGranters = [...new Set(granterAddresses)];
           if (uniqueGranters.length > 1) {
             console.error("More than one granter found. Taking first.");
           }
-          setGrantorAddress(uniqueGranters[0]);
+          configuregranter(uniqueGranters[0]);
           break;
         }
       } catch (error) {
-        console.log("There was an error polling for grants: ", error);
+        throw error;
       }
     }
-    setIsConnecting(false);
-    setIsConnected(true);
-    setAbstraxionAccount(keypair);
   }
   useEffect(() => {
     async function onStartup() {
-      const existingKeypair = localStorage.getItem("xion-authz-temp-account");
-      let keypair;
-      if (existingKeypair) {
-        keypair = await DirectSecp256k1HdWallet.deserialize(
-          existingKeypair,
-          "abstraxion"
-        );
-      } else {
-        keypair = await generateAndStoreTempAccount();
+      try {
+        const existingKeypair = localStorage.getItem("xion-authz-temp-account");
+        let keypair;
+        if (existingKeypair) {
+          keypair = await DirectSecp256k1HdWallet$1.deserialize(
+            existingKeypair,
+            "abstraxion"
+          );
+        } else {
+          keypair = await generateAndStoreTempAccount();
+        }
+        const accounts = await keypair.getAccounts();
+        const address = accounts[0].address;
+        setTempAccountAddress(address);
+        openDashboardTab(address, contracts);
+        await pollForGrants(address);
+        setIsConnecting(false);
+        setIsConnected(true);
+        setAbstraxionAccount(keypair);
+      } catch (error) {
+        console.log("Something went wrong: ", error);
       }
-      const accounts = await keypair.getAccounts();
-      const address = accounts[0].address;
-      openDashboardTab(address, contracts);
-      pollForGrants(keypair);
     }
     if (!isMounted.current) {
       onStartup();
@@ -138,7 +148,14 @@ function AbstraxionSignin() {
       /* @__PURE__ */ jsx("h2", { className: "ui-w-full ui-tracking-tighter ui-text-sm ui-mb-4 ui-text-neutral-500", children: "Please switch to the newly opened tab and enter your credentials to securely complete your account creation" })
     ] }),
     /* @__PURE__ */ jsx(BrowserIcon, {}),
-    /* @__PURE__ */ jsx(Button, { structure: "naked", children: "Have a Problem? Try Again" })
+    /* @__PURE__ */ jsx(
+      Button,
+      {
+        onClick: () => openDashboardTab(tempAccountAddress, contracts),
+        structure: "naked",
+        children: "Have a Problem? Try Again"
+      }
+    )
   ] });
 }
 var Loading = () => {
@@ -167,13 +184,15 @@ function ErrorDisplay() {
     )
   ] });
 }
-function Connected() {
-  const { setIsConnected } = useContext(
-    AbstraxionContext
-  );
+function Connected({ onClose }) {
+  const { setIsConnected, setAbstraxionAccount, setgranterAddress } = useContext(AbstraxionContext);
   function handleLogout() {
-    localStorage.removeItem("xion-authz-temp-account");
     setIsConnected(false);
+    localStorage.removeItem("xion-authz-temp-account");
+    localStorage.removeItem("xion-authz-granter-account");
+    setAbstraxionAccount(void 0);
+    setgranterAddress("");
+    onClose();
   }
   return /* @__PURE__ */ jsx(ModalSection, { children: /* @__PURE__ */ jsxs("div", { className: "ui-flex ui-flex-col ui-h-full ui-w-full ui-items-center ui-justify-center ui-text-white", children: [
     /* @__PURE__ */ jsx("h1", { className: "ui-tracking-tighter ui-text-3xl ui-font-bold ui-text-white ui-uppercase ui-mb-3", children: "Connected" }),
@@ -196,7 +215,7 @@ function Abstraxion({
   }, [onClose]);
   if (!isOpen)
     return null;
-  return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: onClose, children: /* @__PURE__ */ jsx(DialogContent, { children: abstraxionError ? /* @__PURE__ */ jsx(ErrorDisplay, {}) : isConnecting ? /* @__PURE__ */ jsx(Loading, {}) : isConnected ? /* @__PURE__ */ jsx(Connected, {}) : /* @__PURE__ */ jsx(AbstraxionSignin, {}) }) });
+  return /* @__PURE__ */ jsx(Dialog, { open: isOpen, onOpenChange: onClose, children: /* @__PURE__ */ jsx(DialogContent, { children: abstraxionError ? /* @__PURE__ */ jsx(ErrorDisplay, {}) : isConnecting ? /* @__PURE__ */ jsx(Loading, {}) : isConnected ? /* @__PURE__ */ jsx(Connected, { onClose }) : /* @__PURE__ */ jsx(AbstraxionSignin, {}) }) });
 }
 function AbstraxionProvider({
   children,
@@ -212,18 +231,53 @@ function AbstraxionProvider({
   );
 }
 var useAbstraxionAccount = () => {
-  const { isConnected, grantorAddress } = useContext(
-    AbstraxionContext
-  );
+  const {
+    isConnected,
+    granterAddress,
+    abstraxionAccount,
+    isConnecting,
+    setgranterAddress,
+    setAbstraxionAccount,
+    setIsConnected,
+    setIsConnecting
+  } = useContext(AbstraxionContext);
+  useEffect(() => {
+    async function configureAccount() {
+      setIsConnecting(true);
+      const tempKeypair = localStorage.getItem("xion-authz-temp-account");
+      if (tempKeypair) {
+        const deserializedKeypair = await DirectSecp256k1HdWallet.deserialize(
+          tempKeypair,
+          "abstraxion"
+        );
+        setAbstraxionAccount(deserializedKeypair);
+        const granterAccount = localStorage.getItem(
+          "xion-authz-granter-account"
+        );
+        if (granterAccount) {
+          setgranterAddress(granterAccount);
+          setIsConnected(true);
+        }
+      } else {
+        localStorage.removeItem("xion-authz-granter-account");
+        setAbstraxionAccount(void 0);
+        setgranterAddress("");
+      }
+      setIsConnecting(false);
+    }
+    if (!isConnecting && !abstraxionAccount && !granterAddress) {
+      configureAccount();
+    }
+  }, [isConnected, abstraxionAccount, granterAddress]);
   return {
     data: {
-      bech32Address: grantorAddress
+      bech32Address: granterAddress
     },
     isConnected
   };
 };
 var GranteeSignerClient = class extends SigningCosmWasmClient {
-  grantorAddress;
+  granterAddress;
   granteeAddress;
   static async connectWithSigner(endpoint, signer, options) {
     const tmClient = await Tendermint37Client.connect(endpoint);
@@ -233,22 +287,29 @@ var GranteeSignerClient = class extends SigningCosmWasmClient {
     return new GranteeSignerClient(cometClient, signer, options);
   }
   constructor(cometClient, signer, {
-    grantorAddress,
+    granterAddress,
     granteeAddress,
     ...options
   }) {
     super(cometClient, signer, options);
-    if (grantorAddress === void 0) {
-      throw new Error("grantorAddress is required");
+    if (granterAddress === void 0) {
+      throw new Error("granterAddress is required");
     }
-    this.grantorAddress = grantorAddress;
+    this.granterAddress = granterAddress;
     if (granteeAddress === void 0) {
       throw new Error("granteeAddress is required");
     }
     this.granteeAddress = granteeAddress;
   }
+  async getAccount(searchAddress) {
+    const account = await this.forceGetQueryClient().auth.account(searchAddress);
+    if (!account) {
+      return null;
+    }
+    return customAccountFromAny(account);
+  }
   async signAndBroadcast(signerAddress, messages, fee, memo = "") {
-    if (signerAddress === this.grantorAddress) {
+    if (signerAddress === this.granterAddress) {
       signerAddress = this.granteeAddress;
       messages = [
         {
@@ -263,7 +324,7 @@ var GranteeSignerClient = class extends SigningCosmWasmClient {
     return super.signAndBroadcast(signerAddress, messages, fee, memo);
   }
   async sign(signerAddress, messages, fee, memo, explicitSignerData) {
-    if (signerAddress === this.grantorAddress) {
+    if (signerAddress === this.granterAddress) {
       signerAddress = this.granteeAddress;
       messages = [
         {
@@ -281,7 +342,7 @@ var GranteeSignerClient = class extends SigningCosmWasmClient {
 
 // src/hooks/useAbstraxionSigningClient.ts
 var useAbstraxionSigningClient = () => {
-  const { isConnected, abstraxionAccount, grantorAddress } = useContext(
+  const { isConnected, abstraxionAccount, granterAddress } = useContext(
     AbstraxionContext
   );
   const [abstractClient, setAbstractClient] = useState(void 0);
@@ -291,6 +352,9 @@ var useAbstraxionSigningClient = () => {
         if (!abstraxionAccount) {
           throw new Error("No account found.");
         }
+        if (!granterAddress) {
+          throw new Error("No granter found.");
+        }
         const granteeAddress = await abstraxionAccount.getAccounts().then((accounts) => {
           if (accounts.length === 0) {
             throw new Error("No account found.");
@@ -302,19 +366,18 @@ var useAbstraxionSigningClient = () => {
           abstraxionAccount,
           {
             gasPrice: GasPrice.fromString("0uxion"),
-            grantorAddress,
+            granterAddress,
             granteeAddress
           }
         );
         setAbstractClient(directClient);
       } catch (error) {
         console.log("Something went wrong: ", error);
+        setAbstractClient(void 0);
       }
     }
-    if (isConnected && abstraxionAccount) {
-      getSigner();
-    }
-  }, [abstraxionAccount, isConnected]);
+    getSigner();
+  }, [isConnected, abstraxionAccount, granterAddress]);
   return { client: abstractClient };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@burnt-labs/abstraxion",
-  "version": "0.1.0-alpha.21",
+  "version": "0.1.0-alpha.23",
   "sideEffects": [
     "**/*.css"
   ],
@@ -31,20 +31,17 @@
     "@burnt-labs/tsconfig": "0.0.1-alpha.0"
   },
   "dependencies": {
-    "@apollo/client": "^3.8.8",
     "@cosmjs/cosmwasm-stargate": "^0.31.3",
     "@cosmjs/proto-signing": "^0.31.3",
     "@cosmjs/stargate": "^0.31.3",
     "cosmjs-types": "^0.8.0",
     "@cosmjs/tendermint-rpc": "^0.31.1",
-    "@stytch/nextjs": "^14.0.0",
-    "@stytch/vanilla-js": "^3.2.1",
     "@types/react-dom": "^18.2.18",
     "graz": "^0.0.51",
     "jose": "^5.1.3",
     "@burnt-labs/constants": "0.0.1-alpha.2",
-    "@burnt-labs/signers": "0.1.0-alpha.3",
-    "@burnt-labs/ui": "0.0.1-alpha.3"
+    "@burnt-labs/signers": "0.1.0-alpha.4",
+    "@burnt-labs/ui": "0.1.0-alpha.4"
   },
   "scripts": {
     "build": "tsup",

package/src/GranteeSignerClient.ts

@@ -4,7 +4,7 @@ import {
   SigningCosmWasmClientOptions,
 } from "@cosmjs/cosmwasm-stargate";
 import { EncodeObject, OfflineSigner } from "@cosmjs/proto-signing";
-import { SignerData, StdFee } from "@cosmjs/stargate";
+import type { Account, SignerData, StdFee } from "@cosmjs/stargate";
 import type { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { MsgExec } from "cosmjs-types/cosmos/authz/v1beta1/tx";
 import {
@@ -12,14 +12,15 @@ import {
   Tendermint37Client,
   TendermintClient,
 } from "@cosmjs/tendermint-rpc";
+import { customAccountFromAny } from "@burnt-labs/signers";
 
 interface GranteeSignerOptions {
-  readonly grantorAddress: string;
+  readonly granterAddress: string;
   readonly granteeAddress: string;
 }
 
 export class GranteeSignerClient extends SigningCosmWasmClient {
-  protected readonly grantorAddress: string;
+  protected readonly granterAddress: string;
   protected readonly granteeAddress: string;
 
   public static async connectWithSigner(
@@ -43,16 +44,16 @@ export class GranteeSignerClient extends SigningCosmWasmClient {
     cometClient: TendermintClient | undefined,
     signer: OfflineSigner,
     {
-      grantorAddress,
+      granterAddress,
       granteeAddress,
       ...options
     }: SigningCosmWasmClientOptions & GranteeSignerOptions,
   ) {
     super(cometClient, signer, options);
-    if (grantorAddress === undefined) {
-      throw new Error("grantorAddress is required");
+    if (granterAddress === undefined) {
+      throw new Error("granterAddress is required");
     }
-    this.grantorAddress = grantorAddress;
+    this.granterAddress = granterAddress;
 
     if (granteeAddress === undefined) {
       throw new Error("granteeAddress is required");
@@ -60,14 +61,23 @@ export class GranteeSignerClient extends SigningCosmWasmClient {
     this.granteeAddress = granteeAddress;
   }
 
+  public async getAccount(searchAddress: string): Promise<Account | null> {
+    const account =
+      await this.forceGetQueryClient().auth.account(searchAddress);
+    if (!account) {
+      return null;
+    }
+    return customAccountFromAny(account);
+  }
+
   public async signAndBroadcast(
     signerAddress: string,
     messages: readonly EncodeObject[],
     fee: StdFee | "auto" | number,
     memo = "",
   ): Promise<DeliverTxResponse> {
-    // Figure out if the signerAddress is a grantor
-    if (signerAddress === this.grantorAddress) {
+    // Figure out if the signerAddress is a granter
+    if (signerAddress === this.granterAddress) {
       signerAddress = this.granteeAddress;
       // Wrap the signerAddress in a MsgExec
       messages = [
@@ -91,8 +101,8 @@ export class GranteeSignerClient extends SigningCosmWasmClient {
     memo: string,
     explicitSignerData?: SignerData,
   ): Promise<TxRaw> {
-    // Figure out if the signerAddress is a grantor
-    if (signerAddress === this.grantorAddress) {
+    // Figure out if the signerAddress is a granter
+    if (signerAddress === this.granterAddress) {
       signerAddress = this.granteeAddress;
       // Wrap the signerAddress in a MsgExec
       messages = [

package/src/components/Abstraxion/index.tsx

@@ -1,14 +1,10 @@
 "use client";
 import { useContext, useEffect } from "react";
-import { GrazProvider } from "graz";
-import { StytchProvider } from "@stytch/nextjs";
-import { ApolloProvider } from "@apollo/client";
 import { Dialog, DialogContent } from "@burnt-labs/ui";
 import {
   AbstraxionContext,
   AbstraxionContextProvider,
 } from "../AbstraxionContext";
-import { apolloClient, stytchClient } from "../../lib";
 import { AbstraxionSignin } from "../AbstraxionSignin";
 import { Loading } from "../Loading";
 import { ErrorDisplay } from "../ErrorDisplay";
@@ -46,7 +42,7 @@ export function Abstraxion({
         ) : isConnecting ? (
           <Loading />
         ) : isConnected ? (
-          <Connected />
+          <Connected onClose={onClose} />
         ) : (
           <AbstraxionSignin />
         )}

package/src/components/AbstraxionContext/index.tsx

@@ -10,8 +10,8 @@ export interface AbstraxionContextProps {
   setAbstraxionError: React.Dispatch<React.SetStateAction<string>>;
   abstraxionAccount: DirectSecp256k1HdWallet | undefined;
   setAbstraxionAccount: React.Dispatch<DirectSecp256k1HdWallet | undefined>;
-  grantorAddress: string;
-  setGrantorAddress: React.Dispatch<React.SetStateAction<string>>;
+  granterAddress: string;
+  setgranterAddress: React.Dispatch<React.SetStateAction<string>>;
   contracts?: string[];
   dashboardUrl?: string;
 }
@@ -35,7 +35,7 @@ export const AbstraxionContextProvider = ({
   const [abstraxionAccount, setAbstraxionAccount] = useState<
     DirectSecp256k1HdWallet | undefined
   >(undefined);
-  const [grantorAddress, setGrantorAddress] = useState("");
+  const [granterAddress, setgranterAddress] = useState("");
 
   return (
     <AbstraxionContext.Provider
@@ -48,8 +48,8 @@ export const AbstraxionContextProvider = ({
         setAbstraxionError,
         abstraxionAccount,
         setAbstraxionAccount,
-        grantorAddress,
-        setGrantorAddress,
+        granterAddress,
+        setgranterAddress,
         contracts,
         dashboardUrl,
       }}

package/src/components/AbstraxionSignin/index.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { useContext, useEffect, useRef } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
 import { DirectSecp256k1HdWallet } from "graz/dist/cosmjs";
 import { Button, ModalSection, BrowserIcon } from "@burnt-labs/ui";
 import { wait } from "@/utils/wait";
@@ -47,12 +47,18 @@ export function AbstraxionSignin(): JSX.Element {
     setIsConnecting,
     setIsConnected,
     setAbstraxionAccount,
-    setGrantorAddress,
+    setgranterAddress,
     contracts,
     dashboardUrl,
   } = useContext(AbstraxionContext);
 
   const isMounted = useRef(false);
+  const [tempAccountAddress, setTempAccountAddress] = useState("");
+
+  function configuregranter(address: string) {
+    setgranterAddress(address);
+    localStorage.setItem("xion-authz-granter-account", address);
+  }
 
   function openDashboardTab(userAddress: string, contracts?: string[]): void {
     const urlParams = new URLSearchParams();
@@ -73,16 +79,11 @@ export function AbstraxionSignin(): JSX.Element {
     return keypair;
   }
 
-  async function pollForGrants(
-    keypair: DirectSecp256k1HdWallet,
-  ): Promise<void> {
-    if (!keypair) {
-      throw new Error("No keypair");
+  async function pollForGrants(address: string): Promise<void> {
+    if (!address) {
+      throw new Error("No keypair address");
     }
-    setIsConnecting(true);
 
-    const accounts = await keypair.getAccounts();
-    const address = accounts[0].address;
     const shouldContinue = true;
     while (shouldContinue) {
       try {
@@ -95,41 +96,46 @@ export function AbstraxionSignin(): JSX.Element {
         );
         const data = (await res.json()) as GrantsResponse;
         if (data.grants?.length > 0) {
+          setIsConnecting(true);
           const granterAddresses = data.grants.map((grant) => grant.granter);
           const uniqueGranters = [...new Set(granterAddresses)];
           if (uniqueGranters.length > 1) {
             console.error("More than one granter found. Taking first.");
           }
 
-          setGrantorAddress(uniqueGranters[0]);
+          configuregranter(uniqueGranters[0]);
           break;
         }
       } catch (error) {
-        console.log("There was an error polling for grants: ", error);
+        throw error;
       }
     }
-
-    setIsConnecting(false);
-    setIsConnected(true);
-    setAbstraxionAccount(keypair);
   }
 
   useEffect(() => {
     async function onStartup() {
-      const existingKeypair = localStorage.getItem("xion-authz-temp-account");
-      let keypair;
-      if (existingKeypair) {
-        keypair = await DirectSecp256k1HdWallet.deserialize(
-          existingKeypair,
-          "abstraxion",
-        );
-      } else {
-        keypair = await generateAndStoreTempAccount();
+      try {
+        const existingKeypair = localStorage.getItem("xion-authz-temp-account");
+        let keypair;
+        if (existingKeypair) {
+          keypair = await DirectSecp256k1HdWallet.deserialize(
+            existingKeypair,
+            "abstraxion",
+          );
+        } else {
+          keypair = await generateAndStoreTempAccount();
+        }
+        const accounts = await keypair.getAccounts();
+        const address = accounts[0].address;
+        setTempAccountAddress(address);
+        openDashboardTab(address, contracts);
+        await pollForGrants(address);
+        setIsConnecting(false);
+        setIsConnected(true);
+        setAbstraxionAccount(keypair);
+      } catch (error) {
+        console.log("Something went wrong: ", error);
       }
-      const accounts = await keypair.getAccounts();
-      const address = accounts[0].address;
-      openDashboardTab(address, contracts);
-      pollForGrants(keypair);
     }
 
     if (!isMounted.current) {
@@ -151,7 +157,12 @@ export function AbstraxionSignin(): JSX.Element {
         </h2>
       </div>
       <BrowserIcon />
-      <Button structure="naked">Have a Problem? Try Again</Button>
+      <Button
+        onClick={() => openDashboardTab(tempAccountAddress, contracts)}
+        structure="naked"
+      >
+        Have a Problem? Try Again
+      </Button>
     </ModalSection>
   );
 }

package/src/components/Connected/Connected.tsx

@@ -5,14 +5,17 @@ import {
   AbstraxionContextProps,
 } from "../AbstraxionContext";
 
-export function Connected() {
-  const { setIsConnected } = useContext(
-    AbstraxionContext,
-  ) as AbstraxionContextProps;
+export function Connected({ onClose }: { onClose: VoidFunction }) {
+  const { setIsConnected, setAbstraxionAccount, setgranterAddress } =
+    useContext(AbstraxionContext) as AbstraxionContextProps;
 
   function handleLogout() {
-    localStorage.removeItem("xion-authz-temp-account");
     setIsConnected(false);
+    localStorage.removeItem("xion-authz-temp-account");
+    localStorage.removeItem("xion-authz-granter-account");
+    setAbstraxionAccount(undefined);
+    setgranterAddress("");
+    onClose();
   }
 
   return (

package/src/hooks/useAbstraxionAccount.ts

@@ -1,8 +1,9 @@
-import { useContext } from "react";
+import { useContext, useEffect } from "react";
 import {
   AbstraxionContext,
   AbstraxionContextProps,
 } from "@/src/components/AbstraxionContext";
+import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
 
 export interface AbstraxionAccount {
   bech32Address: string;
@@ -14,13 +15,51 @@ export interface useAbstraxionAccountProps {
 }
 
 export const useAbstraxionAccount = (): useAbstraxionAccountProps => {
-  const { isConnected, grantorAddress } = useContext(
-    AbstraxionContext,
-  ) as AbstraxionContextProps;
+  const {
+    isConnected,
+    granterAddress,
+    abstraxionAccount,
+    isConnecting,
+    setgranterAddress,
+    setAbstraxionAccount,
+    setIsConnected,
+    setIsConnecting,
+  } = useContext(AbstraxionContext) as AbstraxionContextProps;
+
+  useEffect(() => {
+    async function configureAccount() {
+      setIsConnecting(true);
+      const tempKeypair = localStorage.getItem("xion-authz-temp-account");
+      if (tempKeypair) {
+        const deserializedKeypair = await DirectSecp256k1HdWallet.deserialize(
+          tempKeypair,
+          "abstraxion",
+        );
+        setAbstraxionAccount(deserializedKeypair);
+        const granterAccount = localStorage.getItem(
+          "xion-authz-granter-account",
+        );
+        if (granterAccount) {
+          setgranterAddress(granterAccount);
+          setIsConnected(true);
+        }
+      } else {
+        // Wipe granter even if it exists, clean context
+        localStorage.removeItem("xion-authz-granter-account");
+        setAbstraxionAccount(undefined);
+        setgranterAddress("");
+      }
+      setIsConnecting(false);
+    }
+
+    if (!isConnecting && !abstraxionAccount && !granterAddress) {
+      configureAccount();
+    }
+  }, [isConnected, abstraxionAccount, granterAddress]);
 
   return {
     data: {
-      bech32Address: grantorAddress,
+      bech32Address: granterAddress,
     },
     isConnected: isConnected,
   };

package/src/hooks/useAbstraxionSigningClient.ts

@@ -8,7 +8,7 @@ import {
 import { GranteeSignerClient } from "@/src/GranteeSignerClient.ts";
 
 export const useAbstraxionSigningClient = () => {
-  const { isConnected, abstraxionAccount, grantorAddress } = useContext(
+  const { isConnected, abstraxionAccount, granterAddress } = useContext(
     AbstraxionContext,
   ) as AbstraxionContextProps;
 
@@ -22,6 +22,10 @@ export const useAbstraxionSigningClient = () => {
         if (!abstraxionAccount) {
           throw new Error("No account found.");
         }
+
+        if (!granterAddress) {
+          throw new Error("No granter found.");
+        }
         const granteeAddress = await abstraxionAccount
           .getAccounts()
           .then((accounts) => {
@@ -36,7 +40,7 @@ export const useAbstraxionSigningClient = () => {
           abstraxionAccount,
           {
             gasPrice: GasPrice.fromString("0uxion"),
-            grantorAddress,
+            granterAddress,
             granteeAddress,
           },
         );
@@ -44,13 +48,12 @@ export const useAbstraxionSigningClient = () => {
         setAbstractClient(directClient);
       } catch (error) {
         console.log("Something went wrong: ", error);
+        setAbstractClient(undefined);
       }
     }
 
-    if (isConnected && abstraxionAccount) {
-      getSigner();
-    }
-  }, [abstraxionAccount, isConnected]);
+    getSigner();
+  }, [isConnected, abstraxionAccount, granterAddress]);
 
   return { client: abstractClient };
 };

package/src/lib.ts

@@ -1,15 +0,0 @@
-import { ApolloClient, InMemoryCache } from "@apollo/client";
-import { createStytchHeadlessClient } from "@stytch/nextjs/headless";
-import { StytchHeadlessClient } from "@stytch/vanilla-js/dist/index.headless";
-
-// TODO: Temporarily hard-coded
-export const stytchClient: StytchHeadlessClient = createStytchHeadlessClient(
-  "public-token-live-87901ec3-ef19-48ca-b3f4-842be750181b",
-);
-
-// TODO: Refactor to be dynamic. Local dev uri must be device IP.
-export const apolloClient = new ApolloClient({
-  uri: "https://api.subquery.network/sq/burnt-labs/xion-indexer",
-  cache: new InMemoryCache(),
-  assumeImmutableResults: true,
-});