Merge branch 'main' of https://github.com/pauldev20/wld-miniapp

packages/foundry/scripts-js/generateTsAbis.js

@@ -153,7 +153,7 @@ function main() {
   writeFileSync(
     `../nextjs-app/src/contracts/deployedContracts.ts`,
 	format(
-	  `${generatedContractComment} \n\nconst deployedContracts = {${fileContent}} as const;\n`,
+	  `${generatedContractComment} \n\nconst deployedContracts = {${fileContent}};\nexport default deployedContracts;\n`,
 	  {
 		parser: "typescript",
 	  }

packages/nextjs-app/.eslintrcrrr.json → packages/nextjs-app/.eslintrc.json

@@ -26,7 +26,7 @@
         }
     },
     "rules": {
-        "no-console": "warn",
+        // "no-console": "warn",
         "react/prop-types": "off",
         "react/jsx-uses-react": "off",
         "react/react-in-jsx-scope": "off",

packages/nextjs-app/src/app/layout.tsx

@@ -1,7 +1,7 @@
 import { Inter } from "next/font/google";
 import { NextProviders } from "../providers/nextUiProvider";
 import { appConfig } from "@/appConfig";
-import { ErudaProvider } from "@/components/eruda";
+import { ErudaProvider } from "@/providers/eruda";
 import { MiniKitProvider } from "@/providers/miniKitProvider";
 import "@/styles/globals.css";
 import clsx from "clsx";

packages/nextjs-app/src/app/page.tsx

@@ -2,11 +2,18 @@
 
 import { useState } from "react";
 import { useRouter } from "next/navigation";
+import deployedContracts from "@/contracts/deployedContracts";
 import { Button } from "@nextui-org/button";
-import { MiniKit, ResponseEvent } from "@worldcoin/minikit-js";
-import { createPublicClient, http, getContract } from "viem";
+import {
+    MiniAppSendTransactionPayload,
+    MiniAppVerifyActionPayload,
+    MiniKit,
+    ResponseEvent,
+    VerificationLevel,
+} from "@worldcoin/minikit-js";
+// import { useWaitForTransactionReceipt } from "@worldcoin/minikit-js/hooks";
+import { createPublicClient, decodeAbiParameters, getContract, hexToBigInt, http, stringToHex } from "viem";
 import { worldchain } from "viem/chains";
-import deployedContracts from "../../../nextjs/contracts/deployedContracts";
 
 const subscribeToWalletAuth = async (nonce: string) => {
     return new Promise((resolve, reject) => {
@@ -40,21 +47,51 @@ const subscribeToWalletAuth = async (nonce: string) => {
     });
 };
 
+const subscribeToTransaction = async (): Promise<string> => {
+    return new Promise((resolve, reject) => {
+        MiniKit.subscribe(ResponseEvent.MiniAppSendTransaction, async (payload: MiniAppSendTransactionPayload) => {
+            if (payload.status === "error") {
+                console.error("Error sending transaction", payload);
+
+                reject(new Error("Error sending transaction: " + payload.details));
+            } else {
+                resolve(payload.transaction_id);
+            }
+        });
+    });
+};
+
+const subscribeToVerifyAction = async (): Promise<MiniAppVerifyActionPayload> => {
+    return new Promise((resolve, reject) => {
+        MiniKit.subscribe(ResponseEvent.MiniAppVerifyAction, async (response: MiniAppVerifyActionPayload) => {
+            if (response.status === "error") {
+                console.log("Error payload", response);
+
+                return reject(new Error("Error in MiniAppVerifyAction payload"));
+            }
+            resolve(response);
+        });
+    });
+};
+
 export default function LoginPage() {
     const [loading, setLoading] = useState(false);
     const router = useRouter();
+
     const onLoginSignup = async () => {
         setLoading(true);
 
-		const client = createPublicClient({
-			chain: worldchain,
-			transport: http("https://worldchain-mainnet.g.alchemy.com/public"),
-		});
-		// const contract = getContract({
-		// 	address: deployedContracts[worldchain].HumanOracle.address,
-		// })
+        const client = createPublicClient({
+            chain: worldchain,
+            transport: http("https://worldchain-mainnet.g.alchemy.com/public"),
+        });
+        const HumanOrcale = getContract({
+            address: deployedContracts[worldchain.id].MockHumanOracle.address,
+            abi: deployedContracts[worldchain.id].MockHumanOracle.abi,
+            client,
+        });
 
-		// get wallet auth
+        // get wallet auth
         try {
             const res = await fetch(`/api/nonce`);
             const { nonce } = await res.json();
@@ -65,23 +102,66 @@ export default function LoginPage() {
                 notBefore: new Date(new Date().getTime() - 24 * 60 * 60 * 1000),
                 statement: "Login or create an account",
             });
+
             console.log(generateMessageResult);
             const result = await subscribeToWalletAuth(nonce);
+
+            console.log(result);
         } catch (error) {
             console.error(error);
             setLoading(false);
-			return;
+
+            return;
         }
 
-		// // check if registered?
-		// try {
-
-		// }
+        // check if registered and register if not
+        try {
+            const result = await HumanOrcale.read.isUserRegistered(MiniKit.walletAddress);
+
+            console.log(result);
+            if (result == false) {
+                const verify = MiniKit.commands.verify({
+                    action: "registration",
+                    signal: MiniKit.walletAddress!,
+                    verification_level: VerificationLevel.Orb,
+                });
+                const verifyResult = await subscribeToVerifyAction();
 
-		// // if not registered, register
-		// try {
+                console.log(verify);
+                const transactionPayload = MiniKit.commands.sendTransaction({
+                    transaction: [
+                        {
+                            address: deployedContracts[worldchain.id].MockHumanOracle.address,
+                            abi: deployedContracts[worldchain.id].MockHumanOracle.abi,
+                            functionName: "signUpWithWorldId",
+                            args: [
+                                hexToBigInt(stringToHex(verifyResult.merkle_root, { size: 32 })),
+                                hexToBigInt(stringToHex(verifyResult.nullifier_hash, { size: 32 })),
+                                decodeAbiParameters([{ type: "uint256[8]" }], verifyResult.proof)[0],
+                            ],
+                        },
+                    ],
+                });
+
+                console.log(transactionPayload);
+                const transactionId = await subscribeToTransaction();
 
-		// }
+                console.log(transactionId);
+                // useWaitForTransactionReceipt({
+                // 	client: client,
+                // 	appConfig: {
+                // 		app_id: process.env.NEXT_PUBLIC_APP_ID,
+                // 	},
+                // 	transactionId: transactionId,
+                // })
+            } else {
+                router.replace("/statements");
+            }
+        } catch (error) {
+            console.error(error);
+            setLoading(false);
+            return;
+        }
     };
 
     return (

packages/nextjs-app/todo.txt

@@ -0,0 +1,2 @@
+- login screen logo in middle with name, signin button at bottom?
+- add toasts for errors (from top?)