Merge pull request #19 from WhyAsh5114/create-and-fund-in-one-go

Create and fund in one go

Author: WhyAsh5114

blockchain/contracts/TOTPWallet.sol

@@ -75,7 +75,7 @@ contract TOTPWallet is IAccount {
     /// @param verifier The ZK proof verifier contract address
     /// @param anOwner The initial owner of the wallet
     /// @param initialSecretHash Hash of the owner's TOTP secret
-    constructor(IEntryPoint anEntryPoint, TOTPVerifier verifier, address anOwner, uint256 initialSecretHash) {
+    constructor(IEntryPoint anEntryPoint, TOTPVerifier verifier, address anOwner, uint256 initialSecretHash) payable {
         _entryPoint = anEntryPoint;
         _verifier = verifier;
         owner = anOwner;

blockchain/generated.ts

@@ -131,7 +131,7 @@ export const totpWalletAbi = [
       { name: 'anOwner', internalType: 'address', type: 'address' },
       { name: 'initialSecretHash', internalType: 'uint256', type: 'uint256' },
     ],
-    stateMutability: 'nonpayable',
+    stateMutability: 'payable',
   },
   { type: 'error', inputs: [], name: 'DirectExecuteDisabled' },
   { type: 'error', inputs: [], name: 'ECDSAInvalidSignature' },

blockchain/test/TOTPWallet.ts

@@ -47,6 +47,21 @@ describe("TOTPWallet", function () {
       assert.equal(walletOwner.toLowerCase(), owner.account.address.toLowerCase());
     });
 
+    it("Should accept ETH during deployment", async function () {
+      const mockEntryPoint = await viem.deployContract("MockEntryPoint");
+      const fundingAmount = parseEther("1.0");
+      
+      const totpWallet = await viem.deployContract("TOTPWallet", [
+        mockEntryPoint.address,
+        verifier.address,
+        owner.account.address,
+        testSecretHash,
+      ], { value: fundingAmount });
+
+      const balance = await publicClient.getBalance({ address: totpWallet.address });
+      assert.equal(balance, fundingAmount);
+    });
+
     it("Should set the correct EntryPoint", async function () {
       const mockEntryPoint = await viem.deployContract("MockEntryPoint");
       const totpWallet = await viem.deployContract("TOTPWallet", [

frontend/public/manifest.json

@@ -3,7 +3,7 @@
   "short_name": "TOTP Wallet",
   "description": "Zero-knowledge TOTP-based account abstraction wallet",
   "start_url": "/",
-  "display": "fullscreen",
+  "display": "standalone",
   "background_color": "#000000",
   "theme_color": "#000000",
   "orientation": "portrait",

frontend/src/app/(routes)/dashboard/deploy/page.tsx

@@ -98,7 +98,18 @@ export default function DeployPage() {
             </CardHeader>
           </Card>
 
-          <WalletFunding walletAddress={deployedWalletAddress} />
+          <Card>
+            <CardHeader>
+              <CardTitle>Next Steps</CardTitle>
+              <CardDescription>
+                You can add more funds to your wallet or continue to execute
+                transactions
+              </CardDescription>
+            </CardHeader>
+            <CardContent>
+              <WalletFunding walletAddress={deployedWalletAddress} />
+            </CardContent>
+          </Card>
 
           <div className="flex justify-end">
             <Button onClick={() => router.push("/dashboard/execute")}>

frontend/src/components/authenticator-proof-generator.tsx

@@ -406,37 +406,6 @@ export function AuthenticatorProofGenerator({
               </div>
             )}
 
-            {status === "uploaded" && (
-              <div className="space-y-4">
-                <div className="flex items-start gap-3 rounded-lg border border-primary/20 bg-primary/5 p-4">
-                  <CheckCircle2 className="mt-0.5 h-5 w-5 text-primary" />
-                  <div className="flex-1 text-sm">
-                    <p className="font-medium text-foreground">
-                      Proof Uploaded Successfully
-                    </p>
-                    <p className="mt-1 text-muted-foreground">
-                      The transaction device will execute the transaction
-                      automatically.
-                    </p>
-                  </div>
-                </div>
-
-                <Button
-                  onClick={() => {
-                    setTxRequest(null);
-                    setTotpCode("");
-                    setProof(null);
-                    setStatus("idle");
-                    setCurrentQRIndex(0);
-                  }}
-                  variant="outline"
-                  className="w-full"
-                >
-                  Generate Another Proof
-                </Button>
-              </div>
-            )}
-
             {status === "uploaded" && (
               <div className="space-y-4">
                 <div className="flex items-start gap-3 rounded-lg border border-primary/20 bg-primary/5 p-4">

frontend/src/components/wallet-deployment.tsx

@@ -3,7 +3,7 @@
 import { AlertCircle, CheckCircle2, Loader2, Wallet } from "lucide-react";
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
-import { type Address, isAddress } from "viem";
+import { type Address, isAddress, parseEther } from "viem";
 import { useAccount } from "wagmi";
 import { Button } from "@/components/ui/button";
 import {
@@ -36,6 +36,7 @@ export function WalletDeployment({
 
   const [entryPointAddress, setEntryPointAddress] = useState<string>("");
   const [verifierAddress, setVerifierAddress] = useState<string>("");
+  const [initialFunding, setInitialFunding] = useState<string>("");
   const [deployedWallet, setDeployedWallet] = useState<Address | null>(null);
 
   // Load default addresses on mount
@@ -86,11 +87,16 @@ export function WalletDeployment({
         verifierAddress: verifierAddress as Address,
         ownerAddress: userAddress,
         initialSecretHash: secretHash,
+        initialFunding: initialFunding ? parseEther(initialFunding) : undefined,
       });
 
       if (walletAddress) {
         setDeployedWallet(walletAddress);
-        toast.success("Wallet deployed successfully!");
+        toast.success(
+          initialFunding
+            ? "Wallet deployed and funded successfully!"
+            : "Wallet deployed successfully!",
+        );
         onDeployed?.(walletAddress);
       }
     } catch (error) {
@@ -249,6 +255,24 @@ export function WalletDeployment({
             />
           </div>
         )}
+
+        <div className="space-y-2">
+          <Label htmlFor="funding">Initial Funding (ETH) - Optional</Label>
+          <Input
+            id="funding"
+            type="number"
+            step="0.001"
+            min="0"
+            placeholder="0.1"
+            value={initialFunding}
+            onChange={(e) => setInitialFunding(e.target.value)}
+            disabled={isDeploying || !secretHash}
+          />
+          <p className="text-xs text-muted-foreground">
+            Fund your wallet during deployment to skip the separate funding
+            step. Recommended: 0.01 ETH or more for gas fees
+          </p>
+        </div>
       </CardContent>
       <CardFooter>
         <Button
@@ -259,12 +283,14 @@ export function WalletDeployment({
           {isDeploying ? (
             <>
               <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              Deploying Wallet...
+              {initialFunding
+                ? "Deploying & Funding..."
+                : "Deploying Wallet..."}
             </>
           ) : (
             <>
               <Wallet className="mr-2 h-4 w-4" />
-              Deploy Wallet
+              {initialFunding ? "Deploy & Fund Wallet" : "Deploy Wallet"}
             </>
           )}
         </Button>

frontend/src/hooks/use-totp-wallet.ts

@@ -16,6 +16,7 @@ export interface DeployWalletParams {
   verifierAddress: Address;
   ownerAddress: Address;
   initialSecretHash: bigint;
+  initialFunding?: bigint; // Optional initial funding amount in wei
 }
 
 export interface ExecuteTransactionParams {
@@ -103,17 +104,20 @@ export function useTOTPWallet(): UseTOTPWalletResult {
             params.initialSecretHash,
           ],
           gas: BigInt(5000000), // Set a reasonable gas limit for contract deployment
+          value: params.initialFunding, // Send ETH with deployment transaction
         });
 
         // Wait for transaction to be mined
         const receipt = await publicClient.waitForTransactionReceipt({ hash });
 
-        if (receipt.contractAddress) {
-          setWalletAddress(receipt.contractAddress);
-          return receipt.contractAddress;
+        if (!receipt.contractAddress) {
+          throw new Error("Failed to get contract address");
         }
 
-        throw new Error("Failed to get contract address");
+        const deployedAddress = receipt.contractAddress;
+        setWalletAddress(deployedAddress);
+
+        return deployedAddress;
       } catch (err) {
         const error = err instanceof Error ? err : new Error(String(err));
         setError(error);

frontend/src/lib/contract-addresses.ts

@@ -9,7 +9,7 @@ export const CONTRACT_ADDRESSES = {
   // Sepolia Testnet
   sepolia: {
     entryPoint: "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
-    verifier: "0xd3961aeac5f456a7efa3751a072a9ae5748c754b",
+    verifier: "0xed0a886d6fe34805048541de4b9ac70ce259f113",
   },
   // Hardhat Local
   hardhat: {