-
+
{/* */}
About
@@ -26,19 +26,19 @@ const Home: NextPage = () => {
-
+
-
- PLAY
+
+ Play
{" "}
-
+
- {/* */}
- LEADERBOARD
- {/* {" "} */}
+
+ LP Token Faucet
+ {" "}
diff --git a/packages/nextjs/components/Header.tsx b/packages/nextjs/components/Header.tsx
index 9731897..3ba730a 100644
--- a/packages/nextjs/components/Header.tsx
+++ b/packages/nextjs/components/Header.tsx
@@ -5,7 +5,7 @@ import Image from "next/image";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { WalletButton } from "./moon/walletButton";
-import { Bars3Icon, BugAntIcon } from "@heroicons/react/24/outline";
+import { BanknotesIcon, Bars3Icon, HomeIcon, PuzzlePieceIcon } from "@heroicons/react/24/outline";
import { FaucetButton, RainbowKitCustomConnectButton } from "~~/components/scaffold-eth";
import { useOutsideClick } from "~~/hooks/scaffold-eth";
@@ -19,15 +19,17 @@ export const menuLinks: HeaderMenuLink[] = [
{
label: "Home",
href: "/",
+ icon:
,
},
{
label: "Tournaments",
href: "/tournaments",
+ icon:
,
},
{
- label: "Debug Contracts",
- href: "/debug",
- icon:
,
+ label: "Faucet",
+ href: "/faucet",
+ icon:
,
},
];
diff --git a/packages/nextjs/components/leaderboard/item.tsx b/packages/nextjs/components/leaderboard/item.tsx
index 2b83244..db0aad9 100644
--- a/packages/nextjs/components/leaderboard/item.tsx
+++ b/packages/nextjs/components/leaderboard/item.tsx
@@ -1,4 +1,5 @@
// import { formatUnits } from "viem";
+import { useMoonWalletContext } from "../ScaffoldEthAppWithProviders";
import { useContractRead } from "wagmi";
import { useAccount } from "wagmi";
import { SparklesIcon, UserIcon } from "@heroicons/react/24/outline";
@@ -8,6 +9,8 @@ import DeployedContracts from "~~/contracts/deployedContracts";
export const Item = ({ tournament, player, score }: { tournament: string; player: string; score: number }) => {
const connectedAddress: string = useAccount()?.address ?? "";
+ const { moonWallet } = useMoonWalletContext();
+ const account = connectedAddress || moonWallet;
const chainId = 80001;
const { data: playerRank, isLoading } = useContractRead({
@@ -38,7 +41,7 @@ export const Item = ({ tournament, player, score }: { tournament: string; player
{playerRank[0].toString()}
- {player === connectedAddress ? (
+ {player === account ? (
You
diff --git a/packages/nextjs/components/moon/sign.tsx b/packages/nextjs/components/moon/sign.tsx
index 517a035..df951d3 100644
--- a/packages/nextjs/components/moon/sign.tsx
+++ b/packages/nextjs/components/moon/sign.tsx
@@ -1,9 +1,10 @@
import { useState } from "react";
import { useMoonWalletContext } from "../../components/ScaffoldEthAppWithProviders";
import { useMoonSDK } from "../../hooks/moon";
+import { Spinner } from "../Spinner";
//import { useCall } from "~~/hooks/call";
import { CreateAccountInput } from "@moonup/moon-api";
-import { formatEther } from "viem";
+import { formatEther, getAddress } from "viem";
//import { erc20ABI } from "wagmi";
import { ClipboardIcon } from "@heroicons/react/24/outline";
import { InputBase, InputPwd } from "~~/components/scaffold-eth";
@@ -15,14 +16,17 @@ export const Sign = () => {
const [answer, setAnswer] = useState("");
const { moonWallet, setMoonWallet } = useMoonWalletContext();
const [balance, setBalance] = useState(0n);
+ const [action, setAction] = useState("");
const handleSignup = async (event: React.MouseEvent
) => {
event.preventDefault();
setAnswer("");
+ setAction("signup");
try {
// Check if Moon SDK is properly initialized and user is authenticated
if (!moon) {
console.error("User not authenticated");
+ setAction("");
return;
}
@@ -47,15 +51,18 @@ export const Sign = () => {
console.error(error);
if (error) setAnswer(error.error.message);
}
+ setAction("");
};
const handleLogin = async (event: React.MouseEvent) => {
event.preventDefault();
setAnswer("");
+ setAction("login");
try {
// Check if Moon SDK is properly initialized and user is authenticated
if (!moon) {
console.error("User not authenticated");
+ setAction("");
return;
}
@@ -77,7 +84,7 @@ export const Sign = () => {
console.log(message2);
if (message2) {
addr = message2;
- setMoonWallet(addr.data.keys[0]);
+ setMoonWallet(getAddress(addr.data.keys[0]));
}
const message4 = await moon.getAccountsSDK().getBalance(addr.data.keys[0], { chainId: "80001" });
@@ -90,6 +97,7 @@ export const Sign = () => {
console.error(error);
setAnswer(error.error.message);
}
+ setAction("");
};
const handleDisconnect = async () => {
@@ -135,11 +143,11 @@ export const Sign = () => {
-
{answer}
diff --git a/packages/nextjs/hooks/call.ts b/packages/nextjs/hooks/call.ts
deleted file mode 100644
index 2d486d1..0000000
--- a/packages/nextjs/hooks/call.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Transaction } from "@moonup/moon-api";
-import { MoonSDK } from "@moonup/moon-sdk";
-import { encodeFunctionData } from "viem";
-
-interface CallProps {
- moon: MoonSDK | null;
- moonWallet: string;
- contract: string;
- abi: any;
- functionName: string;
- args: any;
-}
-
-export async function useCall(props: CallProps): Promise {
- if (!props.moon) {
- console.error("User not authenticated");
- return;
- }
-
- // Define a type guard function to check if an object conforms to the Transaction interface
- function isTransaction(obj: any): obj is Transaction {
- return (
- obj && typeof obj.userop_transaction === "string" && Array.isArray(obj.transactions)
- // Add more checks for other properties if necessary
- );
- }
-
- const encodedData = encodeFunctionData({
- abi: props.abi,
- functionName: props.functionName,
- args: props.args,
- });
-
- const data = {
- to: props.contract,
- data: encodedData,
- chain_id: "80001",
- encoding: "utf-8",
- };
-
- const rawTx = await props.moon.getAccountsSDK().signTransaction(props.moonWallet, data);
-
- console.log(rawTx);
- if (isTransaction(rawTx.data.data)) {
- const res: Transaction = rawTx.data.data;
- if (res.transactions) {
- const raw = res.transactions[0].raw_transaction || "";
- const tx = await props.moon.getAccountsSDK().broadcastTx(props.moonWallet, {
- chainId: "80001",
- rawTransaction: raw,
- });
- console.log(tx);
- }
- }
-}
diff --git a/packages/nextjs/hooks/moon.ts b/packages/nextjs/hooks/moon.ts
index 5262a5a..a66714d 100644
--- a/packages/nextjs/hooks/moon.ts
+++ b/packages/nextjs/hooks/moon.ts
@@ -16,7 +16,14 @@ interface MoonSDKHook {
signMessage: (msg: string) => Promise;
updateToken: (token: string) => Promise;
updateRefreshToken: (token: string) => Promise;
- contractCall: (moonWallet: string, contract: string, abi: any[], functionName: string, args: any[]) => Promise;
+ contractCall: (
+ moonWallet: string,
+ contract: string,
+ abi: any[],
+ functionName: string,
+ args: any[],
+ value?: number,
+ ) => Promise;
// signTransaction: (transaction: TransactionResponse) => Promise;
// Add other methods as needed
}
@@ -77,7 +84,14 @@ export function useMoonSDK(): MoonSDKHook {
}
};
- const contractCall = async (moonWallet: string, contract: string, abi: any[], functionName: string, args: any[]) => {
+ const contractCall = async (
+ moonWallet: string,
+ contract: string,
+ abi: any[],
+ functionName: string,
+ args: any[],
+ value?: number,
+ ) => {
if (!moon) {
console.error("User not authenticated");
return;
@@ -95,6 +109,7 @@ export function useMoonSDK(): MoonSDKHook {
chain_id: "80001",
encoding: "utf-8",
gas: "1000000",
+ value: value ? value.toString() : "0",
};
const rawTx = await moon.getAccountsSDK().signTransaction(moonWallet, data);