Update ch-base (#105)

Co-authored-by: Nadai <[email protected]>

.github/workflows/lint.yml → .github/workflows/main.yml

@@ -3,12 +3,14 @@ name: Next.js CI
 on:
   push:
     paths:
+      - "packages/snfoundry/contracts/**"
       - "packages/nextjs/**"
   pull_request:
     branches:
       - main
     paths:
       - "packages/nextjs/**"
+      - "packages/snfoundry/contracts/**"
 
 jobs:
   ci:
@@ -23,6 +25,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
+      - name: Install scarb
+        run: curl --proto '=https' --tlsv1.2 -sSf https://docs.swmansion.com/scarb/install.sh | sh -s -- -v 2.6.5
+
+      - name: Install snfoundryup
+        run: curl -L https://raw.githubusercontent.com/foundry-rs/starknet-foundry/master/scripts/install.sh | sh
+
+      - name: Install snforge
+        run: snfoundryup -v 0.27.0
+
+      - name: Run snforge tests
+        run: snforge test
+        working-directory: ./packages/snfoundry/contracts
+
       - name: Setup node env
         uses: actions/setup-node@v3
         with:
@@ -34,6 +49,9 @@ jobs:
         run: yarn install --immutable
         working-directory: ./packages/nextjs
 
+      - name: Check Code Format
+        run: yarn format:check
+
       - name: Run Next.js lint
         run: yarn next:lint --max-warnings=0
         working-directory: ./packages/nextjs
@@ -44,4 +62,4 @@ jobs:
 
       - name: Build Next.js project
         run: yarn build
-        working-directory: ./packages/nextjs
+        working-directory: ./packages/nextjs

README.md

@@ -56,7 +56,7 @@ cd <challenge_folder_name>
 yarn start
 ```
 
-📱 Open http://localhost:3000 to see the app.
+📱 Open <http://localhost:3000> to see the app.
 
 > 👩‍💻 Rerun `yarn deploy --reset` whenever you want to deploy new contracts to the frontend, update your current contracts with changes, or re-deploy it to get a fresh contract address.
 
@@ -70,4 +70,4 @@ _To finish your README, can add these links_
 
 > 🏃 Head to your next challenge [here](https://speedrunstark.com/).
 
-> 💬 Problems, questions, comments on the stack? Post them to the [🏗 Scaffold-Stark developers chat](https://t.me/+wO3PtlRAreo4MDI9)
+> 💬 Problems, questions, comments on the stack? Post them to the [🏗 Scaffold-Stark developers chat](https://t.me/+wO3PtlRAreo4MDI9)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ss-2",
-  "version": "0.2.6",
+  "version": "0.2.10",
   "author": "Q3 Labs",
   "license": "MIT",
   "private": true,

packages/nextjs/app/debug/_components/contract/ReadOnlyFunctionForm.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useRef, useEffect } from "react";
+import { useState, useRef, useEffect, useCallback } from "react";
 import { Abi } from "abi-wan-kanabi";
 import { Address } from "@starknet-react/chains";
 import {
@@ -38,7 +38,7 @@ export const ReadOnlyFunctionForm = ({
     functionName: abiFunction.name,
     abi: [...abi],
     args: inputValue ? inputValue.flat(Infinity) : [],
-    enabled: false,
+    enabled: Boolean(inputValue),
     parseArgs: false,
     blockIdentifier: "pending" as BlockNumber,
   });
@@ -59,14 +59,14 @@ export const ReadOnlyFunctionForm = ({
     );
   });
 
-  const handleRead = () => {
+  const handleRead = useCallback(() => {
     const newInputValue = getParsedContractFunctionArgs(form, false);
     if (JSON.stringify(form) !== JSON.stringify(lastForm.current)) {
       setInputValue(newInputValue);
       lastForm.current = form;
     }
     refetch();
-  };
+  }, [form, refetch]);
 
   return (
     <div className="flex flex-col gap-3 py-5 first:pt-0 last:pb-1">

packages/nextjs/app/debug/page.tsx

@@ -12,16 +12,6 @@ const Debug: NextPage = () => {
   return (
     <>
       <DebugContracts />
-      {/* <div className="text-center mt-8 bg-secondary p-10">
-        <h1 className="text-4xl my-0">Debug Contracts</h1>
-        <p className="text-neutral">
-          You can debug & interact with your deployed contracts here.
-          <br /> Check{" "}
-          <code className="italic bg-base-300 text-base font-bold [word-spacing:-0.5rem] px-1">
-            packages / nextjs / app / debug / page.tsx
-          </code>{" "}
-        </p>
-      </div> */}
     </>
   );
 };

packages/nextjs/app/page.tsx

@@ -5,6 +5,7 @@ import { useAccount } from "@starknet-react/core";
 
 const Home: NextPage = () => {
   const connectedAddress = useAccount();
+
   return (
     <>
       <div className="flex items-center flex-col flex-grow pt-10">

packages/nextjs/components/Footer.tsx

@@ -66,32 +66,7 @@ export const Footer = () => {
                 Fork me
               </a>
             </div>
-            <span>·</span>
-            {/* <div className="flex justify-center items-center gap-2">
-              <p className="m-0 text-center">
-                Built with <HeartIcon className="inline-block h-4 w-4" /> by
-              </p>
-              <a
-                className="flex justify-center items-center gap-1"
-                href="https://quantum3labs.com/"
-                target="_blank"
-                rel="noreferrer"
-              >
-                <BuidlGuidlLogo className="w-3 h-5 pb-1" />
-                <span className="link">Q3 Labs</span>
-              </a>
-              <p className="m-0 text-center">at</p>
-              <a
-                className="flex justify-center items-center gap-1"
-                href="https://buidlguidl.com/"
-                target="_blank"
-                rel="noreferrer"
-              >
-                <BuidlGuidlLogo className="w-3 h-5 pb-1" />
-                <span className="link">BuidlGuidl</span>
-              </a>
-            </div>
-            <span>·</span> */}
+
             <div className="text-center">
               <a
                 href="https://t.me/+wO3PtlRAreo4MDI9"

packages/nextjs/components/Header.tsx

@@ -129,7 +129,7 @@ export const Header = () => {
               alt="SE2 logo"
               className="cursor-pointer"
               fill
-              src="/challenge-icon-starknet.svg"
+              src="/logo.svg"
             />
           </div>
           <div className="flex flex-col">

packages/nextjs/components/SwitchTheme.tsx

@@ -28,13 +28,6 @@ export const SwitchTheme = ({ className }: { className?: string }) => {
     <div
       className={`flex space-x-2 h-5 items-center justify-center text-sm border-l border-neutral px-4 ${className}`}
     >
-      {/* <input
-        id="theme-toggle"
-        type="checkbox"
-        className="toggle toggle-primary bg-primary hover:bg-primary border-primary"
-        onChange={handleToggle}
-        checked={isDarkMode}
-      /> */}
       {
         <label
           htmlFor="theme-toggle"

packages/nextjs/components/scaffold-stark/CustomConnectButton/AddressInfoDropdown.tsx

@@ -23,7 +23,6 @@ import { useDisconnect, useNetwork, useConnect } from "@starknet-react/core";
 import { getStarknetPFPIfExists } from "~~/utils/profile";
 import useConditionalStarkProfile from "~~/hooks/useConditionalStarkProfile";
 import { useTheme } from "next-themes";
-import { useEffect } from "react";
 
 const allowedNetworks = getTargetNetworks();
 

packages/nextjs/components/scaffold-stark/CustomConnectButton/index.tsx

@@ -22,7 +22,7 @@ export const CustomConnectButton = () => {
   const { theme } = useTheme();
   const networkColor = useNetworkColor();
   const { targetNetwork } = useTargetNetwork();
-  const { address, status, chainId, ...props } = useAccount();
+  const { address, status, chainId } = useAccount();
   const { chain } = useNetwork();
   const [modalOpen, setModalOpen] = useState(false);
 

packages/nextjs/hooks/scaffold-stark/useScaffoldReadContract.ts

@@ -28,15 +28,11 @@ export const useScaffoldReadContract = <
     address: deployedContract?.address,
     abi: deployedContract?.abi,
     watch: true,
-    args,
-    enabled: !Array.isArray(args) || !args.some((arg) => arg === undefined),
+    args: args ?? [],
+    enabled: true,
     blockIdentifier: "pending" as BlockNumber,
     ...(readConfig as any),
-  }) as Omit<ReturnType<typeof useContractRead>, "data" | "refetch"> & {
+  }) as Omit<ReturnType<typeof useContractRead>, "data"> & {
     data: AbiFunctionOutputs<ContractAbi, TFunctionName> | undefined;
-    // refetch: (options?: {
-    //   throwOnError: boolean;
-    //   cancelRefetch: boolean;
-    // }) => Promise<AbiFunctionOutputs<ContractAbi, TFunctionName>>;
   };
 };