@dag-kit/kit 1.0.2 → 1.0.4-alpha.3

package/src/clients/actions/test.ts

@@ -1,210 +1,210 @@
-import "dotenv/config";
-import { toSimpleSmartAccount } from "permissionless/accounts";
-import {
-  createPublicClient,
-  createWalletClient,
-  http,
-  parseEther,
-  encodeFunctionData,
-  defineChain,
-} from "viem";
-import { privateKeyToAccount } from "viem/accounts";
-import { createPimlicoClient } from "permissionless/clients/pimlico";
-import { entryPoint06Address } from "viem/account-abstraction";
-import { createSmartAccountClient } from "permissionless";
-import { abi } from "./contract";
-
-// Configuration
-const adminKey =
-  "0x5810098e367422376897bb2645c5ada5850a99aeec0505a58d38853ebd7f9f31";
-const FACTORY_ADDRESS = "0x8FaB6DF00085eb05D5F2C1FA46a6E539587ae3f3"; // Your factory
-const TARGET_ADDRESS = "0x7fd5385efcB7B2898933288948a9496CDc0fA8ee"; // Your desired address
-
-// BlockDAG Awakening Testnet
-const awakening = defineChain({
-  id: 1043,
-  name: "Awakening Testnet",
-  nativeCurrency: { decimals: 18, name: "Dag", symbol: "DAG" },
-  rpcUrls: { default: { http: ["https://relay.awakening.bdagscan.com"] } },
-  blockExplorers: {
-    default: { name: "Explorer", url: "https://awakening.bdagscan.com/" },
-  },
-});
-
-const localBundler = "http://0.0.0.0:3000/";
-
-console.log("\n🔍 Using Your Existing Address");
-console.log("=================================\n");
-
-const publicClient = createPublicClient({
-  chain: awakening,
-  transport: http(awakening.rpcUrls.default.http[0]),
-});
-
-const walletClient = createWalletClient({
-  account: privateKeyToAccount(adminKey),
-  chain: awakening,
-  transport: http(awakening.rpcUrls.default.http[0]),
-});
-
-console.log(`Target Address: ${TARGET_ADDRESS}`);
-console.log(`Owner: ${privateKeyToAccount(adminKey).address}`);
-console.log(`Factory: ${FACTORY_ADDRESS}\n`);
-
-// Step 1: Create account using the specific address
-// Since the account is already deployed, we just need to reference it
-const account = await toSimpleSmartAccount({
-  client: publicClient,
-  owner: privateKeyToAccount(adminKey),
-  factoryAddress: FACTORY_ADDRESS,
-  entryPoint: {
-    address: entryPoint06Address,
-    version: "0.6",
-  },
-  address: TARGET_ADDRESS, // Use the existing address directly
-});
-
-console.log("=== Smart Account Information ===");
-console.log(`Address: ${account.address}`);
-console.log(
-  `Explorer: https://awakening.bdagscan.com/address/${account.address}`
-);
-console.log("✅ Using your existing account\n");
-
-// Check if deployed
-const code = await publicClient.getCode({
-  address: account.address,
-});
-
-const isDeployed = code && code !== "0x";
-console.log(
-  `Deployment Status: ${isDeployed ? "✅ Deployed" : "⚠️ Not deployed"}`
-);
-
-// Check balance
-const balance = await publicClient.getBalance({
-  address: account.address,
-});
-
-const balanceInDAG = Number(balance) / 1e18;
-console.log(`Balance: ${balanceInDAG} DAG`);
-
-if (!isDeployed) {
-  console.log("\n⚠️ Account not deployed yet.");
-  console.log("The account should already be deployed based on the explorer.");
-  console.log("If you need to deploy it, do so manually first.\n");
-}
-
-// Step 3: Test bundler connection
-console.log("=== Testing Bundler ===");
-try {
-  const dagClient = createPimlicoClient({
-    transport: http(localBundler),
-    entryPoint: {
-      address: entryPoint06Address,
-      version: "0.6",
-    },
-  });
-
-  const gasPrice = await dagClient.getUserOperationGasPrice();
-  console.log("✅ Bundler responding");
-  console.log(`Gas Price: ${gasPrice.fast.maxFeePerGas} wei\n`);
-} catch (error: any) {
-  console.error("❌ Bundler not responding:", error.message);
-  console.log("\n💡 Start Alto bundler:");
-  console.log(`./alto \\
-  --entrypoints "${entryPoint06Address}" \\
-  --executor-private-keys "${adminKey}" \\
-  --utility-private-key "${adminKey}" \\
-  --rpc-url "https://relay.awakening.bdagscan.com" \\
-  --port 3000 \\
-  --safe-mode false \\
-  --dangerous-skip-user-operation-validation true`);
-  process.exit(1);
-}
-
-// Step 4: Send test UserOperation
-console.log("=== Sending Test UserOperation ===");
-
-const smartAccountClient = createSmartAccountClient({
-  bundlerTransport: http(localBundler),
-  chain: awakening,
-  account,
-});
-
-const cd = encodeFunctionData({
-  abi,
-  functionName: "decrement",
-  args: [],
-});
-
-try {
-  // Simple test: send 0 value to self
-  const txHash = await smartAccountClient.sendTransaction({
-    to: "0x692e69cA1Fe89eF72ca94B0E3a32A92835501a08",
-    value: 0n,
-    data: cd,
-    maxFeePerGas: 50000000000n, // 50 gwei
-    maxPriorityFeePerGas: 50000000000n, // 50 gwei
-    callGasLimit: 150000n,
-    verificationGasLimit: 500000n,
-    preVerificationGas: 100000n,
-  });
-
-  console.log(`\n✅ Success!`);
-  console.log(`UserOperation Hash: ${txHash}`);
-  console.log(`Explorer: https://awakening.bdagscan.com/tx/${txHash}`);
-
-  console.log("\n⏳ Waiting for confirmation...");
-  await new Promise((resolve) => setTimeout(resolve, 5000));
-
-  const newBalance = await publicClient.getBalance({
-    address: account.address,
-  });
-  const newBalanceInDAG = Number(newBalance) / 1e18;
-  console.log(`\nFinal Balance: ${newBalanceInDAG} DAG`);
-  console.log(`Gas Cost: ${balanceInDAG - newBalanceInDAG} DAG`);
-
-  console.log("\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
-  console.log("🎉 Success! Your account is ready for reuse.");
-  console.log(`   Address: ${TARGET_ADDRESS}`);
-  console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n");
-
-  const result = await publicClient.readContract({
-    address: "0x692e69cA1Fe89eF72ca94B0E3a32A92835501a08",
-    abi: abi,
-    functionName: "getNum",
-  });
-
-  console.log("Result is given as", result);
-} catch (error: any) {
-  console.error("\n❌ Transaction failed:");
-  console.error(error.message);
-
-  if (error.message?.includes("Missing or invalid parameters")) {
-    console.log("\n⚠️ This is the known Awakening RPC issue.");
-    console.log("The RPC cannot properly handle eth_call for UserOperations.");
-    console.log(
-      "\nYour setup is correct - the issue is with Awakening's RPC implementation."
-    );
-  }
-
-  if (error.details) {
-    console.log("\nDetails:", error.details);
-  }
-}
-
-// Instructions for reuse
-console.log("\n💾 To reuse this address in future scripts:");
-console.log(`
-const account = await toSimpleSmartAccount({
-  client: publicClient,
-  owner: privateKeyToAccount(adminKey),
-  factoryAddress: "${FACTORY_ADDRESS}",
-  entryPoint: {
-    address: entryPoint06Address,
-    version: "0.6",
-  },
-  address: "${TARGET_ADDRESS}", // Your existing account
-});
-`);
+// import "dotenv/config";
+// import { toSimpleSmartAccount } from "permissionless/accounts";
+// import {
+//   createPublicClient,
+//   createWalletClient,
+//   http,
+//   parseEther,
+//   encodeFunctionData,
+//   defineChain,
+// } from "viem";
+// import { privateKeyToAccount } from "viem/accounts";
+// import { createPimlicoClient } from "permissionless/clients/pimlico";
+// import { entryPoint06Address } from "viem/account-abstraction";
+// import { createSmartAccountClient } from "permissionless";
+// import { abi } from "./contract";
+
+// // Configuration
+// const adminKey =
+//   "0x5810098e367422376897bb2645c5ada5850a99aeec0505a58d38853ebd7f9f31";
+// const FACTORY_ADDRESS = "0x8FaB6DF00085eb05D5F2C1FA46a6E539587ae3f3"; // Your factory
+// const TARGET_ADDRESS = "0x7fd5385efcB7B2898933288948a9496CDc0fA8ee"; // Your desired address
+
+// // BlockDAG Awakening Testnet
+// const awakening = defineChain({
+//   id: 1043,
+//   name: "Awakening Testnet",
+//   nativeCurrency: { decimals: 18, name: "Dag", symbol: "DAG" },
+//   rpcUrls: { default: { http: ["https://relay.awakening.bdagscan.com"] } },
+//   blockExplorers: {
+//     default: { name: "Explorer", url: "https://awakening.bdagscan.com/" },
+//   },
+// });
+
+// const localBundler = "http://0.0.0.0:3000/";
+
+// console.log("\n🔍 Using Your Existing Address");
+// console.log("=================================\n");
+
+// const publicClient = createPublicClient({
+//   chain: awakening,
+//   transport: http(awakening.rpcUrls.default.http[0]),
+// });
+
+// const walletClient = createWalletClient({
+//   account: privateKeyToAccount(adminKey),
+//   chain: awakening,
+//   transport: http(awakening.rpcUrls.default.http[0]),
+// });
+
+// console.log(`Target Address: ${TARGET_ADDRESS}`);
+// console.log(`Owner: ${privateKeyToAccount(adminKey).address}`);
+// console.log(`Factory: ${FACTORY_ADDRESS}\n`);
+
+// // Step 1: Create account using the specific address
+// // Since the account is already deployed, we just need to reference it
+// const account = await toSimpleSmartAccount({
+//   client: publicClient,
+//   owner: privateKeyToAccount(adminKey),
+//   factoryAddress: FACTORY_ADDRESS,
+//   entryPoint: {
+//     address: entryPoint06Address,
+//     version: "0.6",
+//   },
+//   address: TARGET_ADDRESS, // Use the existing address directly
+// });
+
+// console.log("=== Smart Account Information ===");
+// console.log(`Address: ${account.address}`);
+// console.log(
+//   `Explorer: https://awakening.bdagscan.com/address/${account.address}`
+// );
+// console.log("✅ Using your existing account\n");
+
+// // Check if deployed
+// const code = await publicClient.getCode({
+//   address: account.address,
+// });
+
+// const isDeployed = code && code !== "0x";
+// console.log(
+//   `Deployment Status: ${isDeployed ? "✅ Deployed" : "⚠️ Not deployed"}`
+// );
+
+// // Check balance
+// const balance = await publicClient.getBalance({
+//   address: account.address,
+// });
+
+// const balanceInDAG = Number(balance) / 1e18;
+// console.log(`Balance: ${balanceInDAG} DAG`);
+
+// if (!isDeployed) {
+//   console.log("\n⚠️ Account not deployed yet.");
+//   console.log("The account should already be deployed based on the explorer.");
+//   console.log("If you need to deploy it, do so manually first.\n");
+// }
+
+// // Step 3: Test bundler connection
+// console.log("=== Testing Bundler ===");
+// try {
+//   const dagClient = createPimlicoClient({
+//     transport: http(localBundler),
+//     entryPoint: {
+//       address: entryPoint06Address,
+//       version: "0.6",
+//     },
+//   });
+
+//   const gasPrice = await dagClient.getUserOperationGasPrice();
+//   console.log("✅ Bundler responding");
+//   console.log(`Gas Price: ${gasPrice.fast.maxFeePerGas} wei\n`);
+// } catch (error: any) {
+//   console.error("❌ Bundler not responding:", error.message);
+//   console.log("\n💡 Start Alto bundler:");
+//   console.log(`./alto \\
+//   --entrypoints "${entryPoint06Address}" \\
+//   --executor-private-keys "${adminKey}" \\
+//   --utility-private-key "${adminKey}" \\
+//   --rpc-url "https://relay.awakening.bdagscan.com" \\
+//   --port 3000 \\
+//   --safe-mode false \\
+//   --dangerous-skip-user-operation-validation true`);
+//   process.exit(1);
+// }
+
+// // Step 4: Send test UserOperation
+// console.log("=== Sending Test UserOperation ===");
+
+// const smartAccountClient = createSmartAccountClient({
+//   bundlerTransport: http(localBundler),
+//   chain: awakening,
+//   account,
+// });
+
+// const cd = encodeFunctionData({
+//   abi,
+//   functionName: "decrement",
+//   args: [],
+// });
+
+// try {
+//   // Simple test: send 0 value to self
+//   const txHash = await smartAccountClient.sendTransaction({
+//     to: "0x692e69cA1Fe89eF72ca94B0E3a32A92835501a08",
+//     value: 0n,
+//     data: cd,
+//     maxFeePerGas: 50000000000n, // 50 gwei
+//     maxPriorityFeePerGas: 50000000000n, // 50 gwei
+//     callGasLimit: 150000n,
+//     verificationGasLimit: 500000n,
+//     preVerificationGas: 100000n,
+//   });
+
+//   console.log(`\n✅ Success!`);
+//   console.log(`UserOperation Hash: ${txHash}`);
+//   console.log(`Explorer: https://awakening.bdagscan.com/tx/${txHash}`);
+
+//   console.log("\n⏳ Waiting for confirmation...");
+//   await new Promise((resolve) => setTimeout(resolve, 5000));
+
+//   const newBalance = await publicClient.getBalance({
+//     address: account.address,
+//   });
+//   const newBalanceInDAG = Number(newBalance) / 1e18;
+//   console.log(`\nFinal Balance: ${newBalanceInDAG} DAG`);
+//   console.log(`Gas Cost: ${balanceInDAG - newBalanceInDAG} DAG`);
+
+//   console.log("\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+//   console.log("🎉 Success! Your account is ready for reuse.");
+//   console.log(`   Address: ${TARGET_ADDRESS}`);
+//   console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n");
+
+//   const result = await publicClient.readContract({
+//     address: "0x692e69cA1Fe89eF72ca94B0E3a32A92835501a08",
+//     abi: abi,
+//     functionName: "getNum",
+//   });
+
+//   console.log("Result is given as", result);
+// } catch (error: any) {
+//   console.error("\n❌ Transaction failed:");
+//   console.error(error.message);
+
+//   if (error.message?.includes("Missing or invalid parameters")) {
+//     console.log("\n⚠️ This is the known Awakening RPC issue.");
+//     console.log("The RPC cannot properly handle eth_call for UserOperations.");
+//     console.log(
+//       "\nYour setup is correct - the issue is with Awakening's RPC implementation."
+//     );
+//   }
+
+//   if (error.details) {
+//     console.log("\nDetails:", error.details);
+//   }
+// }
+
+// // Instructions for reuse
+// console.log("\n💾 To reuse this address in future scripts:");
+// console.log(`
+// const account = await toSimpleSmartAccount({
+//   client: publicClient,
+//   owner: privateKeyToAccount(adminKey),
+//   factoryAddress: "${FACTORY_ADDRESS}",
+//   entryPoint: {
+//     address: entryPoint06Address,
+//     version: "0.6",
+//   },
+//   address: "${TARGET_ADDRESS}", // Your existing account
+// });
+// `);

package/src/clients/types.ts

@@ -10,6 +10,7 @@ import {
   encodeFunctionData,
   parseEther,
 } from "viem";
+import { ISigner } from "../signers/types.js";
 
 export interface DagAAConfig {
   chain: Chain;
@@ -21,7 +22,7 @@ export interface DagAAConfig {
 }
 
 export interface SmartAccountConfig {
-  owner: `0x${string}`;
+  signer: ISigner;
   accountAddress?: Address;
 }
 

package/src/exports/index.ts

@@ -1,10 +1,13 @@
-export { createDagAAClient, parseDAG } from "../clients/actions/main";
+export { createDagAAClient, parseDAG } from "../clients/actions/main.js";
+export { awakening, arbitrumSep } from "../clients/chains.js";
+export { DagAAClient } from "../clients/actions/main.js";
 
-export {
+export type {
   DagAAConfig,
   SmartAccountConfig,
   SendUserOperationParams,
   UserOperationReceipt,
-} from "../clients/types";
+} from "./public-types.js";
 
-export { awakening, arbitrumSep } from "../clients/chains";
+export { PrivySigner } from "../signers/PrivySigner.js";
+export { PrivateKeySigner } from "../signers/PrivateKeySigner.js";

package/src/exports/public-types.ts

@@ -0,0 +1,6 @@
+export type {
+  DagAAConfig,
+  SmartAccountConfig,
+  SendUserOperationParams,
+  UserOperationReceipt,
+} from "../clients/types.js";

package/src/index.ts

@@ -0,0 +1,17 @@
+export { createDagAAClient, parseDAG } from "./clients/actions/main.js";
+export { awakening, arbitrumSep } from "./clients/chains.js";
+export { DagAAClient } from "./clients/actions/main.js";
+
+export type {
+  DagAAConfig,
+  SmartAccountConfig,
+  SendUserOperationParams,
+  UserOperationReceipt,
+} from "./exports/public-types.js";
+
+export { PrivySigner } from "./signers/PrivySigner.js";
+export { PrivateKeySigner } from "./signers/PrivateKeySigner.js";
+
+// Re-export commonly used viem types for convenience
+export type { Address, Hash, Chain } from "viem";
+export type { ISigner } from "./signers/types.js";

package/src/signers/PrivateKeySigner.ts

@@ -0,0 +1,41 @@
+// src/signers/PrivateKeySigner.ts
+import {
+  createWalletClient,
+  http,
+  type Chain,
+  type Account,
+  type WalletClient,
+  LocalAccount,
+} from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+import { ISigner } from "./types.js";
+
+export class PrivateKeySigner implements ISigner {
+  private account: LocalAccount;
+  private walletClient;
+
+  constructor(privateKey: `0x${string}`, chain: Chain, rpcUrl: string) {
+    this.account = privateKeyToAccount(privateKey);
+    this.walletClient = createWalletClient({
+      account: this.account,
+      chain,
+      transport: http(rpcUrl),
+    });
+  }
+
+  getAccount(): LocalAccount {
+    return this.account;
+  }
+
+  getWalletClient(): WalletClient {
+    return this.walletClient;
+  }
+
+  getAddress(): `0x${string}` {
+    return this.account.address;
+  }
+
+  isReady(): boolean {
+    return true;
+  }
+}

package/src/signers/PrivySigner.ts

@@ -0,0 +1,93 @@
+// src/signers/PrivySigner.ts
+import {
+  type Account,
+  type WalletClient,
+  createWalletClient,
+  custom,
+  type Chain,
+  LocalAccount,
+} from "viem";
+import { ISigner } from "./types.js";
+
+/**
+ * Privy Signer - Works with Privy's embedded wallets
+ *
+ * Usage in React:
+ * ```tsx
+ * import { useWallets } from '@privy-io/react-auth';
+ *
+ * const { wallets } = useWallets();
+ * const embeddedWallet = wallets.find(w => w.walletClientType === 'privy');
+ *
+ * const signer = new PrivySigner(embeddedWallet, chain);
+ * ```
+ */
+export class PrivySigner implements ISigner {
+  private privyWallet: any; // Privy wallet object
+  private chain: Chain;
+  private cachedAddress?: `0x${string}`;
+  private cachedWalletClient;
+
+  constructor(privyWallet: any, chain: Chain) {
+    if (!privyWallet) {
+      throw new Error("Privy wallet is required");
+    }
+    this.privyWallet = privyWallet;
+    this.chain = chain;
+  }
+
+  async getAccount(): Promise<LocalAccount> {
+    const provider = await this.privyWallet.getEthereumProvider();
+
+    if (!provider) {
+      throw new Error("No Ethereum provider found in Privy wallet");
+    }
+
+    // Create a custom account from the provider
+    return {
+      address: this.privyWallet.address as `0x${string}`,
+      type: "json-rpc",
+      // @ts-ignore - Privy provider compatible with viem
+      source: "privateKey",
+    } as unknown as LocalAccount;
+  }
+
+  async getWalletClient(): Promise<WalletClient> {
+    if (this.cachedWalletClient) {
+      return this.cachedWalletClient;
+    }
+
+    const provider = await this.privyWallet.getEthereumProvider();
+
+    if (!provider) {
+      throw new Error("No Ethereum provider found in Privy wallet");
+    }
+
+    // Create wallet client with Privy's provider
+    this.cachedWalletClient = createWalletClient({
+      account: await this.getAccount(),
+      chain: this.chain,
+      transport: custom(provider),
+    });
+
+    return this.cachedWalletClient;
+  }
+
+  async getAddress(): Promise<`0x${string}`> {
+    if (this.cachedAddress) {
+      return this.cachedAddress;
+    }
+
+    this.cachedAddress = this.privyWallet.address as `0x${string}`;
+    return this.cachedAddress;
+  }
+
+  async isReady(): Promise<boolean> {
+    try {
+      const provider = await this.privyWallet.getEthereumProvider();
+      return !!provider && !!this.privyWallet.address;
+    } catch {
+      return false;
+    }
+  }
+}

package/src/signers/types.ts

@@ -0,0 +1,45 @@
+// src/signers/types.ts
+import { Account, LocalAccount, WalletClient } from "viem";
+
+/**
+ * Common interface for all signers
+ * This allows users to plug in different signing methods
+ */
+export interface ISigner {
+  /**
+   * Get the viem Account object for signing
+   */
+  getAccount(): LocalAccount | Promise<LocalAccount>;
+
+  /**
+   * Get the wallet client for transactions
+   */
+  getWalletClient(): WalletClient | Promise<WalletClient>;
+
+  /**
+   * Get the signer's address
+   */
+  getAddress(): `0x${string}` | Promise<`0x${string}`>;
+
+  /**
+   * Check if signer is ready/connected
+   */
+  isReady(): boolean | Promise<boolean>;
+}
+
+/**
+ * Configuration for different signer types
+ */
+export type SignerConfig =
+  | {
+      type: "privateKey";
+      privateKey: `0x${string}`;
+    }
+  | {
+      type: "privy";
+      // Privy handles its own state, no config needed
+    }
+  | {
+      type: "custom";
+      signer: ISigner;
+    };