more cleanup of the moved code

Author: ertemann

packages/abstraxion/package.json

@@ -43,7 +43,9 @@
   "dependencies": {
     "@burnt-labs/abstraxion-core": "workspace:*",
     "@burnt-labs/constants": "workspace:*",
+    "@burnt-labs/signers": "workspace:*",
     "@burnt-labs/ui": "workspace:*",
+    "@burnt-labs/wallet-connectors": "workspace:*",
     "@cosmjs/amino": "^0.36.0",
     "@cosmjs/cosmwasm-stargate": "^0.36.0",
     "@cosmjs/crypto": "^0.36.0",
@@ -53,6 +55,7 @@
     "@cosmjs/tendermint-rpc": "^0.36.0",
     "@cosmjs/utils": "^0.36.0",
     "@types/react-dom": "^18.2.18",
+    "buffer": "^6.0.3",
     "cosmjs-types": "^0.9.0",
     "jose": "^5.1.3"
   }

packages/abstraxion/src/components/Abstraxion/index.tsx

@@ -10,6 +10,7 @@ import {
 import { ErrorDisplay } from "../ErrorDisplay";
 import { AbstraxionSignin } from "../AbstraxionSignin";
 import { Connected } from "@/src/components/Connected/Connected.tsx";
+import { WalletSelect } from "../WalletSelect";
 import { AbstraxionAuth } from "@burnt-labs/abstraxion-core";
 import {
   BrowserRedirectStrategy,
@@ -32,6 +33,7 @@ export function Abstraxion({ onClose }: ModalProps): JSX.Element | null {
     isConnected,
     showModal,
     setShowModal,
+    walletAuthMode,
   } = useContext(AbstraxionContext);
 
   const closeOnEscKey = useCallback(
@@ -53,21 +55,68 @@ export function Abstraxion({ onClose }: ModalProps): JSX.Element | null {
 
   if (!showModal) return null;
 
+  // Determine what to show based on auth mode and connection state
+  const renderContent = () => {
+    if (abstraxionError) {
+      return <ErrorDisplay />;
+    }
+
+    if (abstraxionAccount || isConnected) {
+      return <Connected onClose={onClose} />;
+    }
+
+    // Not connected - show signin flow
+    if (walletAuthMode === 'redirect') {
+      // Existing OAuth flow via dashboard
+      return <AbstraxionSignin />;
+    } else {
+      // Direct mode - show wallet selection
+      return <WalletSelect />;
+    }
+  };
+
   return (
     <Dialog onOpenChange={onClose} open={showModal}>
       <DialogContent>
-        {abstraxionError ? (
-          <ErrorDisplay />
-        ) : abstraxionAccount || isConnected ? (
-          <Connected onClose={onClose} />
-        ) : !abstraxionAccount ? (
-          <AbstraxionSignin />
-        ) : null}
+        {renderContent()}
       </DialogContent>
     </Dialog>
   );
 }
 
+/**
+ * Custom signer interface for Turnkey, Privy, etc.
+ */
+export interface CustomSigner {
+  type: 'Secp256K1' | 'EthWallet';
+  sign: (message: string) => Promise<string>;
+  getPubkey?: () => Promise<string>;  // For Secp256K1
+  getAddress?: () => Promise<string>; // For EthWallet
+}
+
+/**
+ * Wallet authentication configuration
+ */
+export interface WalletAuthConfig {
+  /** Authentication mode: redirect (default), direct (in-app), or local (no AA API) */
+  mode?: 'redirect' | 'direct' | 'local';
+
+  /** Custom AA API URL (for direct mode) */
+  aaApiUrl?: string;
+
+  /** Custom signer (Turnkey, Privy, etc.) */
+  customSigner?: CustomSigner;
+
+  /** Local mode configuration (for building transactions without AA API) */
+  localConfig?: {
+    codeId: number;
+    checksum: string;
+    feeGranter: string;
+    workerAddress?: string;
+    addressPrefix?: string;
+  };
+}
+
 export interface AbstraxionConfig {
   contracts?: ContractGrantDescription[];
   rpcUrl?: string;
@@ -76,6 +125,9 @@ export interface AbstraxionConfig {
   callbackUrl?: string;
   treasury?: string;
   gasPrice?: string;
+
+  /** NEW: Wallet authentication configuration */
+  walletAuth?: WalletAuthConfig;
 }
 
 export function AbstraxionProvider({
@@ -94,6 +146,7 @@ export function AbstraxionProvider({
       callbackUrl={config.callbackUrl}
       treasury={config.treasury}
       gasPrice={config.gasPrice}
+      walletAuth={config.walletAuth}
     >
       {children}
     </AbstraxionContextProvider>

packages/abstraxion/src/components/AbstraxionContext/index.tsx

@@ -4,6 +4,8 @@ import { testnetChainInfo, xionGasValues } from "@burnt-labs/constants";
 import { GasPrice } from "@cosmjs/stargate";
 import { SignArbSecp256k1HdWallet } from "@burnt-labs/abstraxion-core";
 import { abstraxionAuth } from "../Abstraxion";
+import { useWalletAuth, type WalletAuthState } from "../../hooks/useWalletAuth";
+import type { WalletAuthConfig } from "../Abstraxion";
 
 export type SpendLimit = { denom: string; amount: string };
 
@@ -41,6 +43,10 @@ export interface AbstraxionContextProps {
   gasPrice: GasPrice;
   logout: () => void;
   login: () => Promise<void>;
+
+  // NEW: Wallet authentication state
+  walletAuthMode: 'redirect' | 'direct' | 'local';
+  walletAuthState: WalletAuthState | null;
 }
 
 export const AbstraxionContext = createContext<AbstraxionContextProps>(
@@ -57,6 +63,7 @@ export function AbstraxionContextProvider({
   treasury,
   indexerUrl,
   gasPrice,
+  walletAuth,
 }: {
   children: ReactNode;
   contracts?: ContractGrantDescription[];
@@ -68,6 +75,7 @@ export function AbstraxionContextProvider({
   treasury?: string;
   indexerUrl?: string;
   gasPrice?: string;
+  walletAuth?: WalletAuthConfig;
 }): JSX.Element {
   // Initialize all loading states as false for consistent hydration, then detect OAuth in useEffect
   const [isConnected, setIsConnected] = useState(false);
@@ -91,6 +99,24 @@ export function AbstraxionContextProvider({
     gasPriceDefault = GasPrice.fromString("0.001uxion");
   }
 
+  // Determine wallet auth mode
+  const walletAuthMode = walletAuth?.mode || 'redirect';
+
+  // Initialize wallet auth hook only for direct/local modes
+  const walletAuthState = useWalletAuth({
+    config: walletAuth || {},
+    onSuccess: (smartAccountAddress, walletInfo) => {
+      // Direct mode connection successful
+      setGranterAddress(smartAccountAddress);
+      setIsConnected(true);
+      setShowModal(false);
+    },
+    onError: (error) => {
+      setAbstraxionError(error);
+      setIsConnecting(false);
+    },
+  });
+
   const configureInstance = useCallback(() => {
     abstraxionAuth.configureAbstraxionInstance(
       rpcUrl,
@@ -205,10 +231,25 @@ export function AbstraxionContextProvider({
 
     try {
       await abstraxionAuth.login();
+    try {
+      setIsConnecting(true);
+
+      // Check wallet auth mode
+      if (walletAuthMode === 'redirect') {
+        // Existing OAuth flow via dashboard redirect
+        await abstraxionAuth.login();
+      } else {
+        // Direct or local mode - show modal with wallet selection
+        setShowModal(true);
+        setIsConnecting(false); // Reset since wallet selection is async
+      }
     } catch (error) {
       throw error; // Re-throw to allow handling by the caller
     } finally {
       // Keep isLoggingIn true until auth state change sets isConnecting (only for manual login)
+      if (walletAuthMode === 'redirect') {
+        setIsConnecting(false);
+      }
     }
   }
 
@@ -237,8 +278,14 @@ export function AbstraxionContextProvider({
     setIsInitializing(false);
     setIsConnecting(false);
     setIsReturningFromAuth(false);
+
+    // Clear wallet auth state if in direct mode
+    if (walletAuthMode !== 'redirect') {
+      walletAuthState.disconnect();
+    }
+
     abstraxionAuth?.logout();
-  }, [abstraxionAuth]);
+  }, [abstraxionAuth, walletAuthMode, walletAuthState]);
 
   return (
     <AbstraxionContext.Provider
@@ -269,6 +316,8 @@ export function AbstraxionContextProvider({
         login,
         logout,
         gasPrice: gasPrice ? GasPrice.fromString(gasPrice) : gasPriceDefault,
+        walletAuthMode,
+        walletAuthState,
       }}
     >
       {children}

packages/abstraxion/utils/queries.ts

@@ -1,5 +1,4 @@
-import { Authenticator } from "../indexer-strategies/types";
-import { SmartAccountWithCodeId } from "../indexer-strategies/types";
+import { Authenticator, SmartAccountWithCodeId } from "../types/authenticator";
 
 /**
  * Checks if an authenticator already exists in the list

packages/account-management/src/authenticators/utils.ts

@@ -1,5 +1,5 @@
-import { SelectedSmartAccount } from "../indexer-strategies/types";
-import { ContractGrantDescription } from "../components/AbstraxionGrant/generateContractGrant";
+import { SelectedSmartAccount } from "../types/authenticator";
+import { ContractGrantDescription } from "../types/grants";
 
 /**
  * Checks if any of the contract grant configurations are the current smart account (granter)

packages/account-management/src/grants/authz.ts

@@ -5,7 +5,7 @@ import {
   AllowanceResponse,
   ContractsAllowance,
   MultiAnyAllowance,
-} from "../types/allowance-types";
+} from "../types/grants";
 
 function isAllowedMsgAllowance(
   allowance: Allowance,