From 354aa1354db16adf17e4bb0dff1be8a6e0d80ba8 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Mon, 13 Oct 2025 23:14:20 +0700
Subject: [PATCH 01/12] fix: use mainnet fork

---
 packages/nextjs/services/web3/connectors.tsx | 4 ++--
 packages/nextjs/supportedChains.ts           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nextjs/services/web3/connectors.tsx b/packages/nextjs/services/web3/connectors.tsx
index 7dc7205..251d77b 100644
--- a/packages/nextjs/services/web3/connectors.tsx
+++ b/packages/nextjs/services/web3/connectors.tsx
@@ -4,7 +4,6 @@ import { BurnerConnector } from "@scaffold-stark/stark-burner";
 import scaffoldConfig from "~~/scaffold.config";
 import { LAST_CONNECTED_TIME_LOCALSTORAGE_KEY } from "~~/utils/Constants";
 import { KeplrConnector } from "./keplr";
-import { supportedChains } from "~~/supportedChains";
 
 const targetNetworks = getTargetNetworks();
 
@@ -34,7 +33,8 @@ function getConnectors() {
     connectors.push(new KeplrConnector());
   } else {
     const burnerConnector = new BurnerConnector();
-    burnerConnector.chain = supportedChains.devnet;
+    // burnerConnector's should be initialized with dynamic network instead of hardcoded devnet to support mainnetFork
+    burnerConnector.chain = targetNetworks[0];
     connectors.push(burnerConnector as unknown as InjectedConnector);
   }
 
diff --git a/packages/nextjs/supportedChains.ts b/packages/nextjs/supportedChains.ts
index 6d10bed..fe9148a 100644
--- a/packages/nextjs/supportedChains.ts
+++ b/packages/nextjs/supportedChains.ts
@@ -4,7 +4,7 @@ const rpcUrlDevnet =
   process.env.NEXT_PUBLIC_DEVNET_PROVIDER_URL || "http://127.0.0.1:5050";
 // devnet with mainnet network ID
 const mainnetFork = {
-  id: BigInt("0x534e5f4d41494e"),
+  id: chains.mainnet.id,
   network: "devnet",
   name: "Starknet Devnet",
   nativeCurrency: {
@@ -24,8 +24,8 @@ const mainnetFork = {
     },
   },
   paymasterRpcUrls: {
-    default: {
-      http: [],
+    avnu: {
+      http: [rpcUrlDevnet],
     },
   },
 } as chains.Chain;

From d50b25eb00bae1ed5145f41cf6c303a43158c533 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Mon, 13 Oct 2025 23:15:15 +0700
Subject: [PATCH 02/12] feat: integrate Vesu deposit and withdraw

---
 packages/nextjs/app/page.tsx                  | 416 ++++------
 .../contracts/configExternalContracts.ts      |  18 +
 packages/nextjs/utils/vesu/constants.ts       |   9 +
 packages/nextjs/utils/vesu/vTokenAbi.ts       | 780 ++++++++++++++++++
 packages/snfoundry/contracts/Scarb.toml       |   2 +-
 5 files changed, 963 insertions(+), 262 deletions(-)
 create mode 100644 packages/nextjs/utils/vesu/constants.ts
 create mode 100644 packages/nextjs/utils/vesu/vTokenAbi.ts

diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx
index 45eceb4..2084487 100644
--- a/packages/nextjs/app/page.tsx
+++ b/packages/nextjs/app/page.tsx
@@ -3,118 +3,76 @@
 import { ConnectedAddress } from "~~/components/ConnectedAddress";
 import { useState } from "react";
 import { useScaffoldReadContract } from "~~/hooks/scaffold-stark/useScaffoldReadContract";
-import { useScaffoldEventHistory } from "~~/hooks/scaffold-stark/useScaffoldEventHistory";
 import { useScaffoldMultiWriteContract } from "~~/hooks/scaffold-stark/useScaffoldMultiWriteContract";
-import { useBlockNumber } from "@starknet-react/core";
-import { useDeployedContractInfo } from "~~/hooks/scaffold-stark/useDeployedContractInfo";
+import { useScaffoldEventHistory } from "~~/hooks/scaffold-stark/useScaffoldEventHistory";
 import { useScaffoldWriteContract } from "~~/hooks/scaffold-stark/useScaffoldWriteContract";
 import { useTargetNetwork } from "~~/hooks/scaffold-stark/useTargetNetwork";
-import { CairoOption, CairoOptionVariant, BlockTag } from "starknet";
+import { useAccount } from "@starknet-react/core";
+import useScaffoldStrkBalance from "~~/hooks/scaffold-stark/useScaffoldStrkBalance";
+import { VSTRK_ADDRESS } from "~~/utils/vesu/constants";
 
 const Home = () => {
-  const [selectedToken, setSelectedToken] = useState<"ETH" | "STRK">("STRK");
-  const [inputAmount, setInputAmount] = useState<bigint>(0n);
-  const [greeting, setGreeting] = useState<string>("");
   const [displayAmount, setDisplayAmount] = useState<string>("");
-  const [isNoneOption, setIsNoneOption] = useState<boolean>(true);
+  const [amountWei, setAmountWei] = useState<bigint>(0n);
 
   const { targetNetwork } = useTargetNetwork();
 
-  const { data: YourContract } = useDeployedContractInfo("YourContract");
-  const { data: EthContract } = useDeployedContractInfo("Eth");
-  const { data: StrkContract } = useDeployedContractInfo("Strk");
+  const { address: connectedAddress } = useAccount();
 
-  const { data: currentGreeting } = useScaffoldReadContract({
-    contractName: "YourContract",
-    functionName: "greeting",
-  });
+  const toHex = (v: unknown) =>
+    typeof v === "bigint" ? `0x${v.toString(16)}` : (v as string);
 
-  const { data: premium } = useScaffoldReadContract({
-    contractName: "YourContract",
-    functionName: "premium",
+  // Deposited amount = user's vSTRK balance (shares)
+  const { data: vStrkBalance } = useScaffoldReadContract({
+    contractName: "vStrk",
+    functionName: "balance_of",
+    args: [connectedAddress],
   });
 
-  const { data: ethBalance } = useScaffoldReadContract({
-    contractName: "YourContract",
-    functionName: "token_deposits",
-    args: [EthContract?.address],
+  // Available STRK balance of user
+  const { value: availableStrk } = useScaffoldStrkBalance({
+    address: connectedAddress || undefined,
   });
 
-  const { data: strkBalance } = useScaffoldReadContract({
-    contractName: "YourContract",
-    functionName: "token_deposits",
-    args: [StrkContract?.address],
-  });
+  // Redeem (withdraw) all vSTRK shares to STRK
+  const { sendAsync: redeemAll, isPending: isRedeeming } =
+    useScaffoldWriteContract({
+      contractName: "vStrk",
+      functionName: "redeem",
+      args: [vStrkBalance as any, connectedAddress, connectedAddress],
+    });
 
-  const { data: lastBlock } = useBlockNumber({
-    blockIdentifier: "pending" as BlockTag,
-  });
+  // STRK-only deposit flow: approve STRK to vSTRK, then deposit assets
+  const { sendAsync: depositStrk, isPending: isDepositing } =
+    useScaffoldMultiWriteContract({
+      calls: [
+        {
+          contractName: "Strk",
+          functionName: "approve",
+          args: [VSTRK_ADDRESS, amountWei],
+        },
+        {
+          contractName: "vStrk",
+          functionName: "deposit",
+          args: [amountWei, connectedAddress],
+        },
+      ],
+    });
 
-  const { data: events } = useScaffoldEventHistory({
-    contractName: "YourContract",
-    eventName: "GreetingChanged",
-    fromBlock: 1028886n, // NOTE : For now keep this block number as it is. When running local mainnet fork, use this block number as the starting block number. For example: `yarn chain --fork-network https://starknet-mainnet.public.blastapi.io/rpc/v0_7 --fork-block 1028886`
+  // Event history for vSTRK Deposit and Withdraw
+  const { data: depositEvents } = useScaffoldEventHistory({
+    contractName: "vStrk",
+    eventName: "Deposit",
+    fromBlock: 1540452n, // NOTE : For now keep this block number as it is. When running local mainnet fork, use this block number as the starting block number. For example: `yarn chain --fork-network https://starknet-mainnet.public.blastapi.io/rpc/v0_9 --fork-block 1540452`
     watch: true,
   });
-
-  const noneOptionBigInt: CairoOption<bigint> = new CairoOption(
-    CairoOptionVariant.None,
-  );
-
-  const noneOptionString: CairoOption<string> = new CairoOption(
-    CairoOptionVariant.None,
-  );
-
-  const { sendAsync: setGreetingNoPayment } = useScaffoldWriteContract({
-    contractName: "YourContract",
-    functionName: "set_greeting",
-    args: [greeting, noneOptionBigInt, noneOptionString],
-  });
-
-  const { sendAsync: withdrawAll } = useScaffoldWriteContract({
-    contractName: "YourContract",
-    functionName: "withdraw",
-  });
-
-  const someOptionBigInt: CairoOption<bigint> = new CairoOption(
-    CairoOptionVariant.Some,
-    inputAmount,
-  );
-
-  // Helper function to determine the token address option
-  const getTokenAddressOption = () => {
-    if (selectedToken === "ETH" && EthContract?.address) {
-      return new CairoOption(CairoOptionVariant.Some, EthContract.address);
-    } else if (selectedToken === "STRK" && StrkContract?.address) {
-      return new CairoOption(CairoOptionVariant.Some, StrkContract.address);
-    } else {
-      return noneOptionString;
-    }
-  };
-
-  const { sendAsync: setGreetingWithPayment } = useScaffoldMultiWriteContract({
-    calls: [
-      {
-        contractName: selectedToken === "STRK" ? "Strk" : "Eth",
-        functionName: "approve",
-        args: [YourContract?.address, someOptionBigInt.unwrap()],
-      },
-      {
-        contractName: "YourContract",
-        functionName: "set_greeting",
-        args: [greeting, someOptionBigInt, getTokenAddressOption()],
-      },
-    ],
+  const { data: withdrawEvents } = useScaffoldEventHistory({
+    contractName: "vStrk",
+    eventName: "Withdraw",
+    fromBlock: 1540452n,
+    watch: true,
   });
 
-  const handleSetGreeting = async () => {
-    if (isNoneOption) {
-      await setGreetingNoPayment();
-    } else {
-      await setGreetingWithPayment();
-    }
-  };
-
   return (
     <div className="flex items-center flex-col flex-grow pt-10">
       <div className="px-5 w-full max-w-6xl">
@@ -130,31 +88,7 @@ const Home = () => {
         </h1>
         <ConnectedAddress />
         <div className="mt-8 space-y-6">
-          <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
-            <h2 className="text-2xl font-bold mb-6 text-secondary">
-              Contract Status
-            </h2>
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-              <div className="p-4 bg-base-200 rounded-xl">
-                <h3 className="text-lg font-semibold mb-2">Current Greeting</h3>
-                <p className="text-xl font-medium break-all">
-                  {currentGreeting?.toString() ?? "No greeting set"}
-                </p>
-              </div>
-
-              <div className="p-4 bg-base-200 rounded-xl">
-                <h3 className="text-lg font-semibold mb-2">Premium Status</h3>
-                <div className="flex items-center space-x-2">
-                  <div
-                    className={`w-3 h-3 rounded-full ${premium ? "bg-green-500" : "bg-gray-400"}`}
-                  ></div>
-                  <span className="text-xl font-medium">
-                    {premium ? "Active" : "Inactive"}
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
+          {/* Contract Status removed for Vesu demo */}
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
             <div className="flex justify-between items-center mb-6">
               <h2 className="text-2xl font-bold text-secondary">
@@ -162,26 +96,35 @@ const Home = () => {
               </h2>
               <button
                 className="btn btn-primary btn-lg"
-                onClick={() => withdrawAll()}
+                onClick={() => redeemAll()}
+                disabled={
+                  !connectedAddress ||
+                  !vStrkBalance ||
+                  (vStrkBalance as any) === 0n ||
+                  isRedeeming
+                }
               >
-                Withdraw All Funds
+                {isRedeeming ? (
+                  <span className="loading loading-spinner loading-sm"></span>
+                ) : (
+                  "Redeem All"
+                )}
               </button>
             </div>
             <div className="p-4 bg-base-200 rounded-xl">
               <div className="text-lg mb-4">
-                This action will withdraw all deposited tokens back to the
-                contract owner.
+                Redeem all your vSTRK shares back to STRK.
               </div>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div className="p-4 bg-base-300 rounded-lg">
                   <span className="block text-sm opacity-70">
-                    Available ETH
+                    Deposited vSTRK (shares)
                   </span>
                   <span className="text-xl font-medium">
-                    {ethBalance
-                      ? (Number(ethBalance) / 10 ** 18).toFixed(6)
+                    {vStrkBalance
+                      ? (Number(vStrkBalance) / 10 ** 18).toFixed(6)
                       : "0.000000"}{" "}
-                    ETH
+                    vSTRK
                   </span>
                 </div>
                 <div className="p-4 bg-base-300 rounded-lg">
@@ -189,8 +132,8 @@ const Home = () => {
                     Available STRK
                   </span>
                   <span className="text-xl font-medium">
-                    {strkBalance
-                      ? (Number(strkBalance) / 10 ** 18).toFixed(6)
+                    {availableStrk
+                      ? (Number(availableStrk) / 10 ** 18).toFixed(6)
                       : "0.000000"}{" "}
                     STRK
                   </span>
@@ -199,164 +142,115 @@ const Home = () => {
             </div>
           </div>
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
-            <h2 className="text-2xl font-bold mb-6 text-secondary">
-              Set Greeting & Deposit
-            </h2>
+            <h2 className="text-2xl font-bold mb-6 text-secondary">Deposit</h2>
             <div className="space-y-6">
-              <div className="space-y-2">
-                <label className="text-lg font-medium">Select Token</label>
-                <div className="flex gap-4">
-                  <button
-                    className={`btn btn-lg flex-1 ${selectedToken === "ETH" ? "btn-primary" : "btn-outline"}`}
-                    onClick={() => setSelectedToken("ETH")}
-                  >
-                    ETH
-                  </button>
-                  <button
-                    className={`btn btn-lg flex-1 ${selectedToken === "STRK" ? "btn-primary" : "btn-outline"}`}
-                    onClick={() => setSelectedToken("STRK")}
-                  >
-                    STRK
-                  </button>
-                </div>
-              </div>
-
               <div className="form-control">
                 <label className="label">
                   <span className="label-text text-lg font-medium">
-                    Amount ({selectedToken})
+                    Amount (STRK)
                   </span>
                 </label>
                 <div className="bg-base-200 p-4 rounded-xl border-2 border-secondary">
                   <div className="flex flex-col space-y-4">
-                    {/* Some Option */}
-                    <label
-                      className="flex items-center gap-3 cursor-pointer"
-                      htmlFor="option-some"
-                    >
-                      <input
-                        id="option-some"
-                        className="radio radio-xs radio-secondary"
-                        type="radio"
-                        name="option-type"
-                        checked={!isNoneOption}
-                        onChange={() => setIsNoneOption(false)}
-                        aria-label="Select some amount option"
-                      />
-                      <div className="flex flex-col gap-1.5 w-full">
-                        <div className="flex items-center ml-2">
-                          <span className="text-xs font-medium mr-2 leading-none">
-                            Some amount
-                          </span>
-                        </div>
-                        <div className="flex bg-base-300 text-accent rounded-lg">
-                          <input
-                            type="number"
-                            className="input input-ghost focus:outline-none h-[2.2rem] min-h-[2.2rem] px-4 w-full text-xs placeholder:text-[#9596BF] text-neutral rounded-lg"
-                            value={displayAmount || ""}
-                            onChange={(e) => {
-                              const value = e.target.value;
-                              setDisplayAmount(value);
-                              if (value && value !== "") {
-                                try {
-                                  const amountInWei = BigInt(
-                                    Math.floor(Number(value) * 10 ** 18),
-                                  );
-                                  setInputAmount(amountInWei);
-                                } catch (error) {
-                                  console.error("Invalid number input:", error);
-                                }
-                              } else {
-                                setInputAmount(0n);
-                              }
-                              setIsNoneOption(false);
-                            }}
-                            placeholder="Enter amount"
-                            disabled={isNoneOption}
-                            autoComplete="off"
-                          />
-                        </div>
-                      </div>
-                    </label>
-
-                    {/* None Option */}
-                    <label
-                      className="flex items-center gap-3 cursor-pointer"
-                      htmlFor="option-none"
-                    >
+                    <div className="flex bg-base-300 text-accent rounded-lg">
                       <input
-                        id="option-none"
-                        className="radio radio-xs radio-secondary"
-                        type="radio"
-                        name="option-type"
-                        checked={isNoneOption}
-                        onChange={() => setIsNoneOption(true)}
-                        aria-label="Select no amount option"
+                        type="number"
+                        className="input input-ghost focus:outline-none h-[2.2rem] min-h-[2.2rem] px-4 w-full text-xs placeholder:text-[#9596BF] text-neutral rounded-lg"
+                        value={displayAmount || ""}
+                        onChange={(e) => {
+                          const value = e.target.value;
+                          setDisplayAmount(value);
+                          if (value && value !== "") {
+                            try {
+                              const amountInWei = BigInt(
+                                Math.floor(Number(value) * 10 ** 18),
+                              );
+                              setAmountWei(amountInWei);
+                            } catch (error) {
+                              console.error("Invalid number input:", error);
+                              setAmountWei(0n);
+                            }
+                          } else {
+                            setAmountWei(0n);
+                          }
+                        }}
+                        placeholder="Enter amount"
+                        autoComplete="off"
                       />
-                      <div className="flex flex-col gap-1.5 w-full">
-                        <div className="flex items-center ml-2">
-                          <span className="text-xs font-medium mr-2 leading-none">
-                            No amount
-                          </span>
-                        </div>
-                        <div className="flex bg-base-300 text-accent h-[2.2rem] px-4 items-center rounded-lg">
-                          <span className="text-xs opacity-50">No value</span>
-                        </div>
-                      </div>
-                    </label>
+                    </div>
                   </div>
                 </div>
               </div>
-              <div className="form-control">
-                <label className="label" htmlFor="greeting-input">
-                  <span className="label-text text-lg font-medium">
-                    Greeting Message
-                  </span>
-                </label>
-                <input
-                  id="greeting-input"
-                  type="text"
-                  className="input input-bordered input-lg text-lg"
-                  value={greeting}
-                  onChange={(e) => setGreeting(e.target.value)}
-                  placeholder="Enter your greeting"
-                />
-              </div>
               <button
                 className="btn btn-primary btn-lg w-full text-lg"
-                onClick={handleSetGreeting}
-                disabled={!greeting}
+                onClick={() => depositStrk()}
+                disabled={!connectedAddress || amountWei === 0n || isDepositing}
               >
-                {Number(inputAmount) > 0
-                  ? `Set Greeting with ${selectedToken}`
-                  : "Set Greeting"}
+                {isDepositing ? (
+                  <span className="loading loading-spinner loading-sm"></span>
+                ) : (
+                  "Deposit STRK"
+                )}
               </button>
             </div>
           </div>
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
             <h2 className="text-2xl font-bold mb-6 text-secondary">
-              Transaction History
+              vSTRK Activity
             </h2>
-            <div className="space-y-4">
-              {events?.map((event, index) => (
-                <div key={index} className="p-4 bg-base-200 rounded-xl">
-                  <p className="text-lg">
-                    Set Greeting to {event.args.new_greeting}
-                    {event.args.value.unwrap() > 0n && (
-                      <span className="ml-2 text-primary">
-                        with{" "}
-                        {(Number(event.args.value.unwrap()) / 10 ** 18).toFixed(
-                          6,
-                        )}
-                        {event.args.token.unwrap() ===
-                        BigInt(StrkContract?.address || "")
-                          ? " STRK"
-                          : " ETH"}
-                      </span>
-                    )}
-                  </p>
+            <div className="space-y-6">
+              <div>
+                <h3 className="text-lg font-semibold mb-2">Deposits</h3>
+                <div className="space-y-3">
+                  {depositEvents?.length ? (
+                    depositEvents.map((evt, idx) => (
+                      <div
+                        key={`dep-${idx}`}
+                        className="p-4 bg-base-200 rounded-xl"
+                      >
+                        <p className="text-sm opacity-70 break-all">
+                          Owner: {toHex(evt.args.owner)}
+                        </p>
+                        <p className="text-lg">
+                          Assets:{" "}
+                          {(Number(evt.args.assets) / 10 ** 18).toFixed(6)} STRK
+                          · Shares:{" "}
+                          {(Number(evt.args.shares) / 10 ** 18).toFixed(6)}{" "}
+                          vSTRK
+                        </p>
+                      </div>
+                    ))
+                  ) : (
+                    <span className="opacity-60">No deposit events</span>
+                  )}
+                </div>
+              </div>
+              <div>
+                <h3 className="text-lg font-semibold mb-2">Withdrawals</h3>
+                <div className="space-y-3">
+                  {withdrawEvents?.length ? (
+                    withdrawEvents.map((evt, idx) => (
+                      <div
+                        key={`with-${idx}`}
+                        className="p-4 bg-base-200 rounded-xl"
+                      >
+                        <p className="text-sm opacity-70 break-all">
+                          Owner: {toHex(evt.args.owner)}
+                        </p>
+                        <p className="text-lg">
+                          Assets:{" "}
+                          {(Number(evt.args.assets) / 10 ** 18).toFixed(6)} STRK
+                          · Shares:{" "}
+                          {(Number(evt.args.shares) / 10 ** 18).toFixed(6)}{" "}
+                          vSTRK
+                        </p>
+                      </div>
+                    ))
+                  ) : (
+                    <span className="opacity-60">No withdraw events</span>
+                  )}
                 </div>
-              ))}
+              </div>
             </div>
           </div>
         </div>
diff --git a/packages/nextjs/contracts/configExternalContracts.ts b/packages/nextjs/contracts/configExternalContracts.ts
index a011b38..9847773 100644
--- a/packages/nextjs/contracts/configExternalContracts.ts
+++ b/packages/nextjs/contracts/configExternalContracts.ts
@@ -3,6 +3,12 @@
  * You should not edit it manually or your changes might be overwritten.
  */
 
+import {
+  VSTRK_ABI,
+  VSTRK_ADDRESS,
+  VSTRK_CLASS_HASH,
+} from "~~/utils/vesu/constants";
+
 const configExternalContracts = {
   devnet: {
     Eth: {
@@ -391,6 +397,18 @@ const configExternalContracts = {
         },
       ],
     },
+    vStrk: {
+      address: VSTRK_ADDRESS,
+      classHash: VSTRK_CLASS_HASH,
+      abi: VSTRK_ABI,
+    },
+  },
+  mainnet: {
+    vStrk: {
+      address: VSTRK_ADDRESS,
+      classHash: VSTRK_CLASS_HASH,
+      abi: VSTRK_ABI,
+    },
   },
 } as const;
 
diff --git a/packages/nextjs/utils/vesu/constants.ts b/packages/nextjs/utils/vesu/constants.ts
new file mode 100644
index 0000000..cce8dc5
--- /dev/null
+++ b/packages/nextjs/utils/vesu/constants.ts
@@ -0,0 +1,9 @@
+import { vTokenAbi } from "./vTokenAbi";
+
+export const VSTRK_ADDRESS =
+  "0x0147ae3337b168ac9abe80a7214f0cb9e874b25c3db530a8e04beb98a134e07a" as const;
+
+export const VSTRK_CLASS_HASH =
+  "0x035c58475afe0f44fa5267ffee18facd535ae5bb64085035369d07ce2b3afb4d" as const;
+
+export const VSTRK_ABI = vTokenAbi;
diff --git a/packages/nextjs/utils/vesu/vTokenAbi.ts b/packages/nextjs/utils/vesu/vTokenAbi.ts
new file mode 100644
index 0000000..9947413
--- /dev/null
+++ b/packages/nextjs/utils/vesu/vTokenAbi.ts
@@ -0,0 +1,780 @@
+export const vTokenAbi = [
+  {
+    name: "VToken",
+    type: "impl",
+    interface_name: "vesu::v_token::IVToken",
+  },
+  {
+    name: "core::integer::u256",
+    type: "struct",
+    members: [
+      {
+        name: "low",
+        type: "core::integer::u128",
+      },
+      {
+        name: "high",
+        type: "core::integer::u128",
+      },
+    ],
+  },
+  {
+    name: "core::bool",
+    type: "enum",
+    variants: [
+      {
+        name: "False",
+        type: "()",
+      },
+      {
+        name: "True",
+        type: "()",
+      },
+    ],
+  },
+  {
+    name: "vesu::v_token::IVToken",
+    type: "interface",
+    items: [
+      {
+        name: "extension",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "approve_extension",
+        type: "function",
+        inputs: [],
+        outputs: [],
+        state_mutability: "external",
+      },
+      {
+        name: "mint_v_token",
+        type: "function",
+        inputs: [
+          {
+            name: "recipient",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "amount",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::bool",
+          },
+        ],
+        state_mutability: "external",
+      },
+      {
+        name: "burn_v_token",
+        type: "function",
+        inputs: [
+          {
+            name: "from",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "amount",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::bool",
+          },
+        ],
+        state_mutability: "external",
+      },
+    ],
+  },
+  {
+    name: "IERC4626",
+    type: "impl",
+    interface_name: "vesu::v_token::IERC4626",
+  },
+  {
+    name: "vesu::v_token::IERC4626",
+    type: "interface",
+    items: [
+      {
+        name: "asset",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "total_assets",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "convert_to_shares",
+        type: "function",
+        inputs: [
+          {
+            name: "assets",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "convert_to_assets",
+        type: "function",
+        inputs: [
+          {
+            name: "shares",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "max_deposit",
+        type: "function",
+        inputs: [
+          {
+            name: "receiver",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "preview_deposit",
+        type: "function",
+        inputs: [
+          {
+            name: "assets",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "deposit",
+        type: "function",
+        inputs: [
+          {
+            name: "assets",
+            type: "core::integer::u256",
+          },
+          {
+            name: "receiver",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "external",
+      },
+      {
+        name: "max_mint",
+        type: "function",
+        inputs: [
+          {
+            name: "receiver",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "preview_mint",
+        type: "function",
+        inputs: [
+          {
+            name: "shares",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "mint",
+        type: "function",
+        inputs: [
+          {
+            name: "shares",
+            type: "core::integer::u256",
+          },
+          {
+            name: "receiver",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "external",
+      },
+      {
+        name: "max_withdraw",
+        type: "function",
+        inputs: [
+          {
+            name: "owner",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "preview_withdraw",
+        type: "function",
+        inputs: [
+          {
+            name: "assets",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "withdraw",
+        type: "function",
+        inputs: [
+          {
+            name: "assets",
+            type: "core::integer::u256",
+          },
+          {
+            name: "receiver",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "owner",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "external",
+      },
+      {
+        name: "max_redeem",
+        type: "function",
+        inputs: [
+          {
+            name: "owner",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "preview_redeem",
+        type: "function",
+        inputs: [
+          {
+            name: "shares",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "redeem",
+        type: "function",
+        inputs: [
+          {
+            name: "shares",
+            type: "core::integer::u256",
+          },
+          {
+            name: "receiver",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "owner",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "external",
+      },
+    ],
+  },
+  {
+    name: "ERC20Impl",
+    type: "impl",
+    interface_name: "vesu::vendor::erc20::IERC20",
+  },
+  {
+    name: "vesu::vendor::erc20::IERC20",
+    type: "interface",
+    items: [
+      {
+        name: "total_supply",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "balance_of",
+        type: "function",
+        inputs: [
+          {
+            name: "account",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "allowance",
+        type: "function",
+        inputs: [
+          {
+            name: "owner",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "spender",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "transfer",
+        type: "function",
+        inputs: [
+          {
+            name: "recipient",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "amount",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::bool",
+          },
+        ],
+        state_mutability: "external",
+      },
+      {
+        name: "transfer_from",
+        type: "function",
+        inputs: [
+          {
+            name: "sender",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "recipient",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "amount",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::bool",
+          },
+        ],
+        state_mutability: "external",
+      },
+      {
+        name: "approve",
+        type: "function",
+        inputs: [
+          {
+            name: "spender",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "amount",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::bool",
+          },
+        ],
+        state_mutability: "external",
+      },
+    ],
+  },
+  {
+    name: "ERC20MetadataImpl",
+    type: "impl",
+    interface_name: "vesu::vendor::erc20::IERC20Metadata",
+  },
+  {
+    name: "vesu::vendor::erc20::IERC20Metadata",
+    type: "interface",
+    items: [
+      {
+        name: "name",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::felt252",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "symbol",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::felt252",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "decimals",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::integer::u8",
+          },
+        ],
+        state_mutability: "view",
+      },
+    ],
+  },
+  {
+    name: "ERC20CamelOnlyImpl",
+    type: "impl",
+    interface_name: "vesu::vendor::erc20::IERC20CamelOnly",
+  },
+  {
+    name: "vesu::vendor::erc20::IERC20CamelOnly",
+    type: "interface",
+    items: [
+      {
+        name: "totalSupply",
+        type: "function",
+        inputs: [],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "balanceOf",
+        type: "function",
+        inputs: [
+          {
+            name: "account",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::integer::u256",
+          },
+        ],
+        state_mutability: "view",
+      },
+      {
+        name: "transferFrom",
+        type: "function",
+        inputs: [
+          {
+            name: "sender",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "recipient",
+            type: "core::starknet::contract_address::ContractAddress",
+          },
+          {
+            name: "amount",
+            type: "core::integer::u256",
+          },
+        ],
+        outputs: [
+          {
+            type: "core::bool",
+          },
+        ],
+        state_mutability: "external",
+      },
+    ],
+  },
+  {
+    name: "constructor",
+    type: "constructor",
+    inputs: [
+      {
+        name: "name",
+        type: "core::felt252",
+      },
+      {
+        name: "symbol",
+        type: "core::felt252",
+      },
+      {
+        name: "decimals",
+        type: "core::integer::u8",
+      },
+      {
+        name: "pool_id",
+        type: "core::felt252",
+      },
+      {
+        name: "extension",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        name: "asset",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+    ],
+  },
+  {
+    kind: "struct",
+    name: "vesu::vendor::erc20_component::ERC20Component::Transfer",
+    type: "event",
+    members: [
+      {
+        kind: "key",
+        name: "from",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "key",
+        name: "to",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "data",
+        name: "value",
+        type: "core::integer::u256",
+      },
+    ],
+  },
+  {
+    kind: "struct",
+    name: "vesu::vendor::erc20_component::ERC20Component::Approval",
+    type: "event",
+    members: [
+      {
+        kind: "key",
+        name: "owner",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "key",
+        name: "spender",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "data",
+        name: "value",
+        type: "core::integer::u256",
+      },
+    ],
+  },
+  {
+    kind: "enum",
+    name: "vesu::vendor::erc20_component::ERC20Component::Event",
+    type: "event",
+    variants: [
+      {
+        kind: "nested",
+        name: "Transfer",
+        type: "vesu::vendor::erc20_component::ERC20Component::Transfer",
+      },
+      {
+        kind: "nested",
+        name: "Approval",
+        type: "vesu::vendor::erc20_component::ERC20Component::Approval",
+      },
+    ],
+  },
+  {
+    kind: "struct",
+    name: "vesu::v_token::VToken::Deposit",
+    type: "event",
+    members: [
+      {
+        kind: "key",
+        name: "sender",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "key",
+        name: "owner",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "data",
+        name: "assets",
+        type: "core::integer::u256",
+      },
+      {
+        kind: "data",
+        name: "shares",
+        type: "core::integer::u256",
+      },
+    ],
+  },
+  {
+    kind: "struct",
+    name: "vesu::v_token::VToken::Withdraw",
+    type: "event",
+    members: [
+      {
+        kind: "key",
+        name: "sender",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "key",
+        name: "receiver",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "key",
+        name: "owner",
+        type: "core::starknet::contract_address::ContractAddress",
+      },
+      {
+        kind: "data",
+        name: "assets",
+        type: "core::integer::u256",
+      },
+      {
+        kind: "data",
+        name: "shares",
+        type: "core::integer::u256",
+      },
+    ],
+  },
+  {
+    kind: "enum",
+    name: "vesu::v_token::VToken::Event",
+    type: "event",
+    variants: [
+      {
+        kind: "flat",
+        name: "ERC20Event",
+        type: "vesu::vendor::erc20_component::ERC20Component::Event",
+      },
+      {
+        kind: "nested",
+        name: "Deposit",
+        type: "vesu::v_token::VToken::Deposit",
+      },
+      {
+        kind: "nested",
+        name: "Withdraw",
+        type: "vesu::v_token::VToken::Withdraw",
+      },
+    ],
+  },
+] as const;
diff --git a/packages/snfoundry/contracts/Scarb.toml b/packages/snfoundry/contracts/Scarb.toml
index dbdf5d0..c081319 100644
--- a/packages/snfoundry/contracts/Scarb.toml
+++ b/packages/snfoundry/contracts/Scarb.toml
@@ -29,7 +29,7 @@ sort-module-level-items = true
 [[tool.snforge.fork]]
 name = "MAINNET_LATEST"
 url = "https://starknet-mainnet.public.blastapi.io/rpc/v0_9"
-block_id.number = "1028886"
+block_id.number = "1540452"
 block_id.tag = "latest"
 
 [tool]

From f772cce1021e41e7583c2ae9cfe520523e637ea4 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Mon, 13 Oct 2025 23:15:31 +0700
Subject: [PATCH 03/12] chore: remove zklend

---
 .../nextjs/contracts/deployedContracts.ts     | 114 ++---------
 .../contracts/src/your_contract.cairo         | 182 ++++--------------
 .../contracts/tests/test_contract.cairo       |  54 ++----
 3 files changed, 58 insertions(+), 292 deletions(-)

diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
index 8e089af..7abef3b 100644
--- a/packages/nextjs/contracts/deployedContracts.ts
+++ b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,12 +7,12 @@ const deployedContracts = {
   devnet: {
     YourContract: {
       address:
-        "0x1a2542704c7588b9c5eb86c9a1b2391b93b77b67694268b74db51097031839d",
+        "0x3760a55e55c5d737d14e527c4c09c5b828f5476fd6f9b7148482ec4185afa17",
       abi: [
         {
           type: "impl",
           name: "YourContractImpl",
-          interface_name: "contracts::YourContract::IYourContract",
+          interface_name: "contracts::your_contract::IYourContract",
         },
         {
           type: "struct",
@@ -76,7 +76,7 @@ const deployedContracts = {
         },
         {
           type: "interface",
-          name: "contracts::YourContract::IYourContract",
+          name: "contracts::your_contract::IYourContract",
           items: [
             {
               type: "function",
@@ -229,7 +229,7 @@ const deployedContracts = {
         },
         {
           type: "event",
-          name: "contracts::YourContract::YourContract::GreetingChanged",
+          name: "contracts::your_contract::YourContract::GreetingChanged",
           kind: "struct",
           members: [
             {
@@ -256,7 +256,7 @@ const deployedContracts = {
         },
         {
           type: "event",
-          name: "contracts::YourContract::YourContract::Event",
+          name: "contracts::your_contract::YourContract::Event",
           kind: "enum",
           variants: [
             {
@@ -266,111 +266,25 @@ const deployedContracts = {
             },
             {
               name: "GreetingChanged",
-              type: "contracts::YourContract::YourContract::GreetingChanged",
+              type: "contracts::your_contract::YourContract::GreetingChanged",
               kind: "nested",
             },
           ],
         },
       ],
       classHash:
-        "0x5e4c766477764df946dcce9b0d2c865468882ac572c0d3767aeb98d23cbe74b",
-    },
-  },
-  mainnet: {
-    Multicall: {
-      address:
-        "0x7ca5ccfeb2e4d6e13e9382d70042712f1f736c003f3a40243d9a397a7317251",
-      abi: [
-        {
-          type: "impl",
-          name: "MulticallImpl",
-          interface_name: "contracts::multicall::IMulticall",
-        },
-        {
-          type: "struct",
-          name: "core::array::Span::<core::starknet::contract_address::ContractAddress>",
-          members: [
-            {
-              name: "snapshot",
-              type: "@core::array::Array::<core::starknet::contract_address::ContractAddress>",
-            },
-          ],
-        },
-        {
-          type: "struct",
-          name: "core::array::Span::<core::felt252>",
-          members: [
-            {
-              name: "snapshot",
-              type: "@core::array::Array::<core::felt252>",
-            },
-          ],
-        },
-        {
-          type: "struct",
-          name: "core::array::Span::<core::array::Span::<core::felt252>>",
-          members: [
-            {
-              name: "snapshot",
-              type: "@core::array::Array::<core::array::Span::<core::felt252>>",
-            },
-          ],
-        },
-        {
-          type: "interface",
-          name: "contracts::multicall::IMulticall",
-          items: [
-            {
-              type: "function",
-              name: "call_contracts",
-              inputs: [
-                {
-                  name: "contracts",
-                  type: "core::array::Span::<core::starknet::contract_address::ContractAddress>",
-                },
-                {
-                  name: "entry_point_selectors",
-                  type: "core::array::Span::<core::felt252>",
-                },
-                {
-                  name: "calldata",
-                  type: "core::array::Span::<core::array::Span::<core::felt252>>",
-                },
-              ],
-              outputs: [
-                {
-                  type: "core::array::Array::<core::array::Span::<core::felt252>>",
-                },
-              ],
-              state_mutability: "view",
-            },
-          ],
-        },
-        {
-          type: "constructor",
-          name: "constructor",
-          inputs: [],
-        },
-        {
-          type: "event",
-          name: "contracts::multicall::Multicall::Event",
-          kind: "enum",
-          variants: [],
-        },
-      ],
-      classHash:
-        "0x67be8d0979b1012f4222674cb81e3a0413e45e16897b8d7c650ae84ba4a3f23",
+        "0x21e2aa81952de7b6851d5e76ea1f70283373407b22bfb4d32fafa4c5e2c8f1d",
     },
   },
   sepolia: {
     YourContract: {
       address:
-        "0x62eb9272c7523ee445d223bae15b5b44a79c3fdbb5216d3412534a47bcc5255",
+        "0x6a5b250d1eeda1cdc9e98078d3dadbe1d2bacd7a4a44f55e9e250bfe18c4288",
       abi: [
         {
           type: "impl",
           name: "YourContractImpl",
-          interface_name: "contracts::YourContract::IYourContract",
+          interface_name: "contracts::your_contract::IYourContract",
         },
         {
           type: "struct",
@@ -434,7 +348,7 @@ const deployedContracts = {
         },
         {
           type: "interface",
-          name: "contracts::YourContract::IYourContract",
+          name: "contracts::your_contract::IYourContract",
           items: [
             {
               type: "function",
@@ -587,7 +501,7 @@ const deployedContracts = {
         },
         {
           type: "event",
-          name: "contracts::YourContract::YourContract::GreetingChanged",
+          name: "contracts::your_contract::YourContract::GreetingChanged",
           kind: "struct",
           members: [
             {
@@ -614,7 +528,7 @@ const deployedContracts = {
         },
         {
           type: "event",
-          name: "contracts::YourContract::YourContract::Event",
+          name: "contracts::your_contract::YourContract::Event",
           kind: "enum",
           variants: [
             {
@@ -624,14 +538,14 @@ const deployedContracts = {
             },
             {
               name: "GreetingChanged",
-              type: "contracts::YourContract::YourContract::GreetingChanged",
+              type: "contracts::your_contract::YourContract::GreetingChanged",
               kind: "nested",
             },
           ],
         },
       ],
       classHash:
-        "0x5e4c766477764df946dcce9b0d2c865468882ac572c0d3767aeb98d23cbe74b",
+        "0x73b00366d0117bee7ae7620469abc7ceefb8b78ff9257b77b3531a9c4411688",
     },
   },
 } as const;
diff --git a/packages/snfoundry/contracts/src/your_contract.cairo b/packages/snfoundry/contracts/src/your_contract.cairo
index c4a3ae9..a6ea14f 100644
--- a/packages/snfoundry/contracts/src/your_contract.cairo
+++ b/packages/snfoundry/contracts/src/your_contract.cairo
@@ -1,23 +1,9 @@
-use starknet::ContractAddress;
-
 #[starknet::interface]
 pub trait IYourContract<TContractState> {
     fn greeting(self: @TContractState) -> ByteArray;
-    fn set_greeting(
-        ref self: TContractState,
-        new_greeting: ByteArray,
-        option_amount: Option<u256>,
-        option_token: Option<ContractAddress>,
-    );
+    fn set_greeting(ref self: TContractState, new_greeting: ByteArray, amount_strk: Option<u256>);
     fn withdraw(ref self: TContractState);
     fn premium(self: @TContractState) -> bool;
-    fn token_deposits(self: @TContractState, token: ContractAddress) -> u256;
-}
-
-#[starknet::interface]
-pub trait IZklendMarket<TContractState> {
-    fn deposit(ref self: TContractState, asset: ContractAddress, amount: felt252);
-    fn withdraw_all(ref self: TContractState, asset: ContractAddress);
 }
 
 #[starknet::contract]
@@ -29,7 +15,7 @@ pub mod YourContract {
         StoragePointerWriteAccess,
     };
     use starknet::{ContractAddress, get_caller_address, get_contract_address};
-    use super::{IYourContract, IZklendMarketDispatcher, IZklendMarketDispatcherTrait};
+    use super::IYourContract;
 
     component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);
 
@@ -37,12 +23,8 @@ pub mod YourContract {
     impl OwnableImpl = OwnableComponent::OwnableImpl<ContractState>;
     impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;
 
-    pub const FELT_ETH_CONTRACT: felt252 =
-        0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7;
     pub const FELT_STRK_CONTRACT: felt252 =
         0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d;
-    const ZKLEND_MARKET: felt252 =
-        0x04c0a5193d58f74fbace4b74dcf65481e734ed1714121bdc571da345540efa05;
 
     #[event]
     #[derive(Drop, starknet::Event)]
@@ -60,7 +42,6 @@ pub mod YourContract {
         new_greeting: ByteArray,
         premium: bool,
         value: Option<u256>,
-        token: Option<ContractAddress>,
     }
 
     #[storage]
@@ -69,8 +50,6 @@ pub mod YourContract {
         premium: bool,
         total_counter: u256,
         user_greeting_counter: Map<ContractAddress, u256>,
-        zklend_dispatcher: IZklendMarketDispatcher,
-        token_deposits: Map<ContractAddress, u256>,
         #[substorage(v0)]
         ownable: OwnableComponent::Storage,
     }
@@ -79,11 +58,6 @@ pub mod YourContract {
     fn constructor(ref self: ContractState, owner: ContractAddress) {
         self.greeting.write("Building Unstoppable Apps!!!");
         self.ownable.initializer(owner);
-
-        // setup dispatchers
-        self
-            .zklend_dispatcher
-            .write(IZklendMarketDispatcher { contract_address: ZKLEND_MARKET.try_into().unwrap() });
     }
 
     #[abi(embed_v0)]
@@ -91,143 +65,53 @@ pub mod YourContract {
         fn greeting(self: @ContractState) -> ByteArray {
             self.greeting.read()
         }
-
         fn set_greeting(
-            ref self: ContractState,
-            new_greeting: ByteArray,
-            option_amount: Option<u256>,
-            option_token: Option<ContractAddress>,
+            ref self: ContractState, new_greeting: ByteArray, amount_strk: Option<u256>,
         ) {
-            self._require_supported_token(option_token);
             self.greeting.write(new_greeting);
             self.total_counter.write(self.total_counter.read() + 1);
             let user_counter = self.user_greeting_counter.read(get_caller_address());
             self.user_greeting_counter.write(get_caller_address(), user_counter + 1);
 
-            match (option_amount, option_token) {
-                (
-                    Option::Some(amount), Option::Some(token),
-                ) => {
-                    if amount > 0 {
-                        self
-                            ._get_token_dispatcher(token)
-                            .transfer_from(get_caller_address(), get_contract_address(), amount);
-                        self.premium.write(true);
-                        self._deposit_all_tokens_to_zklend();
-                        self.token_deposits.write(token, self.token_deposits.read(token) + amount);
-                        self
-                            .emit(
-                                GreetingChanged {
-                                    greeting_setter: get_caller_address(),
-                                    new_greeting: self.greeting.read(),
-                                    premium: true,
-                                    value: Option::Some(amount),
-                                    token: Option::Some(token),
-                                },
+            match amount_strk {
+                Option::Some(amount_strk) => {
+                    // In `Debug Contract` or UI implementation, call `approve` on STRK contract
+                    // before invoking fn set_greeting()
+                    if amount_strk > 0 {
+                        let strk_contract_address: ContractAddress = FELT_STRK_CONTRACT
+                            .try_into()
+                            .unwrap();
+                        let strk_dispatcher = IERC20Dispatcher {
+                            contract_address: strk_contract_address,
+                        };
+                        strk_dispatcher
+                            .transfer_from(
+                                get_caller_address(), get_contract_address(), amount_strk,
                             );
-                    } else {
-                        panic!("Amount must be greater than 0");
+                        self.premium.write(true);
                     }
                 },
-                (
-                    Option::None, Option::None,
-                ) => {
-                    self.premium.write(false);
-                    self
-                        .emit(
-                            GreetingChanged {
-                                greeting_setter: get_caller_address(),
-                                new_greeting: self.greeting.read(),
-                                premium: false,
-                                value: Option::None,
-                                token: Option::None,
-                            },
-                        );
-                },
-                _ => { panic!("Unreachable"); },
+                Option::None => { self.premium.write(false); },
             }
+            self
+                .emit(
+                    GreetingChanged {
+                        greeting_setter: get_caller_address(),
+                        new_greeting: self.greeting.read(),
+                        premium: self.premium.read(),
+                        value: amount_strk,
+                    },
+                );
         }
-        fn premium(self: @ContractState) -> bool {
-            self.premium.read()
-        }
-
-        fn token_deposits(self: @ContractState, token: ContractAddress) -> u256 {
-            self.token_deposits.read(token)
-        }
-
         fn withdraw(ref self: ContractState) {
             self.ownable.assert_only_owner();
-            self._withdraw_all_tokens_from_zklend();
-            let eth_contract_address = FELT_ETH_CONTRACT.try_into().unwrap();
             let strk_contract_address = FELT_STRK_CONTRACT.try_into().unwrap();
-
-            let eth_dispatcher = self._get_token_dispatcher(eth_contract_address);
-            let strk_dispatcher = self._get_token_dispatcher(strk_contract_address);
-
-            let eth_balance = eth_dispatcher.balance_of(get_contract_address());
-            let strk_balance = strk_dispatcher.balance_of(get_contract_address());
-
-            eth_dispatcher.transfer(self.ownable.owner(), eth_balance);
-            strk_dispatcher.transfer(self.ownable.owner(), strk_balance);
+            let strk_dispatcher = IERC20Dispatcher { contract_address: strk_contract_address };
+            let balance = strk_dispatcher.balance_of(get_contract_address());
+            strk_dispatcher.transfer(self.ownable.owner(), balance);
         }
-    }
-    // internal
-    #[generate_trait]
-    impl InternalImpl of InternalTrait {
-        fn _get_token_dispatcher(
-            ref self: ContractState, token: ContractAddress,
-        ) -> IERC20Dispatcher {
-            return IERC20Dispatcher { contract_address: token };
-        }
-
-        fn _deposit_all_tokens_to_zklend(ref self: ContractState) {
-            let eth_dispatcher = self._get_token_dispatcher(FELT_ETH_CONTRACT.try_into().unwrap());
-            let strk_dispatcher = self
-                ._get_token_dispatcher(FELT_STRK_CONTRACT.try_into().unwrap());
-
-            let eth_balance = eth_dispatcher.balance_of(get_contract_address());
-            let strk_balance = strk_dispatcher.balance_of(get_contract_address());
-
-            let eth_balance_felt: felt252 = eth_balance.try_into().expect('Amount too large');
-            let strk_balance_felt: felt252 = strk_balance.try_into().expect('Amount too large');
-
-            if eth_balance > 0 {
-                eth_dispatcher.approve(ZKLEND_MARKET.try_into().unwrap(), eth_balance);
-                self
-                    .zklend_dispatcher
-                    .read()
-                    .deposit(eth_dispatcher.contract_address, eth_balance_felt);
-            }
-            if strk_balance > 0 {
-                strk_dispatcher.approve(ZKLEND_MARKET.try_into().unwrap(), strk_balance);
-                self
-                    .zklend_dispatcher
-                    .read()
-                    .deposit(strk_dispatcher.contract_address, strk_balance_felt);
-            }
-        }
-
-        fn _withdraw_all_tokens_from_zklend(ref self: ContractState) {
-            if self.token_deposits.read(FELT_STRK_CONTRACT.try_into().unwrap()) > 0 {
-                self.zklend_dispatcher.read().withdraw_all(FELT_STRK_CONTRACT.try_into().unwrap());
-                self.token_deposits.write(FELT_STRK_CONTRACT.try_into().unwrap(), 0);
-            }
-            if self.token_deposits.read(FELT_ETH_CONTRACT.try_into().unwrap()) > 0 {
-                self.zklend_dispatcher.read().withdraw_all(FELT_ETH_CONTRACT.try_into().unwrap());
-                self.token_deposits.write(FELT_ETH_CONTRACT.try_into().unwrap(), 0);
-            }
-        }
-
-        fn _require_supported_token(
-            ref self: ContractState, option_token: Option<ContractAddress>,
-        ) {
-            if let Option::Some(token) = option_token {
-                assert(
-                    token == FELT_STRK_CONTRACT.try_into().unwrap()
-                        || token == FELT_ETH_CONTRACT.try_into().unwrap(),
-                    'Unsupported token',
-                );
-            }
+        fn premium(self: @ContractState) -> bool {
+            self.premium.read()
         }
     }
 }
diff --git a/packages/snfoundry/contracts/tests/test_contract.cairo b/packages/snfoundry/contracts/tests/test_contract.cairo
index c18d871..e5a30f0 100644
--- a/packages/snfoundry/contracts/tests/test_contract.cairo
+++ b/packages/snfoundry/contracts/tests/test_contract.cairo
@@ -1,4 +1,4 @@
-use contracts::your_contract::YourContract::{FELT_ETH_CONTRACT, FELT_STRK_CONTRACT};
+use contracts::your_contract::YourContract::FELT_STRK_CONTRACT;
 use contracts::your_contract::{IYourContractDispatcher, IYourContractDispatcherTrait};
 use openzeppelin_testing::declare_and_deploy;
 use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
@@ -6,13 +6,13 @@ use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::{CheatSpan, cheat_caller_address};
 use starknet::ContractAddress;
 
-// Real wallet address deployed on Mainnet
-const OWNER: ContractAddress = 0x00c853dC4D9141DC6192FeCc999cC7333348Ab4fDCEf97B760ECb63A7FDE1c0e
+// Real wallet address deployed on Sepolia
+const OWNER: ContractAddress = 0x02dA5254690b46B9C4059C25366D1778839BE63C142d899F0306fd5c312A5918
     .try_into()
     .unwrap();
 
 const STRK_TOKEN_CONTRACT_ADDRESS: ContractAddress = FELT_STRK_CONTRACT.try_into().unwrap();
-const ETH_TOKEN_CONTRACT_ADDRESS: ContractAddress = FELT_ETH_CONTRACT.try_into().unwrap();
+
 fn deploy_contract(name: ByteArray) -> ContractAddress {
     let mut calldata = array![];
     calldata.append_serde(OWNER);
@@ -30,25 +30,22 @@ fn test_set_greetings() {
     assert(current_greeting == expected_greeting, 'Should have the right message');
 
     let new_greeting: ByteArray = "Learn Scaffold-Stark 2! :)";
-    dispatcher
-        .set_greeting(
-            new_greeting.clone(), Option::None, Option::None,
-        ); // we dont transfer any fri/wei
+    dispatcher.set_greeting(new_greeting.clone(), Option::None); // we don't transfer any strk
     assert(dispatcher.greeting() == new_greeting, 'Should allow set new message');
 }
 
 #[test]
-#[fork("MAINNET_LATEST")]
-fn test_transfer_eth() {
-    let user: ContractAddress = OWNER.try_into().unwrap();
+#[fork("SEPOLIA_LATEST")]
+fn test_transfer() {
+    let user = OWNER;
     let your_contract_address = deploy_contract("YourContract");
 
     let your_contract_dispatcher = IYourContractDispatcher {
         contract_address: your_contract_address,
     };
-    let erc20_dispatcher = IERC20Dispatcher { contract_address: ETH_TOKEN_CONTRACT_ADDRESS };
+    let erc20_dispatcher = IERC20Dispatcher { contract_address: STRK_TOKEN_CONTRACT_ADDRESS };
     let amount_to_transfer = 500;
-    cheat_caller_address(ETH_TOKEN_CONTRACT_ADDRESS, user, CheatSpan::TargetCalls(1));
+    cheat_caller_address(STRK_TOKEN_CONTRACT_ADDRESS, user, CheatSpan::TargetCalls(1));
     erc20_dispatcher.approve(your_contract_address, amount_to_transfer);
     let approved_amount = erc20_dispatcher.allowance(user, your_contract_address);
     assert(approved_amount == amount_to_transfer, 'Not the right amount approved');
@@ -58,36 +55,7 @@ fn test_transfer_eth() {
     cheat_caller_address(your_contract_address, user, CheatSpan::TargetCalls(1));
     your_contract_dispatcher
         .set_greeting(
-            new_greeting.clone(),
-            Option::Some(amount_to_transfer),
-            Option::Some(ETH_TOKEN_CONTRACT_ADDRESS),
+            new_greeting.clone(), Option::Some(amount_to_transfer),
         ); // we transfer 500 wei
     assert(your_contract_dispatcher.greeting() == new_greeting, 'Should allow set new message');
 }
-
-#[test]
-#[fork("MAINNET_LATEST")]
-fn test_transfer_strk() {
-    let user: ContractAddress = OWNER.try_into().unwrap();
-    let your_contract_address = deploy_contract("YourContract");
-
-    let your_contract_dispatcher = IYourContractDispatcher {
-        contract_address: your_contract_address,
-    };
-    let erc20_dispatcher = IERC20Dispatcher { contract_address: STRK_TOKEN_CONTRACT_ADDRESS };
-    let amount_to_transfer = 500;
-    cheat_caller_address(STRK_TOKEN_CONTRACT_ADDRESS, user, CheatSpan::TargetCalls(1));
-    erc20_dispatcher.approve(your_contract_address, amount_to_transfer);
-    let approved_amount = erc20_dispatcher.allowance(user, your_contract_address);
-    assert(approved_amount == amount_to_transfer, 'Not the right amount approved');
-
-    let new_greeting: ByteArray = "Learn How to handle Some and None in Cairo";
-    cheat_caller_address(your_contract_address, user, CheatSpan::TargetCalls(1));
-    your_contract_dispatcher
-        .set_greeting(
-            new_greeting.clone(),
-            Option::Some(amount_to_transfer),
-            Option::Some(STRK_TOKEN_CONTRACT_ADDRESS),
-        ); // we transfer 500 fri
-    assert(your_contract_dispatcher.greeting() == new_greeting, 'Should allow set new message');
-}

From 96e4ae463a197ec1133c9f391608324602b40c93 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Tue, 14 Oct 2025 10:04:28 +0700
Subject: [PATCH 04/12] fix: must download vStrk contract from Configure
 Contracts

---
 packages/nextjs/app/page.tsx                  |  56 +-
 .../contracts/configExternalContracts.ts      | 409 +--------
 packages/nextjs/utils/vesu/constants.ts       |   9 -
 packages/nextjs/utils/vesu/vTokenAbi.ts       | 780 ------------------
 4 files changed, 52 insertions(+), 1202 deletions(-)
 delete mode 100644 packages/nextjs/utils/vesu/constants.ts
 delete mode 100644 packages/nextjs/utils/vesu/vTokenAbi.ts

diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx
index 2084487..51cec20 100644
--- a/packages/nextjs/app/page.tsx
+++ b/packages/nextjs/app/page.tsx
@@ -5,11 +5,11 @@ import { useState } from "react";
 import { useScaffoldReadContract } from "~~/hooks/scaffold-stark/useScaffoldReadContract";
 import { useScaffoldMultiWriteContract } from "~~/hooks/scaffold-stark/useScaffoldMultiWriteContract";
 import { useScaffoldEventHistory } from "~~/hooks/scaffold-stark/useScaffoldEventHistory";
+import { useDeployedContractInfo } from "~~/hooks/scaffold-stark/useDeployedContractInfo";
 import { useScaffoldWriteContract } from "~~/hooks/scaffold-stark/useScaffoldWriteContract";
 import { useTargetNetwork } from "~~/hooks/scaffold-stark/useTargetNetwork";
 import { useAccount } from "@starknet-react/core";
 import useScaffoldStrkBalance from "~~/hooks/scaffold-stark/useScaffoldStrkBalance";
-import { VSTRK_ADDRESS } from "~~/utils/vesu/constants";
 
 const Home = () => {
   const [displayAmount, setDisplayAmount] = useState<string>("");
@@ -19,6 +19,9 @@ const Home = () => {
 
   const { address: connectedAddress } = useAccount();
 
+  // vSTRK contract info
+  const { data: vStrk } = useDeployedContractInfo("vStrk");
+
   const toHex = (v: unknown) =>
     typeof v === "bigint" ? `0x${v.toString(16)}` : (v as string);
 
@@ -49,7 +52,7 @@ const Home = () => {
         {
           contractName: "Strk",
           functionName: "approve",
-          args: [VSTRK_ADDRESS, amountWei],
+          args: [vStrk?.address, amountWei],
         },
         {
           contractName: "vStrk",
@@ -65,12 +68,14 @@ const Home = () => {
     eventName: "Deposit",
     fromBlock: 1540452n, // NOTE : For now keep this block number as it is. When running local mainnet fork, use this block number as the starting block number. For example: `yarn chain --fork-network https://starknet-mainnet.public.blastapi.io/rpc/v0_9 --fork-block 1540452`
     watch: true,
+    enabled: !!vStrk,
   });
   const { data: withdrawEvents } = useScaffoldEventHistory({
     contractName: "vStrk",
     eventName: "Withdraw",
     fromBlock: 1540452n,
     watch: true,
+    enabled: !!vStrk,
   });
 
   return (
@@ -87,6 +92,41 @@ const Home = () => {
           </div>
         </h1>
         <ConnectedAddress />
+        <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg mb-8">
+          <h2 className="text-2xl font-bold mb-3 text-secondary">
+            Instructions
+          </h2>
+          <div className="text-lg">
+            <div className="flex items-center gap-3">
+              <span className="badge badge-primary badge-lg">1</span>
+              <p>
+                Run mainnet fork:{" "}
+                <code className="bg-base-200 px-2 py-1 rounded text-sm">
+                  yarn chain --fork-network
+                  https://starknet-mainnet.public.blastapi.io/rpc/v0_9
+                </code>
+              </p>
+            </div>
+            <div className="flex items-center gap-3">
+              <span className="badge badge-primary badge-lg">2</span>
+              <p>
+                To deposit or withdraw a Vesu token, you will need to interact
+                with a "vToken", we will take vSTRK to interact.
+              </p>
+            </div>
+            <div className="flex items-center gap-3">
+              <span className="badge badge-primary badge-lg">3</span>
+              <p>
+                Now let click to the "Configure Contracts" button on the bottom
+                left corner to download vStrk configures at address{" "}
+                <code className="bg-base-200 px-2 py-1 rounded text-sm">
+                  0x0147ae3337b168ac9abe80a7214f0cb9e874b25c3db530a8e04beb98a134e07a
+                </code>{" "}
+                and name vStrk
+              </p>
+            </div>
+          </div>
+        </div>
         <div className="mt-8 space-y-6">
           {/* Contract Status removed for Vesu demo */}
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
@@ -98,6 +138,7 @@ const Home = () => {
                 className="btn btn-primary btn-lg"
                 onClick={() => redeemAll()}
                 disabled={
+                  !vStrk ||
                   !connectedAddress ||
                   !vStrkBalance ||
                   (vStrkBalance as any) === 0n ||
@@ -107,13 +148,13 @@ const Home = () => {
                 {isRedeeming ? (
                   <span className="loading loading-spinner loading-sm"></span>
                 ) : (
-                  "Redeem All"
+                  "Withdraw All"
                 )}
               </button>
             </div>
             <div className="p-4 bg-base-200 rounded-xl">
               <div className="text-lg mb-4">
-                Redeem all your vSTRK shares back to STRK.
+                Withdraw all your vSTRK shares back to STRK.
               </div>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div className="p-4 bg-base-300 rounded-lg">
@@ -184,7 +225,12 @@ const Home = () => {
               <button
                 className="btn btn-primary btn-lg w-full text-lg"
                 onClick={() => depositStrk()}
-                disabled={!connectedAddress || amountWei === 0n || isDepositing}
+                disabled={
+                  !vStrk ||
+                  !connectedAddress ||
+                  amountWei === 0n ||
+                  isDepositing
+                }
               >
                 {isDepositing ? (
                   <span className="loading loading-spinner loading-sm"></span>
diff --git a/packages/nextjs/contracts/configExternalContracts.ts b/packages/nextjs/contracts/configExternalContracts.ts
index 9847773..0746fb6 100644
--- a/packages/nextjs/contracts/configExternalContracts.ts
+++ b/packages/nextjs/contracts/configExternalContracts.ts
@@ -3,413 +3,6 @@
  * You should not edit it manually or your changes might be overwritten.
  */
 
-import {
-  VSTRK_ABI,
-  VSTRK_ADDRESS,
-  VSTRK_CLASS_HASH,
-} from "~~/utils/vesu/constants";
-
-const configExternalContracts = {
-  devnet: {
-    Eth: {
-      address:
-        "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
-      classHash:
-        "0x46ded64ae2dead6448e247234bab192a9c483644395b66f2155f2614e5804b0",
-      abi: [
-        {
-          type: "struct",
-          name: "core::integer::u256",
-          members: [
-            { name: "low", type: "core::integer::u128" },
-            { name: "high", type: "core::integer::u128" },
-          ],
-        },
-        {
-          type: "function",
-          name: "mint",
-          inputs: [
-            {
-              name: "recipient",
-              type: "core::starknet::contract_address::ContractAddress",
-            },
-            { name: "amount", type: "core::integer::u256" },
-          ],
-          outputs: [],
-          state_mutability: "external",
-        },
-        {
-          type: "impl",
-          name: "ERC20MetadataImpl",
-          interface_name:
-            "openzeppelin::token::erc20::interface::IERC20Metadata",
-        },
-        {
-          type: "interface",
-          name: "openzeppelin::token::erc20::interface::IERC20Metadata",
-          items: [
-            {
-              type: "function",
-              name: "name",
-              inputs: [],
-              outputs: [{ type: "core::felt252" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "symbol",
-              inputs: [],
-              outputs: [{ type: "core::felt252" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "decimals",
-              inputs: [],
-              outputs: [{ type: "core::integer::u8" }],
-              state_mutability: "view",
-            },
-          ],
-        },
-        {
-          type: "impl",
-          name: "ERC20Impl",
-          interface_name: "openzeppelin::token::erc20::interface::IERC20",
-        },
-        {
-          type: "enum",
-          name: "core::bool",
-          variants: [
-            { name: "False", type: "()" },
-            { name: "True", type: "()" },
-          ],
-        },
-        {
-          type: "interface",
-          name: "openzeppelin::token::erc20::interface::IERC20",
-          items: [
-            {
-              type: "function",
-              name: "total_supply",
-              inputs: [],
-              outputs: [{ type: "core::integer::u256" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "balance_of",
-              inputs: [
-                {
-                  name: "account",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [{ type: "core::integer::u256" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "allowance",
-              inputs: [
-                {
-                  name: "owner",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                {
-                  name: "spender",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [{ type: "core::integer::u256" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "transfer",
-              inputs: [
-                {
-                  name: "recipient",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                { name: "amount", type: "core::integer::u256" },
-              ],
-              outputs: [{ type: "core::bool" }],
-              state_mutability: "external",
-            },
-            {
-              type: "function",
-              name: "transfer_from",
-              inputs: [
-                {
-                  name: "sender",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                {
-                  name: "recipient",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                { name: "amount", type: "core::integer::u256" },
-              ],
-              outputs: [{ type: "core::bool" }],
-              state_mutability: "external",
-            },
-            {
-              type: "function",
-              name: "approve",
-              inputs: [
-                {
-                  name: "spender",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                { name: "amount", type: "core::integer::u256" },
-              ],
-              outputs: [{ type: "core::bool" }],
-              state_mutability: "external",
-            },
-          ],
-        },
-        {
-          type: "impl",
-          name: "ERC20CamelOnlyImpl",
-          interface_name:
-            "openzeppelin::token::erc20::interface::IERC20CamelOnly",
-        },
-        {
-          type: "interface",
-          name: "openzeppelin::token::erc20::interface::IERC20CamelOnly",
-          items: [
-            {
-              type: "function",
-              name: "totalSupply",
-              inputs: [],
-              outputs: [{ type: "core::integer::u256" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "balanceOf",
-              inputs: [
-                {
-                  name: "account",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [{ type: "core::integer::u256" }],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "transferFrom",
-              inputs: [
-                {
-                  name: "sender",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                {
-                  name: "recipient",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-                { name: "amount", type: "core::integer::u256" },
-              ],
-              outputs: [{ type: "core::bool" }],
-              state_mutability: "external",
-            },
-          ],
-        },
-        {
-          type: "impl",
-          name: "OwnableImpl",
-          interface_name: "openzeppelin::access::ownable::interface::IOwnable",
-        },
-        {
-          type: "interface",
-          name: "openzeppelin::access::ownable::interface::IOwnable",
-          items: [
-            {
-              type: "function",
-              name: "owner",
-              inputs: [],
-              outputs: [
-                { type: "core::starknet::contract_address::ContractAddress" },
-              ],
-              state_mutability: "view",
-            },
-            {
-              type: "function",
-              name: "transfer_ownership",
-              inputs: [
-                {
-                  name: "new_owner",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [],
-              state_mutability: "external",
-            },
-            {
-              type: "function",
-              name: "renounce_ownership",
-              inputs: [],
-              outputs: [],
-              state_mutability: "external",
-            },
-          ],
-        },
-        {
-          type: "impl",
-          name: "OwnableCamelOnlyImpl",
-          interface_name:
-            "openzeppelin::access::ownable::interface::IOwnableCamelOnly",
-        },
-        {
-          type: "interface",
-          name: "openzeppelin::access::ownable::interface::IOwnableCamelOnly",
-          items: [
-            {
-              type: "function",
-              name: "transferOwnership",
-              inputs: [
-                {
-                  name: "newOwner",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [],
-              state_mutability: "external",
-            },
-            {
-              type: "function",
-              name: "renounceOwnership",
-              inputs: [],
-              outputs: [],
-              state_mutability: "external",
-            },
-          ],
-        },
-        {
-          type: "constructor",
-          name: "constructor",
-          inputs: [
-            {
-              name: "owner",
-              type: "core::starknet::contract_address::ContractAddress",
-            },
-          ],
-        },
-        {
-          type: "event",
-          name: "openzeppelin::token::erc20::erc20::ERC20Component::Transfer",
-          kind: "struct",
-          members: [
-            {
-              name: "from",
-              type: "core::starknet::contract_address::ContractAddress",
-              kind: "key",
-            },
-            {
-              name: "to",
-              type: "core::starknet::contract_address::ContractAddress",
-              kind: "key",
-            },
-            { name: "value", type: "core::integer::u256", kind: "data" },
-          ],
-        },
-        {
-          type: "event",
-          name: "openzeppelin::token::erc20::erc20::ERC20Component::Approval",
-          kind: "struct",
-          members: [
-            {
-              name: "owner",
-              type: "core::starknet::contract_address::ContractAddress",
-              kind: "data",
-            },
-            {
-              name: "spender",
-              type: "core::starknet::contract_address::ContractAddress",
-              kind: "data",
-            },
-            { name: "value", type: "core::integer::u256", kind: "data" },
-          ],
-        },
-        {
-          type: "event",
-          name: "openzeppelin::token::erc20::erc20::ERC20Component::Event",
-          kind: "enum",
-          variants: [
-            {
-              name: "Transfer",
-              type: "openzeppelin::token::erc20::erc20::ERC20Component::Transfer",
-              kind: "nested",
-            },
-            {
-              name: "Approval",
-              type: "openzeppelin::token::erc20::erc20::ERC20Component::Approval",
-              kind: "nested",
-            },
-          ],
-        },
-        {
-          type: "event",
-          name: "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferred",
-          kind: "struct",
-          members: [
-            {
-              name: "previous_owner",
-              type: "core::starknet::contract_address::ContractAddress",
-              kind: "data",
-            },
-            {
-              name: "new_owner",
-              type: "core::starknet::contract_address::ContractAddress",
-              kind: "data",
-            },
-          ],
-        },
-        {
-          type: "event",
-          name: "openzeppelin::access::ownable::ownable::OwnableComponent::Event",
-          kind: "enum",
-          variants: [
-            {
-              name: "OwnershipTransferred",
-              type: "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferred",
-              kind: "nested",
-            },
-          ],
-        },
-        {
-          type: "event",
-          name: "openzeppelin::presets::erc20::ERC20::Event",
-          kind: "enum",
-          variants: [
-            {
-              name: "ERC20Event",
-              type: "openzeppelin::token::erc20::erc20::ERC20Component::Event",
-              kind: "flat",
-            },
-            {
-              name: "OwnableEvent",
-              type: "openzeppelin::access::ownable::ownable::OwnableComponent::Event",
-              kind: "flat",
-            },
-          ],
-        },
-      ],
-    },
-    vStrk: {
-      address: VSTRK_ADDRESS,
-      classHash: VSTRK_CLASS_HASH,
-      abi: VSTRK_ABI,
-    },
-  },
-  mainnet: {
-    vStrk: {
-      address: VSTRK_ADDRESS,
-      classHash: VSTRK_CLASS_HASH,
-      abi: VSTRK_ABI,
-    },
-  },
-} as const;
+const configExternalContracts = {} as const;
 
 export default configExternalContracts;
diff --git a/packages/nextjs/utils/vesu/constants.ts b/packages/nextjs/utils/vesu/constants.ts
deleted file mode 100644
index cce8dc5..0000000
--- a/packages/nextjs/utils/vesu/constants.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { vTokenAbi } from "./vTokenAbi";
-
-export const VSTRK_ADDRESS =
-  "0x0147ae3337b168ac9abe80a7214f0cb9e874b25c3db530a8e04beb98a134e07a" as const;
-
-export const VSTRK_CLASS_HASH =
-  "0x035c58475afe0f44fa5267ffee18facd535ae5bb64085035369d07ce2b3afb4d" as const;
-
-export const VSTRK_ABI = vTokenAbi;
diff --git a/packages/nextjs/utils/vesu/vTokenAbi.ts b/packages/nextjs/utils/vesu/vTokenAbi.ts
deleted file mode 100644
index 9947413..0000000
--- a/packages/nextjs/utils/vesu/vTokenAbi.ts
+++ /dev/null
@@ -1,780 +0,0 @@
-export const vTokenAbi = [
-  {
-    name: "VToken",
-    type: "impl",
-    interface_name: "vesu::v_token::IVToken",
-  },
-  {
-    name: "core::integer::u256",
-    type: "struct",
-    members: [
-      {
-        name: "low",
-        type: "core::integer::u128",
-      },
-      {
-        name: "high",
-        type: "core::integer::u128",
-      },
-    ],
-  },
-  {
-    name: "core::bool",
-    type: "enum",
-    variants: [
-      {
-        name: "False",
-        type: "()",
-      },
-      {
-        name: "True",
-        type: "()",
-      },
-    ],
-  },
-  {
-    name: "vesu::v_token::IVToken",
-    type: "interface",
-    items: [
-      {
-        name: "extension",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "approve_extension",
-        type: "function",
-        inputs: [],
-        outputs: [],
-        state_mutability: "external",
-      },
-      {
-        name: "mint_v_token",
-        type: "function",
-        inputs: [
-          {
-            name: "recipient",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "amount",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::bool",
-          },
-        ],
-        state_mutability: "external",
-      },
-      {
-        name: "burn_v_token",
-        type: "function",
-        inputs: [
-          {
-            name: "from",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "amount",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::bool",
-          },
-        ],
-        state_mutability: "external",
-      },
-    ],
-  },
-  {
-    name: "IERC4626",
-    type: "impl",
-    interface_name: "vesu::v_token::IERC4626",
-  },
-  {
-    name: "vesu::v_token::IERC4626",
-    type: "interface",
-    items: [
-      {
-        name: "asset",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "total_assets",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "convert_to_shares",
-        type: "function",
-        inputs: [
-          {
-            name: "assets",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "convert_to_assets",
-        type: "function",
-        inputs: [
-          {
-            name: "shares",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "max_deposit",
-        type: "function",
-        inputs: [
-          {
-            name: "receiver",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "preview_deposit",
-        type: "function",
-        inputs: [
-          {
-            name: "assets",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "deposit",
-        type: "function",
-        inputs: [
-          {
-            name: "assets",
-            type: "core::integer::u256",
-          },
-          {
-            name: "receiver",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "external",
-      },
-      {
-        name: "max_mint",
-        type: "function",
-        inputs: [
-          {
-            name: "receiver",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "preview_mint",
-        type: "function",
-        inputs: [
-          {
-            name: "shares",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "mint",
-        type: "function",
-        inputs: [
-          {
-            name: "shares",
-            type: "core::integer::u256",
-          },
-          {
-            name: "receiver",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "external",
-      },
-      {
-        name: "max_withdraw",
-        type: "function",
-        inputs: [
-          {
-            name: "owner",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "preview_withdraw",
-        type: "function",
-        inputs: [
-          {
-            name: "assets",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "withdraw",
-        type: "function",
-        inputs: [
-          {
-            name: "assets",
-            type: "core::integer::u256",
-          },
-          {
-            name: "receiver",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "owner",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "external",
-      },
-      {
-        name: "max_redeem",
-        type: "function",
-        inputs: [
-          {
-            name: "owner",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "preview_redeem",
-        type: "function",
-        inputs: [
-          {
-            name: "shares",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "redeem",
-        type: "function",
-        inputs: [
-          {
-            name: "shares",
-            type: "core::integer::u256",
-          },
-          {
-            name: "receiver",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "owner",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "external",
-      },
-    ],
-  },
-  {
-    name: "ERC20Impl",
-    type: "impl",
-    interface_name: "vesu::vendor::erc20::IERC20",
-  },
-  {
-    name: "vesu::vendor::erc20::IERC20",
-    type: "interface",
-    items: [
-      {
-        name: "total_supply",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "balance_of",
-        type: "function",
-        inputs: [
-          {
-            name: "account",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "allowance",
-        type: "function",
-        inputs: [
-          {
-            name: "owner",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "spender",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "transfer",
-        type: "function",
-        inputs: [
-          {
-            name: "recipient",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "amount",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::bool",
-          },
-        ],
-        state_mutability: "external",
-      },
-      {
-        name: "transfer_from",
-        type: "function",
-        inputs: [
-          {
-            name: "sender",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "recipient",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "amount",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::bool",
-          },
-        ],
-        state_mutability: "external",
-      },
-      {
-        name: "approve",
-        type: "function",
-        inputs: [
-          {
-            name: "spender",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "amount",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::bool",
-          },
-        ],
-        state_mutability: "external",
-      },
-    ],
-  },
-  {
-    name: "ERC20MetadataImpl",
-    type: "impl",
-    interface_name: "vesu::vendor::erc20::IERC20Metadata",
-  },
-  {
-    name: "vesu::vendor::erc20::IERC20Metadata",
-    type: "interface",
-    items: [
-      {
-        name: "name",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::felt252",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "symbol",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::felt252",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "decimals",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::integer::u8",
-          },
-        ],
-        state_mutability: "view",
-      },
-    ],
-  },
-  {
-    name: "ERC20CamelOnlyImpl",
-    type: "impl",
-    interface_name: "vesu::vendor::erc20::IERC20CamelOnly",
-  },
-  {
-    name: "vesu::vendor::erc20::IERC20CamelOnly",
-    type: "interface",
-    items: [
-      {
-        name: "totalSupply",
-        type: "function",
-        inputs: [],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "balanceOf",
-        type: "function",
-        inputs: [
-          {
-            name: "account",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::integer::u256",
-          },
-        ],
-        state_mutability: "view",
-      },
-      {
-        name: "transferFrom",
-        type: "function",
-        inputs: [
-          {
-            name: "sender",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "recipient",
-            type: "core::starknet::contract_address::ContractAddress",
-          },
-          {
-            name: "amount",
-            type: "core::integer::u256",
-          },
-        ],
-        outputs: [
-          {
-            type: "core::bool",
-          },
-        ],
-        state_mutability: "external",
-      },
-    ],
-  },
-  {
-    name: "constructor",
-    type: "constructor",
-    inputs: [
-      {
-        name: "name",
-        type: "core::felt252",
-      },
-      {
-        name: "symbol",
-        type: "core::felt252",
-      },
-      {
-        name: "decimals",
-        type: "core::integer::u8",
-      },
-      {
-        name: "pool_id",
-        type: "core::felt252",
-      },
-      {
-        name: "extension",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        name: "asset",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-    ],
-  },
-  {
-    kind: "struct",
-    name: "vesu::vendor::erc20_component::ERC20Component::Transfer",
-    type: "event",
-    members: [
-      {
-        kind: "key",
-        name: "from",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "key",
-        name: "to",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "data",
-        name: "value",
-        type: "core::integer::u256",
-      },
-    ],
-  },
-  {
-    kind: "struct",
-    name: "vesu::vendor::erc20_component::ERC20Component::Approval",
-    type: "event",
-    members: [
-      {
-        kind: "key",
-        name: "owner",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "key",
-        name: "spender",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "data",
-        name: "value",
-        type: "core::integer::u256",
-      },
-    ],
-  },
-  {
-    kind: "enum",
-    name: "vesu::vendor::erc20_component::ERC20Component::Event",
-    type: "event",
-    variants: [
-      {
-        kind: "nested",
-        name: "Transfer",
-        type: "vesu::vendor::erc20_component::ERC20Component::Transfer",
-      },
-      {
-        kind: "nested",
-        name: "Approval",
-        type: "vesu::vendor::erc20_component::ERC20Component::Approval",
-      },
-    ],
-  },
-  {
-    kind: "struct",
-    name: "vesu::v_token::VToken::Deposit",
-    type: "event",
-    members: [
-      {
-        kind: "key",
-        name: "sender",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "key",
-        name: "owner",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "data",
-        name: "assets",
-        type: "core::integer::u256",
-      },
-      {
-        kind: "data",
-        name: "shares",
-        type: "core::integer::u256",
-      },
-    ],
-  },
-  {
-    kind: "struct",
-    name: "vesu::v_token::VToken::Withdraw",
-    type: "event",
-    members: [
-      {
-        kind: "key",
-        name: "sender",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "key",
-        name: "receiver",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "key",
-        name: "owner",
-        type: "core::starknet::contract_address::ContractAddress",
-      },
-      {
-        kind: "data",
-        name: "assets",
-        type: "core::integer::u256",
-      },
-      {
-        kind: "data",
-        name: "shares",
-        type: "core::integer::u256",
-      },
-    ],
-  },
-  {
-    kind: "enum",
-    name: "vesu::v_token::VToken::Event",
-    type: "event",
-    variants: [
-      {
-        kind: "flat",
-        name: "ERC20Event",
-        type: "vesu::vendor::erc20_component::ERC20Component::Event",
-      },
-      {
-        kind: "nested",
-        name: "Deposit",
-        type: "vesu::v_token::VToken::Deposit",
-      },
-      {
-        kind: "nested",
-        name: "Withdraw",
-        type: "vesu::v_token::VToken::Withdraw",
-      },
-    ],
-  },
-] as const;

From da645e2b4f026f3f7cb251cd1d2f32c02dc0ef9e Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sat, 18 Oct 2025 17:46:25 +0700
Subject: [PATCH 05/12] chore: revert back to your-contract from step-2

---
 .../contracts/src/your_contract.cairo         | 129 +++++++++++++-----
 .../contracts/tests/test_contract.cairo       |  46 +++++--
 2 files changed, 135 insertions(+), 40 deletions(-)

diff --git a/packages/snfoundry/contracts/src/your_contract.cairo b/packages/snfoundry/contracts/src/your_contract.cairo
index a6ea14f..5f57eb6 100644
--- a/packages/snfoundry/contracts/src/your_contract.cairo
+++ b/packages/snfoundry/contracts/src/your_contract.cairo
@@ -1,9 +1,17 @@
+use starknet::ContractAddress;
+
 #[starknet::interface]
 pub trait IYourContract<TContractState> {
     fn greeting(self: @TContractState) -> ByteArray;
-    fn set_greeting(ref self: TContractState, new_greeting: ByteArray, amount_strk: Option<u256>);
+    fn set_greeting(
+        ref self: TContractState,
+        new_greeting: ByteArray,
+        option_amount: Option<u256>,
+        option_token: Option<ContractAddress>,
+    );
     fn withdraw(ref self: TContractState);
     fn premium(self: @TContractState) -> bool;
+    fn token_deposits(self: @TContractState, token: ContractAddress) -> u256;
 }
 
 #[starknet::contract]
@@ -23,6 +31,8 @@ pub mod YourContract {
     impl OwnableImpl = OwnableComponent::OwnableImpl<ContractState>;
     impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;
 
+    pub const FELT_ETH_CONTRACT: felt252 =
+        0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7;
     pub const FELT_STRK_CONTRACT: felt252 =
         0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d;
 
@@ -42,6 +52,7 @@ pub mod YourContract {
         new_greeting: ByteArray,
         premium: bool,
         value: Option<u256>,
+        token: Option<ContractAddress>,
     }
 
     #[storage]
@@ -50,6 +61,7 @@ pub mod YourContract {
         premium: bool,
         total_counter: u256,
         user_greeting_counter: Map<ContractAddress, u256>,
+        token_deposits: Map<ContractAddress, u256>,
         #[substorage(v0)]
         ownable: OwnableComponent::Storage,
     }
@@ -65,53 +77,106 @@ pub mod YourContract {
         fn greeting(self: @ContractState) -> ByteArray {
             self.greeting.read()
         }
+
         fn set_greeting(
-            ref self: ContractState, new_greeting: ByteArray, amount_strk: Option<u256>,
+            ref self: ContractState,
+            new_greeting: ByteArray,
+            option_amount: Option<u256>,
+            option_token: Option<ContractAddress>,
         ) {
+            self._require_supported_token(option_token);
             self.greeting.write(new_greeting);
             self.total_counter.write(self.total_counter.read() + 1);
             let user_counter = self.user_greeting_counter.read(get_caller_address());
             self.user_greeting_counter.write(get_caller_address(), user_counter + 1);
 
-            match amount_strk {
-                Option::Some(amount_strk) => {
-                    // In `Debug Contract` or UI implementation, call `approve` on STRK contract
-                    // before invoking fn set_greeting()
-                    if amount_strk > 0 {
-                        let strk_contract_address: ContractAddress = FELT_STRK_CONTRACT
-                            .try_into()
-                            .unwrap();
-                        let strk_dispatcher = IERC20Dispatcher {
-                            contract_address: strk_contract_address,
-                        };
-                        strk_dispatcher
-                            .transfer_from(
-                                get_caller_address(), get_contract_address(), amount_strk,
-                            );
+            match (option_amount, option_token) {
+                (
+                    Option::Some(amount), Option::Some(token),
+                ) => {
+                    if amount > 0 {
+                        self
+                            ._get_token_dispatcher(token)
+                            .transfer_from(get_caller_address(), get_contract_address(), amount);
                         self.premium.write(true);
+                        self.token_deposits.write(token, self.token_deposits.read(token) + amount);
+                        self
+                            .emit(
+                                GreetingChanged {
+                                    greeting_setter: get_caller_address(),
+                                    new_greeting: self.greeting.read(),
+                                    premium: true,
+                                    value: Option::Some(amount),
+                                    token: Option::Some(token),
+                                },
+                            );
+                    } else {
+                        panic!("Amount must be greater than 0");
                     }
                 },
-                Option::None => { self.premium.write(false); },
+                (
+                    Option::None, Option::None,
+                ) => {
+                    self.premium.write(false);
+                    self
+                        .emit(
+                            GreetingChanged {
+                                greeting_setter: get_caller_address(),
+                                new_greeting: self.greeting.read(),
+                                premium: false,
+                                value: Option::None,
+                                token: Option::None,
+                            },
+                        );
+                },
+                _ => { panic!("Unreachable"); },
             }
-            self
-                .emit(
-                    GreetingChanged {
-                        greeting_setter: get_caller_address(),
-                        new_greeting: self.greeting.read(),
-                        premium: self.premium.read(),
-                        value: amount_strk,
-                    },
-                );
         }
+        fn premium(self: @ContractState) -> bool {
+            self.premium.read()
+        }
+
+        fn token_deposits(self: @ContractState, token: ContractAddress) -> u256 {
+            self.token_deposits.read(token)
+        }
+
         fn withdraw(ref self: ContractState) {
             self.ownable.assert_only_owner();
+            let eth_contract_address = FELT_ETH_CONTRACT.try_into().unwrap();
             let strk_contract_address = FELT_STRK_CONTRACT.try_into().unwrap();
-            let strk_dispatcher = IERC20Dispatcher { contract_address: strk_contract_address };
-            let balance = strk_dispatcher.balance_of(get_contract_address());
-            strk_dispatcher.transfer(self.ownable.owner(), balance);
+
+            let eth_dispatcher = self._get_token_dispatcher(eth_contract_address);
+            let strk_dispatcher = self._get_token_dispatcher(strk_contract_address);
+
+            let eth_balance = eth_dispatcher.balance_of(get_contract_address());
+            let strk_balance = strk_dispatcher.balance_of(get_contract_address());
+
+            eth_dispatcher.transfer(self.ownable.owner(), eth_balance);
+            strk_dispatcher.transfer(self.ownable.owner(), strk_balance);
+
+            self.token_deposits.write(eth_contract_address, 0);
+            self.token_deposits.write(strk_contract_address, 0);
         }
-        fn premium(self: @ContractState) -> bool {
-            self.premium.read()
+    }
+    // internal
+    #[generate_trait]
+    impl InternalImpl of InternalTrait {
+        fn _get_token_dispatcher(
+            ref self: ContractState, token: ContractAddress,
+        ) -> IERC20Dispatcher {
+            return IERC20Dispatcher { contract_address: token };
+        }
+
+        fn _require_supported_token(
+            ref self: ContractState, option_token: Option<ContractAddress>,
+        ) {
+            if let Option::Some(token) = option_token {
+                assert(
+                    token == FELT_STRK_CONTRACT.try_into().unwrap()
+                        || token == FELT_ETH_CONTRACT.try_into().unwrap(),
+                    'Unsupported token',
+                );
+            }
         }
     }
 }
diff --git a/packages/snfoundry/contracts/tests/test_contract.cairo b/packages/snfoundry/contracts/tests/test_contract.cairo
index e5a30f0..adb082b 100644
--- a/packages/snfoundry/contracts/tests/test_contract.cairo
+++ b/packages/snfoundry/contracts/tests/test_contract.cairo
@@ -1,4 +1,4 @@
-use contracts::your_contract::YourContract::FELT_STRK_CONTRACT;
+use contracts::your_contract::YourContract::{FELT_ETH_CONTRACT, FELT_STRK_CONTRACT};
 use contracts::your_contract::{IYourContractDispatcher, IYourContractDispatcherTrait};
 use openzeppelin_testing::declare_and_deploy;
 use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
@@ -12,7 +12,7 @@ const OWNER: ContractAddress = 0x02dA5254690b46B9C4059C25366D1778839BE63C142d899
     .unwrap();
 
 const STRK_TOKEN_CONTRACT_ADDRESS: ContractAddress = FELT_STRK_CONTRACT.try_into().unwrap();
-
+const ETH_TOKEN_CONTRACT_ADDRESS: ContractAddress = FELT_ETH_CONTRACT.try_into().unwrap();
 fn deploy_contract(name: ByteArray) -> ContractAddress {
     let mut calldata = array![];
     calldata.append_serde(OWNER);
@@ -30,22 +30,23 @@ fn test_set_greetings() {
     assert(current_greeting == expected_greeting, 'Should have the right message');
 
     let new_greeting: ByteArray = "Learn Scaffold-Stark 2! :)";
-    dispatcher.set_greeting(new_greeting.clone(), Option::None); // we don't transfer any strk
+    dispatcher
+        .set_greeting(new_greeting.clone(), Option::None, Option::None); // we dont transfer any eth
     assert(dispatcher.greeting() == new_greeting, 'Should allow set new message');
 }
 
 #[test]
 #[fork("SEPOLIA_LATEST")]
-fn test_transfer() {
-    let user = OWNER;
+fn test_transfer_eth() {
+    let user: ContractAddress = OWNER.try_into().unwrap();
     let your_contract_address = deploy_contract("YourContract");
 
     let your_contract_dispatcher = IYourContractDispatcher {
         contract_address: your_contract_address,
     };
-    let erc20_dispatcher = IERC20Dispatcher { contract_address: STRK_TOKEN_CONTRACT_ADDRESS };
+    let erc20_dispatcher = IERC20Dispatcher { contract_address: ETH_TOKEN_CONTRACT_ADDRESS };
     let amount_to_transfer = 500;
-    cheat_caller_address(STRK_TOKEN_CONTRACT_ADDRESS, user, CheatSpan::TargetCalls(1));
+    cheat_caller_address(ETH_TOKEN_CONTRACT_ADDRESS, user, CheatSpan::TargetCalls(1));
     erc20_dispatcher.approve(your_contract_address, amount_to_transfer);
     let approved_amount = erc20_dispatcher.allowance(user, your_contract_address);
     assert(approved_amount == amount_to_transfer, 'Not the right amount approved');
@@ -55,7 +56,36 @@ fn test_transfer() {
     cheat_caller_address(your_contract_address, user, CheatSpan::TargetCalls(1));
     your_contract_dispatcher
         .set_greeting(
-            new_greeting.clone(), Option::Some(amount_to_transfer),
+            new_greeting.clone(),
+            Option::Some(amount_to_transfer),
+            Option::Some(ETH_TOKEN_CONTRACT_ADDRESS),
         ); // we transfer 500 wei
     assert(your_contract_dispatcher.greeting() == new_greeting, 'Should allow set new message');
 }
+
+#[test]
+#[fork("SEPOLIA_LATEST")]
+fn test_transfer_strk() {
+    let user: ContractAddress = OWNER.try_into().unwrap();
+    let your_contract_address = deploy_contract("YourContract");
+
+    let your_contract_dispatcher = IYourContractDispatcher {
+        contract_address: your_contract_address,
+    };
+    let erc20_dispatcher = IERC20Dispatcher { contract_address: STRK_TOKEN_CONTRACT_ADDRESS };
+    let amount_to_transfer = 500;
+    cheat_caller_address(STRK_TOKEN_CONTRACT_ADDRESS, user, CheatSpan::TargetCalls(1));
+    erc20_dispatcher.approve(your_contract_address, amount_to_transfer);
+    let approved_amount = erc20_dispatcher.allowance(user, your_contract_address);
+    assert(approved_amount == amount_to_transfer, 'Not the right amount approved');
+
+    let new_greeting: ByteArray = "Learn How to handle Some and None in Cairo";
+    cheat_caller_address(your_contract_address, user, CheatSpan::TargetCalls(1));
+    your_contract_dispatcher
+        .set_greeting(
+            new_greeting.clone(),
+            Option::Some(amount_to_transfer),
+            Option::Some(STRK_TOKEN_CONTRACT_ADDRESS),
+        ); // we transfer 500 fri/wei
+    assert(your_contract_dispatcher.greeting() == new_greeting, 'Should allow set new message');
+}

From 425672b24e78aa42921466529af4bf1695d3e041 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sat, 18 Oct 2025 17:46:33 +0700
Subject: [PATCH 06/12] chore: revert Eth contract in externalContracts

---
 .../contracts/configExternalContracts.ts      | 391 +++++++++++++++++-
 1 file changed, 390 insertions(+), 1 deletion(-)

diff --git a/packages/nextjs/contracts/configExternalContracts.ts b/packages/nextjs/contracts/configExternalContracts.ts
index 0746fb6..a011b38 100644
--- a/packages/nextjs/contracts/configExternalContracts.ts
+++ b/packages/nextjs/contracts/configExternalContracts.ts
@@ -3,6 +3,395 @@
  * You should not edit it manually or your changes might be overwritten.
  */
 
-const configExternalContracts = {} as const;
+const configExternalContracts = {
+  devnet: {
+    Eth: {
+      address:
+        "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
+      classHash:
+        "0x46ded64ae2dead6448e247234bab192a9c483644395b66f2155f2614e5804b0",
+      abi: [
+        {
+          type: "struct",
+          name: "core::integer::u256",
+          members: [
+            { name: "low", type: "core::integer::u128" },
+            { name: "high", type: "core::integer::u128" },
+          ],
+        },
+        {
+          type: "function",
+          name: "mint",
+          inputs: [
+            {
+              name: "recipient",
+              type: "core::starknet::contract_address::ContractAddress",
+            },
+            { name: "amount", type: "core::integer::u256" },
+          ],
+          outputs: [],
+          state_mutability: "external",
+        },
+        {
+          type: "impl",
+          name: "ERC20MetadataImpl",
+          interface_name:
+            "openzeppelin::token::erc20::interface::IERC20Metadata",
+        },
+        {
+          type: "interface",
+          name: "openzeppelin::token::erc20::interface::IERC20Metadata",
+          items: [
+            {
+              type: "function",
+              name: "name",
+              inputs: [],
+              outputs: [{ type: "core::felt252" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "symbol",
+              inputs: [],
+              outputs: [{ type: "core::felt252" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "decimals",
+              inputs: [],
+              outputs: [{ type: "core::integer::u8" }],
+              state_mutability: "view",
+            },
+          ],
+        },
+        {
+          type: "impl",
+          name: "ERC20Impl",
+          interface_name: "openzeppelin::token::erc20::interface::IERC20",
+        },
+        {
+          type: "enum",
+          name: "core::bool",
+          variants: [
+            { name: "False", type: "()" },
+            { name: "True", type: "()" },
+          ],
+        },
+        {
+          type: "interface",
+          name: "openzeppelin::token::erc20::interface::IERC20",
+          items: [
+            {
+              type: "function",
+              name: "total_supply",
+              inputs: [],
+              outputs: [{ type: "core::integer::u256" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "balance_of",
+              inputs: [
+                {
+                  name: "account",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [{ type: "core::integer::u256" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "allowance",
+              inputs: [
+                {
+                  name: "owner",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                {
+                  name: "spender",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [{ type: "core::integer::u256" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "transfer",
+              inputs: [
+                {
+                  name: "recipient",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                { name: "amount", type: "core::integer::u256" },
+              ],
+              outputs: [{ type: "core::bool" }],
+              state_mutability: "external",
+            },
+            {
+              type: "function",
+              name: "transfer_from",
+              inputs: [
+                {
+                  name: "sender",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                {
+                  name: "recipient",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                { name: "amount", type: "core::integer::u256" },
+              ],
+              outputs: [{ type: "core::bool" }],
+              state_mutability: "external",
+            },
+            {
+              type: "function",
+              name: "approve",
+              inputs: [
+                {
+                  name: "spender",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                { name: "amount", type: "core::integer::u256" },
+              ],
+              outputs: [{ type: "core::bool" }],
+              state_mutability: "external",
+            },
+          ],
+        },
+        {
+          type: "impl",
+          name: "ERC20CamelOnlyImpl",
+          interface_name:
+            "openzeppelin::token::erc20::interface::IERC20CamelOnly",
+        },
+        {
+          type: "interface",
+          name: "openzeppelin::token::erc20::interface::IERC20CamelOnly",
+          items: [
+            {
+              type: "function",
+              name: "totalSupply",
+              inputs: [],
+              outputs: [{ type: "core::integer::u256" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "balanceOf",
+              inputs: [
+                {
+                  name: "account",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [{ type: "core::integer::u256" }],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "transferFrom",
+              inputs: [
+                {
+                  name: "sender",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                {
+                  name: "recipient",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+                { name: "amount", type: "core::integer::u256" },
+              ],
+              outputs: [{ type: "core::bool" }],
+              state_mutability: "external",
+            },
+          ],
+        },
+        {
+          type: "impl",
+          name: "OwnableImpl",
+          interface_name: "openzeppelin::access::ownable::interface::IOwnable",
+        },
+        {
+          type: "interface",
+          name: "openzeppelin::access::ownable::interface::IOwnable",
+          items: [
+            {
+              type: "function",
+              name: "owner",
+              inputs: [],
+              outputs: [
+                { type: "core::starknet::contract_address::ContractAddress" },
+              ],
+              state_mutability: "view",
+            },
+            {
+              type: "function",
+              name: "transfer_ownership",
+              inputs: [
+                {
+                  name: "new_owner",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [],
+              state_mutability: "external",
+            },
+            {
+              type: "function",
+              name: "renounce_ownership",
+              inputs: [],
+              outputs: [],
+              state_mutability: "external",
+            },
+          ],
+        },
+        {
+          type: "impl",
+          name: "OwnableCamelOnlyImpl",
+          interface_name:
+            "openzeppelin::access::ownable::interface::IOwnableCamelOnly",
+        },
+        {
+          type: "interface",
+          name: "openzeppelin::access::ownable::interface::IOwnableCamelOnly",
+          items: [
+            {
+              type: "function",
+              name: "transferOwnership",
+              inputs: [
+                {
+                  name: "newOwner",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [],
+              state_mutability: "external",
+            },
+            {
+              type: "function",
+              name: "renounceOwnership",
+              inputs: [],
+              outputs: [],
+              state_mutability: "external",
+            },
+          ],
+        },
+        {
+          type: "constructor",
+          name: "constructor",
+          inputs: [
+            {
+              name: "owner",
+              type: "core::starknet::contract_address::ContractAddress",
+            },
+          ],
+        },
+        {
+          type: "event",
+          name: "openzeppelin::token::erc20::erc20::ERC20Component::Transfer",
+          kind: "struct",
+          members: [
+            {
+              name: "from",
+              type: "core::starknet::contract_address::ContractAddress",
+              kind: "key",
+            },
+            {
+              name: "to",
+              type: "core::starknet::contract_address::ContractAddress",
+              kind: "key",
+            },
+            { name: "value", type: "core::integer::u256", kind: "data" },
+          ],
+        },
+        {
+          type: "event",
+          name: "openzeppelin::token::erc20::erc20::ERC20Component::Approval",
+          kind: "struct",
+          members: [
+            {
+              name: "owner",
+              type: "core::starknet::contract_address::ContractAddress",
+              kind: "data",
+            },
+            {
+              name: "spender",
+              type: "core::starknet::contract_address::ContractAddress",
+              kind: "data",
+            },
+            { name: "value", type: "core::integer::u256", kind: "data" },
+          ],
+        },
+        {
+          type: "event",
+          name: "openzeppelin::token::erc20::erc20::ERC20Component::Event",
+          kind: "enum",
+          variants: [
+            {
+              name: "Transfer",
+              type: "openzeppelin::token::erc20::erc20::ERC20Component::Transfer",
+              kind: "nested",
+            },
+            {
+              name: "Approval",
+              type: "openzeppelin::token::erc20::erc20::ERC20Component::Approval",
+              kind: "nested",
+            },
+          ],
+        },
+        {
+          type: "event",
+          name: "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferred",
+          kind: "struct",
+          members: [
+            {
+              name: "previous_owner",
+              type: "core::starknet::contract_address::ContractAddress",
+              kind: "data",
+            },
+            {
+              name: "new_owner",
+              type: "core::starknet::contract_address::ContractAddress",
+              kind: "data",
+            },
+          ],
+        },
+        {
+          type: "event",
+          name: "openzeppelin::access::ownable::ownable::OwnableComponent::Event",
+          kind: "enum",
+          variants: [
+            {
+              name: "OwnershipTransferred",
+              type: "openzeppelin::access::ownable::ownable::OwnableComponent::OwnershipTransferred",
+              kind: "nested",
+            },
+          ],
+        },
+        {
+          type: "event",
+          name: "openzeppelin::presets::erc20::ERC20::Event",
+          kind: "enum",
+          variants: [
+            {
+              name: "ERC20Event",
+              type: "openzeppelin::token::erc20::erc20::ERC20Component::Event",
+              kind: "flat",
+            },
+            {
+              name: "OwnableEvent",
+              type: "openzeppelin::access::ownable::ownable::OwnableComponent::Event",
+              kind: "flat",
+            },
+          ],
+        },
+      ],
+    },
+  },
+} as const;
 
 export default configExternalContracts;

From f73b87d458c35d6da92459d8fcff1055907afe27 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sat, 18 Oct 2025 17:47:28 +0700
Subject: [PATCH 07/12] chore: remove instruction in page

---
 packages/nextjs/app/page.tsx | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx
index 51cec20..66d76b4 100644
--- a/packages/nextjs/app/page.tsx
+++ b/packages/nextjs/app/page.tsx
@@ -92,41 +92,6 @@ const Home = () => {
           </div>
         </h1>
         <ConnectedAddress />
-        <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg mb-8">
-          <h2 className="text-2xl font-bold mb-3 text-secondary">
-            Instructions
-          </h2>
-          <div className="text-lg">
-            <div className="flex items-center gap-3">
-              <span className="badge badge-primary badge-lg">1</span>
-              <p>
-                Run mainnet fork:{" "}
-                <code className="bg-base-200 px-2 py-1 rounded text-sm">
-                  yarn chain --fork-network
-                  https://starknet-mainnet.public.blastapi.io/rpc/v0_9
-                </code>
-              </p>
-            </div>
-            <div className="flex items-center gap-3">
-              <span className="badge badge-primary badge-lg">2</span>
-              <p>
-                To deposit or withdraw a Vesu token, you will need to interact
-                with a "vToken", we will take vSTRK to interact.
-              </p>
-            </div>
-            <div className="flex items-center gap-3">
-              <span className="badge badge-primary badge-lg">3</span>
-              <p>
-                Now let click to the "Configure Contracts" button on the bottom
-                left corner to download vStrk configures at address{" "}
-                <code className="bg-base-200 px-2 py-1 rounded text-sm">
-                  0x0147ae3337b168ac9abe80a7214f0cb9e874b25c3db530a8e04beb98a134e07a
-                </code>{" "}
-                and name vStrk
-              </p>
-            </div>
-          </div>
-        </div>
         <div className="mt-8 space-y-6">
           {/* Contract Status removed for Vesu demo */}
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">

From 3de7a87773a40c80c9713183f306de9a13358e06 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sat, 18 Oct 2025 17:50:37 +0700
Subject: [PATCH 08/12] docs: Replace zklend with Vesu

---
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index ad56d42..7039700 100644
--- a/README.md
+++ b/README.md
@@ -47,14 +47,13 @@ The tutorial is divided into the following steps:
 - At this point the user should be able to send STRK and ETH to the contract through our UI and see the events logged at the bottom.
 - [View changes from step-1 to step-2](https://github.com/Scaffold-Stark/basecamp/compare/step-1...step-2)
 
-**Step 3: Full zklend Integration** ([branch: step-3](https://github.com/Scaffold-Stark/basecamp/tree/step-3))
+**Step 3: Full Vesu Integration** ([branch: step-3](https://github.com/Scaffold-Stark/basecamp/tree/step-3))
 
-- Updates [`YourContract.cairo`](https://github.com/Scaffold-Stark/basecamp/blob/step-3/packages/snfoundry/contracts/src/YourContract.cairo) with [zklend](https://app.zklend.com/markets) integration
-- All the STRK and ETH deposits are now sent to zklend for yield farming
-- Introduces development on mainnet fork. Can follow scaffold-stark [docs](https://scaffoldstark.com/docs/recipes/DevelopingOnFork) to run and interact with a local fork of Starknet mainnet.
+- Introduces development on mainnet fork. Run mainnet fork: `yarn chain --fork-network https://starknet-mainnet.public.blastapi.io/rpc/v0_9`. Can follow scaffold-stark [docs](https://scaffoldstark.com/docs/recipes/DevelopingOnFork) to run and interact with a local fork of Starknet mainnet.
+- To deposit or withdraw a Vesu token, you will need to interact with a "vToken", we will take vSTRK to interact
+- Use `Configure Contracts` tool to to download Vesu vStrk configures at address `0x0147ae3337b168ac9abe80a7214f0cb9e874b25c3db530a8e04beb98a134e07a` and name vStrk
 - Minor `page.tsx` and `scaffold.config.ts` updates to support mainnetFork testing
 - Includes mainnet deployment steps
-- Users can send STRK or ETH along with a greeting, these deposits will generate yield from first second onwards, owner can withdraw the yield anytime. User can connect with `burner wallet` to interact with the contract on Starknet mainnet fork.
 - [View changes from step-2 to step-3](https://github.com/Scaffold-Stark/basecamp/compare/step-2...step-3)
 
 Each step builds upon the previous one, introducing new concepts and features while maintaining a clean, production-ready codebase.

From b88cb356acb16243982c82f43cf8394c74bda85e Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sat, 18 Oct 2025 18:11:29 +0700
Subject: [PATCH 09/12] chore: revert deployed contract abi

---
 .../nextjs/contracts/deployedContracts.ts     | 86 ++++++++++++++++++-
 1 file changed, 82 insertions(+), 4 deletions(-)

diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
index 7abef3b..e8353e3 100644
--- a/packages/nextjs/contracts/deployedContracts.ts
+++ b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,7 +7,7 @@ const deployedContracts = {
   devnet: {
     YourContract: {
       address:
-        "0x3760a55e55c5d737d14e527c4c09c5b828f5476fd6f9b7148482ec4185afa17",
+        "0x3d0a8a77f45d5e0f52fc3f4734985ce57795caaaf23181eaa35aed377f01184",
       abi: [
         {
           type: "impl",
@@ -60,6 +60,20 @@ const deployedContracts = {
             },
           ],
         },
+        {
+          type: "enum",
+          name: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
+          variants: [
+            {
+              name: "Some",
+              type: "core::starknet::contract_address::ContractAddress",
+            },
+            {
+              name: "None",
+              type: "()",
+            },
+          ],
+        },
         {
           type: "enum",
           name: "core::bool",
@@ -98,9 +112,13 @@ const deployedContracts = {
                   type: "core::byte_array::ByteArray",
                 },
                 {
-                  name: "amount_strk",
+                  name: "option_amount",
                   type: "core::option::Option::<core::integer::u256>",
                 },
+                {
+                  name: "option_token",
+                  type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
+                },
               ],
               outputs: [],
               state_mutability: "external",
@@ -123,6 +141,22 @@ const deployedContracts = {
               ],
               state_mutability: "view",
             },
+            {
+              type: "function",
+              name: "token_deposits",
+              inputs: [
+                {
+                  name: "token",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [
+                {
+                  type: "core::integer::u256",
+                },
+              ],
+              state_mutability: "view",
+            },
           ],
         },
         {
@@ -252,6 +286,11 @@ const deployedContracts = {
               type: "core::option::Option::<core::integer::u256>",
               kind: "data",
             },
+            {
+              name: "token",
+              type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
+              kind: "data",
+            },
           ],
         },
         {
@@ -273,7 +312,7 @@ const deployedContracts = {
         },
       ],
       classHash:
-        "0x21e2aa81952de7b6851d5e76ea1f70283373407b22bfb4d32fafa4c5e2c8f1d",
+        "0x73b00366d0117bee7ae7620469abc7ceefb8b78ff9257b77b3531a9c4411688",
     },
   },
   sepolia: {
@@ -332,6 +371,20 @@ const deployedContracts = {
             },
           ],
         },
+        {
+          type: "enum",
+          name: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
+          variants: [
+            {
+              name: "Some",
+              type: "core::starknet::contract_address::ContractAddress",
+            },
+            {
+              name: "None",
+              type: "()",
+            },
+          ],
+        },
         {
           type: "enum",
           name: "core::bool",
@@ -370,9 +423,13 @@ const deployedContracts = {
                   type: "core::byte_array::ByteArray",
                 },
                 {
-                  name: "amount_strk",
+                  name: "option_amount",
                   type: "core::option::Option::<core::integer::u256>",
                 },
+                {
+                  name: "option_token",
+                  type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
+                },
               ],
               outputs: [],
               state_mutability: "external",
@@ -395,6 +452,22 @@ const deployedContracts = {
               ],
               state_mutability: "view",
             },
+            {
+              type: "function",
+              name: "token_deposits",
+              inputs: [
+                {
+                  name: "token",
+                  type: "core::starknet::contract_address::ContractAddress",
+                },
+              ],
+              outputs: [
+                {
+                  type: "core::integer::u256",
+                },
+              ],
+              state_mutability: "view",
+            },
           ],
         },
         {
@@ -524,6 +597,11 @@ const deployedContracts = {
               type: "core::option::Option::<core::integer::u256>",
               kind: "data",
             },
+            {
+              name: "token",
+              type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
+              kind: "data",
+            },
           ],
         },
         {

From 522d81fe4a2f4df1c943a62a055c8b80688ba39e Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sat, 18 Oct 2025 18:29:05 +0700
Subject: [PATCH 10/12] Vesu should be in another page

---
 packages/nextjs/app/page.tsx                | 425 ++++++++++++--------
 packages/nextjs/app/vesu/page.tsx           | 272 +++++++++++++
 packages/nextjs/components/Header.tsx       |   7 +
 packages/nextjs/public/vesu-symbol-icon.svg |  87 ++++
 4 files changed, 626 insertions(+), 165 deletions(-)
 create mode 100644 packages/nextjs/app/vesu/page.tsx
 create mode 100644 packages/nextjs/public/vesu-symbol-icon.svg

diff --git a/packages/nextjs/app/page.tsx b/packages/nextjs/app/page.tsx
index 66d76b4..a783b2f 100644
--- a/packages/nextjs/app/page.tsx
+++ b/packages/nextjs/app/page.tsx
@@ -3,81 +3,118 @@
 import { ConnectedAddress } from "~~/components/ConnectedAddress";
 import { useState } from "react";
 import { useScaffoldReadContract } from "~~/hooks/scaffold-stark/useScaffoldReadContract";
-import { useScaffoldMultiWriteContract } from "~~/hooks/scaffold-stark/useScaffoldMultiWriteContract";
 import { useScaffoldEventHistory } from "~~/hooks/scaffold-stark/useScaffoldEventHistory";
+import { useScaffoldMultiWriteContract } from "~~/hooks/scaffold-stark/useScaffoldMultiWriteContract";
+import { useBlockNumber } from "@starknet-react/core";
 import { useDeployedContractInfo } from "~~/hooks/scaffold-stark/useDeployedContractInfo";
 import { useScaffoldWriteContract } from "~~/hooks/scaffold-stark/useScaffoldWriteContract";
 import { useTargetNetwork } from "~~/hooks/scaffold-stark/useTargetNetwork";
-import { useAccount } from "@starknet-react/core";
-import useScaffoldStrkBalance from "~~/hooks/scaffold-stark/useScaffoldStrkBalance";
+import { CairoOption, CairoOptionVariant, BlockTag } from "starknet";
 
 const Home = () => {
+  const [selectedToken, setSelectedToken] = useState<"ETH" | "STRK">("STRK");
+  const [inputAmount, setInputAmount] = useState<bigint>(0n);
+  const [greeting, setGreeting] = useState<string>("");
   const [displayAmount, setDisplayAmount] = useState<string>("");
-  const [amountWei, setAmountWei] = useState<bigint>(0n);
+  const [isNoneOption, setIsNoneOption] = useState<boolean>(true);
 
   const { targetNetwork } = useTargetNetwork();
 
-  const { address: connectedAddress } = useAccount();
+  const { data: YourContract } = useDeployedContractInfo("YourContract");
+  const { data: EthContract } = useDeployedContractInfo("Eth");
+  const { data: StrkContract } = useDeployedContractInfo("Strk");
 
-  // vSTRK contract info
-  const { data: vStrk } = useDeployedContractInfo("vStrk");
-
-  const toHex = (v: unknown) =>
-    typeof v === "bigint" ? `0x${v.toString(16)}` : (v as string);
+  const { data: currentGreeting } = useScaffoldReadContract({
+    contractName: "YourContract",
+    functionName: "greeting",
+  });
 
-  // Deposited amount = user's vSTRK balance (shares)
-  const { data: vStrkBalance } = useScaffoldReadContract({
-    contractName: "vStrk",
-    functionName: "balance_of",
-    args: [connectedAddress],
+  const { data: premium } = useScaffoldReadContract({
+    contractName: "YourContract",
+    functionName: "premium",
   });
 
-  // Available STRK balance of user
-  const { value: availableStrk } = useScaffoldStrkBalance({
-    address: connectedAddress || undefined,
+  const { data: ethBalance } = useScaffoldReadContract({
+    contractName: "YourContract",
+    functionName: "token_deposits",
+    args: [EthContract?.address],
   });
 
-  // Redeem (withdraw) all vSTRK shares to STRK
-  const { sendAsync: redeemAll, isPending: isRedeeming } =
-    useScaffoldWriteContract({
-      contractName: "vStrk",
-      functionName: "redeem",
-      args: [vStrkBalance as any, connectedAddress, connectedAddress],
-    });
+  const { data: strkBalance } = useScaffoldReadContract({
+    contractName: "YourContract",
+    functionName: "token_deposits",
+    args: [StrkContract?.address],
+  });
 
-  // STRK-only deposit flow: approve STRK to vSTRK, then deposit assets
-  const { sendAsync: depositStrk, isPending: isDepositing } =
-    useScaffoldMultiWriteContract({
-      calls: [
-        {
-          contractName: "Strk",
-          functionName: "approve",
-          args: [vStrk?.address, amountWei],
-        },
-        {
-          contractName: "vStrk",
-          functionName: "deposit",
-          args: [amountWei, connectedAddress],
-        },
-      ],
-    });
+  const { data: lastBlock } = useBlockNumber({
+    blockIdentifier: "pending" as BlockTag,
+  });
 
-  // Event history for vSTRK Deposit and Withdraw
-  const { data: depositEvents } = useScaffoldEventHistory({
-    contractName: "vStrk",
-    eventName: "Deposit",
-    fromBlock: 1540452n, // NOTE : For now keep this block number as it is. When running local mainnet fork, use this block number as the starting block number. For example: `yarn chain --fork-network https://starknet-mainnet.public.blastapi.io/rpc/v0_9 --fork-block 1540452`
+  const { data: events } = useScaffoldEventHistory({
+    contractName: "YourContract",
+    eventName: "GreetingChanged",
+    fromBlock: lastBlock ? (lastBlock > 50n ? BigInt(lastBlock - 50) : 0n) : 0n,
     watch: true,
-    enabled: !!vStrk,
   });
-  const { data: withdrawEvents } = useScaffoldEventHistory({
-    contractName: "vStrk",
-    eventName: "Withdraw",
-    fromBlock: 1540452n,
-    watch: true,
-    enabled: !!vStrk,
+
+  const noneOptionBigInt: CairoOption<bigint> = new CairoOption(
+    CairoOptionVariant.None,
+  );
+
+  const noneOptionString: CairoOption<string> = new CairoOption(
+    CairoOptionVariant.None,
+  );
+
+  const { sendAsync: setGreetingNoPayment } = useScaffoldWriteContract({
+    contractName: "YourContract",
+    functionName: "set_greeting",
+    args: [greeting, noneOptionBigInt, noneOptionString],
+  });
+
+  const { sendAsync: withdrawAll } = useScaffoldWriteContract({
+    contractName: "YourContract",
+    functionName: "withdraw",
   });
 
+  const someOptionBigInt: CairoOption<bigint> = new CairoOption(
+    CairoOptionVariant.Some,
+    inputAmount,
+  );
+
+  // Helper function to determine the token address option
+  const getTokenAddressOption = () => {
+    if (selectedToken === "ETH" && EthContract?.address) {
+      return new CairoOption(CairoOptionVariant.Some, EthContract.address);
+    } else if (selectedToken === "STRK" && StrkContract?.address) {
+      return new CairoOption(CairoOptionVariant.Some, StrkContract.address);
+    } else {
+      return noneOptionString;
+    }
+  };
+
+  const { sendAsync: setGreetingWithPayment } = useScaffoldMultiWriteContract({
+    calls: [
+      {
+        contractName: selectedToken === "STRK" ? "Strk" : "Eth",
+        functionName: "approve",
+        args: [YourContract?.address, someOptionBigInt.unwrap()],
+      },
+      {
+        contractName: "YourContract",
+        functionName: "set_greeting",
+        args: [greeting, someOptionBigInt, getTokenAddressOption()],
+      },
+    ],
+  });
+
+  const handleSetGreeting = async () => {
+    if (isNoneOption) {
+      await setGreetingNoPayment();
+    } else {
+      await setGreetingWithPayment();
+    }
+  };
+
   return (
     <div className="flex items-center flex-col flex-grow pt-10">
       <div className="px-5 w-full max-w-6xl">
@@ -93,7 +130,31 @@ const Home = () => {
         </h1>
         <ConnectedAddress />
         <div className="mt-8 space-y-6">
-          {/* Contract Status removed for Vesu demo */}
+          <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
+            <h2 className="text-2xl font-bold mb-6 text-secondary">
+              Contract Status
+            </h2>
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+              <div className="p-4 bg-base-200 rounded-xl">
+                <h3 className="text-lg font-semibold mb-2">Current Greeting</h3>
+                <p className="text-xl font-medium break-all">
+                  {currentGreeting?.toString() ?? "No greeting set"}
+                </p>
+              </div>
+
+              <div className="p-4 bg-base-200 rounded-xl">
+                <h3 className="text-lg font-semibold mb-2">Premium Status</h3>
+                <div className="flex items-center space-x-2">
+                  <div
+                    className={`w-3 h-3 rounded-full ${premium ? "bg-green-500" : "bg-gray-400"}`}
+                  ></div>
+                  <span className="text-xl font-medium">
+                    {premium ? "Active" : "Inactive"}
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
             <div className="flex justify-between items-center mb-6">
               <h2 className="text-2xl font-bold text-secondary">
@@ -101,36 +162,26 @@ const Home = () => {
               </h2>
               <button
                 className="btn btn-primary btn-lg"
-                onClick={() => redeemAll()}
-                disabled={
-                  !vStrk ||
-                  !connectedAddress ||
-                  !vStrkBalance ||
-                  (vStrkBalance as any) === 0n ||
-                  isRedeeming
-                }
+                onClick={() => withdrawAll()}
               >
-                {isRedeeming ? (
-                  <span className="loading loading-spinner loading-sm"></span>
-                ) : (
-                  "Withdraw All"
-                )}
+                Withdraw All Funds
               </button>
             </div>
             <div className="p-4 bg-base-200 rounded-xl">
               <div className="text-lg mb-4">
-                Withdraw all your vSTRK shares back to STRK.
+                This action will withdraw all deposited tokens back to the
+                contract owner.
               </div>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div className="p-4 bg-base-300 rounded-lg">
                   <span className="block text-sm opacity-70">
-                    Deposited vSTRK (shares)
+                    Available ETH
                   </span>
                   <span className="text-xl font-medium">
-                    {vStrkBalance
-                      ? (Number(vStrkBalance) / 10 ** 18).toFixed(6)
+                    {ethBalance
+                      ? (Number(ethBalance) / 10 ** 18).toFixed(6)
                       : "0.000000"}{" "}
-                    vSTRK
+                    ETH
                   </span>
                 </div>
                 <div className="p-4 bg-base-300 rounded-lg">
@@ -138,8 +189,8 @@ const Home = () => {
                     Available STRK
                   </span>
                   <span className="text-xl font-medium">
-                    {availableStrk
-                      ? (Number(availableStrk) / 10 ** 18).toFixed(6)
+                    {strkBalance
+                      ? (Number(strkBalance) / 10 ** 18).toFixed(6)
                       : "0.000000"}{" "}
                     STRK
                   </span>
@@ -148,120 +199,164 @@ const Home = () => {
             </div>
           </div>
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
-            <h2 className="text-2xl font-bold mb-6 text-secondary">Deposit</h2>
+            <h2 className="text-2xl font-bold mb-6 text-secondary">
+              Set Greeting & Deposit
+            </h2>
             <div className="space-y-6">
+              <div className="space-y-2">
+                <label className="text-lg font-medium">Select Token</label>
+                <div className="flex gap-4">
+                  <button
+                    className={`btn btn-lg flex-1 ${selectedToken === "ETH" ? "btn-primary" : "btn-outline"}`}
+                    onClick={() => setSelectedToken("ETH")}
+                  >
+                    ETH
+                  </button>
+                  <button
+                    className={`btn btn-lg flex-1 ${selectedToken === "STRK" ? "btn-primary" : "btn-outline"}`}
+                    onClick={() => setSelectedToken("STRK")}
+                  >
+                    STRK
+                  </button>
+                </div>
+              </div>
+
               <div className="form-control">
                 <label className="label">
                   <span className="label-text text-lg font-medium">
-                    Amount (STRK)
+                    Amount ({selectedToken})
                   </span>
                 </label>
                 <div className="bg-base-200 p-4 rounded-xl border-2 border-secondary">
                   <div className="flex flex-col space-y-4">
-                    <div className="flex bg-base-300 text-accent rounded-lg">
+                    {/* Some Option */}
+                    <label
+                      className="flex items-center gap-3 cursor-pointer"
+                      htmlFor="option-some"
+                    >
+                      <input
+                        id="option-some"
+                        className="radio radio-xs radio-secondary"
+                        type="radio"
+                        name="option-type"
+                        checked={!isNoneOption}
+                        onChange={() => setIsNoneOption(false)}
+                        aria-label="Select some amount option"
+                      />
+                      <div className="flex flex-col gap-1.5 w-full">
+                        <div className="flex items-center ml-2">
+                          <span className="text-xs font-medium mr-2 leading-none">
+                            Some amount
+                          </span>
+                        </div>
+                        <div className="flex bg-base-300 text-accent rounded-lg">
+                          <input
+                            type="number"
+                            className="input input-ghost focus:outline-none h-[2.2rem] min-h-[2.2rem] px-4 w-full text-xs placeholder:text-[#9596BF] text-neutral rounded-lg"
+                            value={displayAmount || ""}
+                            onChange={(e) => {
+                              const value = e.target.value;
+                              setDisplayAmount(value);
+                              if (value && value !== "") {
+                                try {
+                                  const amountInWei = BigInt(
+                                    Math.floor(Number(value) * 10 ** 18),
+                                  );
+                                  setInputAmount(amountInWei);
+                                } catch (error) {
+                                  console.error("Invalid number input:", error);
+                                }
+                              } else {
+                                setInputAmount(0n);
+                              }
+                              setIsNoneOption(false);
+                            }}
+                            placeholder="Enter amount"
+                            disabled={isNoneOption}
+                            autoComplete="off"
+                          />
+                        </div>
+                      </div>
+                    </label>
+
+                    {/* None Option */}
+                    <label
+                      className="flex items-center gap-3 cursor-pointer"
+                      htmlFor="option-none"
+                    >
                       <input
-                        type="number"
-                        className="input input-ghost focus:outline-none h-[2.2rem] min-h-[2.2rem] px-4 w-full text-xs placeholder:text-[#9596BF] text-neutral rounded-lg"
-                        value={displayAmount || ""}
-                        onChange={(e) => {
-                          const value = e.target.value;
-                          setDisplayAmount(value);
-                          if (value && value !== "") {
-                            try {
-                              const amountInWei = BigInt(
-                                Math.floor(Number(value) * 10 ** 18),
-                              );
-                              setAmountWei(amountInWei);
-                            } catch (error) {
-                              console.error("Invalid number input:", error);
-                              setAmountWei(0n);
-                            }
-                          } else {
-                            setAmountWei(0n);
-                          }
-                        }}
-                        placeholder="Enter amount"
-                        autoComplete="off"
+                        id="option-none"
+                        className="radio radio-xs radio-secondary"
+                        type="radio"
+                        name="option-type"
+                        checked={isNoneOption}
+                        onChange={() => setIsNoneOption(true)}
+                        aria-label="Select no amount option"
                       />
-                    </div>
+                      <div className="flex flex-col gap-1.5 w-full">
+                        <div className="flex items-center ml-2">
+                          <span className="text-xs font-medium mr-2 leading-none">
+                            No amount
+                          </span>
+                        </div>
+                        <div className="flex bg-base-300 text-accent h-[2.2rem] px-4 items-center rounded-lg">
+                          <span className="text-xs opacity-50">No value</span>
+                        </div>
+                      </div>
+                    </label>
                   </div>
                 </div>
               </div>
+              <div className="form-control">
+                <label className="label" htmlFor="greeting-input">
+                  <span className="label-text text-lg font-medium">
+                    Greeting Message
+                  </span>
+                </label>
+                <input
+                  id="greeting-input"
+                  type="text"
+                  className="input input-bordered input-lg text-lg"
+                  value={greeting}
+                  onChange={(e) => setGreeting(e.target.value)}
+                  placeholder="Enter your greeting"
+                />
+              </div>
               <button
                 className="btn btn-primary btn-lg w-full text-lg"
-                onClick={() => depositStrk()}
-                disabled={
-                  !vStrk ||
-                  !connectedAddress ||
-                  amountWei === 0n ||
-                  isDepositing
-                }
+                onClick={handleSetGreeting}
+                disabled={!greeting}
               >
-                {isDepositing ? (
-                  <span className="loading loading-spinner loading-sm"></span>
-                ) : (
-                  "Deposit STRK"
-                )}
+                {Number(inputAmount) > 0
+                  ? `Set Greeting with ${selectedToken}`
+                  : "Set Greeting"}
               </button>
             </div>
           </div>
           <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
             <h2 className="text-2xl font-bold mb-6 text-secondary">
-              vSTRK Activity
+              Transaction History
             </h2>
-            <div className="space-y-6">
-              <div>
-                <h3 className="text-lg font-semibold mb-2">Deposits</h3>
-                <div className="space-y-3">
-                  {depositEvents?.length ? (
-                    depositEvents.map((evt, idx) => (
-                      <div
-                        key={`dep-${idx}`}
-                        className="p-4 bg-base-200 rounded-xl"
-                      >
-                        <p className="text-sm opacity-70 break-all">
-                          Owner: {toHex(evt.args.owner)}
-                        </p>
-                        <p className="text-lg">
-                          Assets:{" "}
-                          {(Number(evt.args.assets) / 10 ** 18).toFixed(6)} STRK
-                          · Shares:{" "}
-                          {(Number(evt.args.shares) / 10 ** 18).toFixed(6)}{" "}
-                          vSTRK
-                        </p>
-                      </div>
-                    ))
-                  ) : (
-                    <span className="opacity-60">No deposit events</span>
-                  )}
-                </div>
-              </div>
-              <div>
-                <h3 className="text-lg font-semibold mb-2">Withdrawals</h3>
-                <div className="space-y-3">
-                  {withdrawEvents?.length ? (
-                    withdrawEvents.map((evt, idx) => (
-                      <div
-                        key={`with-${idx}`}
-                        className="p-4 bg-base-200 rounded-xl"
-                      >
-                        <p className="text-sm opacity-70 break-all">
-                          Owner: {toHex(evt.args.owner)}
-                        </p>
-                        <p className="text-lg">
-                          Assets:{" "}
-                          {(Number(evt.args.assets) / 10 ** 18).toFixed(6)} STRK
-                          · Shares:{" "}
-                          {(Number(evt.args.shares) / 10 ** 18).toFixed(6)}{" "}
-                          vSTRK
-                        </p>
-                      </div>
-                    ))
-                  ) : (
-                    <span className="opacity-60">No withdraw events</span>
-                  )}
+            <div className="space-y-4">
+              {events?.map((event, index) => (
+                <div key={index} className="p-4 bg-base-200 rounded-xl">
+                  <p className="text-lg">
+                    Set Greeting to {event.args.new_greeting}
+                    {event.args.value.unwrap() > 0n && (
+                      <span className="ml-2 text-primary">
+                        with{" "}
+                        {(Number(event.args.value.unwrap()) / 10 ** 18).toFixed(
+                          6,
+                        )}
+                        {event.args.token.unwrap() ===
+                        BigInt(StrkContract?.address || "")
+                          ? " STRK"
+                          : " ETH"}
+                      </span>
+                    )}
+                  </p>
                 </div>
-              </div>
+              ))}
             </div>
           </div>
         </div>
diff --git a/packages/nextjs/app/vesu/page.tsx b/packages/nextjs/app/vesu/page.tsx
new file mode 100644
index 0000000..66d76b4
--- /dev/null
+++ b/packages/nextjs/app/vesu/page.tsx
@@ -0,0 +1,272 @@
+"use client";
+
+import { ConnectedAddress } from "~~/components/ConnectedAddress";
+import { useState } from "react";
+import { useScaffoldReadContract } from "~~/hooks/scaffold-stark/useScaffoldReadContract";
+import { useScaffoldMultiWriteContract } from "~~/hooks/scaffold-stark/useScaffoldMultiWriteContract";
+import { useScaffoldEventHistory } from "~~/hooks/scaffold-stark/useScaffoldEventHistory";
+import { useDeployedContractInfo } from "~~/hooks/scaffold-stark/useDeployedContractInfo";
+import { useScaffoldWriteContract } from "~~/hooks/scaffold-stark/useScaffoldWriteContract";
+import { useTargetNetwork } from "~~/hooks/scaffold-stark/useTargetNetwork";
+import { useAccount } from "@starknet-react/core";
+import useScaffoldStrkBalance from "~~/hooks/scaffold-stark/useScaffoldStrkBalance";
+
+const Home = () => {
+  const [displayAmount, setDisplayAmount] = useState<string>("");
+  const [amountWei, setAmountWei] = useState<bigint>(0n);
+
+  const { targetNetwork } = useTargetNetwork();
+
+  const { address: connectedAddress } = useAccount();
+
+  // vSTRK contract info
+  const { data: vStrk } = useDeployedContractInfo("vStrk");
+
+  const toHex = (v: unknown) =>
+    typeof v === "bigint" ? `0x${v.toString(16)}` : (v as string);
+
+  // Deposited amount = user's vSTRK balance (shares)
+  const { data: vStrkBalance } = useScaffoldReadContract({
+    contractName: "vStrk",
+    functionName: "balance_of",
+    args: [connectedAddress],
+  });
+
+  // Available STRK balance of user
+  const { value: availableStrk } = useScaffoldStrkBalance({
+    address: connectedAddress || undefined,
+  });
+
+  // Redeem (withdraw) all vSTRK shares to STRK
+  const { sendAsync: redeemAll, isPending: isRedeeming } =
+    useScaffoldWriteContract({
+      contractName: "vStrk",
+      functionName: "redeem",
+      args: [vStrkBalance as any, connectedAddress, connectedAddress],
+    });
+
+  // STRK-only deposit flow: approve STRK to vSTRK, then deposit assets
+  const { sendAsync: depositStrk, isPending: isDepositing } =
+    useScaffoldMultiWriteContract({
+      calls: [
+        {
+          contractName: "Strk",
+          functionName: "approve",
+          args: [vStrk?.address, amountWei],
+        },
+        {
+          contractName: "vStrk",
+          functionName: "deposit",
+          args: [amountWei, connectedAddress],
+        },
+      ],
+    });
+
+  // Event history for vSTRK Deposit and Withdraw
+  const { data: depositEvents } = useScaffoldEventHistory({
+    contractName: "vStrk",
+    eventName: "Deposit",
+    fromBlock: 1540452n, // NOTE : For now keep this block number as it is. When running local mainnet fork, use this block number as the starting block number. For example: `yarn chain --fork-network https://starknet-mainnet.public.blastapi.io/rpc/v0_9 --fork-block 1540452`
+    watch: true,
+    enabled: !!vStrk,
+  });
+  const { data: withdrawEvents } = useScaffoldEventHistory({
+    contractName: "vStrk",
+    eventName: "Withdraw",
+    fromBlock: 1540452n,
+    watch: true,
+    enabled: !!vStrk,
+  });
+
+  return (
+    <div className="flex items-center flex-col flex-grow pt-10">
+      <div className="px-5 w-full max-w-6xl">
+        <h1 className="text-center mb-8">
+          <span className="block text-4xl font-bold bg-gradient-to-r from-primary to-secondary bg-clip-text text-transparent">
+            Scaffold-Stark Workshop
+          </span>
+          <div className="flex justify-center">
+            <span className="text-base mt-2 badge badge-primary">
+              {targetNetwork.name}
+            </span>
+          </div>
+        </h1>
+        <ConnectedAddress />
+        <div className="mt-8 space-y-6">
+          {/* Contract Status removed for Vesu demo */}
+          <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
+            <div className="flex justify-between items-center mb-6">
+              <h2 className="text-2xl font-bold text-secondary">
+                Contract Management
+              </h2>
+              <button
+                className="btn btn-primary btn-lg"
+                onClick={() => redeemAll()}
+                disabled={
+                  !vStrk ||
+                  !connectedAddress ||
+                  !vStrkBalance ||
+                  (vStrkBalance as any) === 0n ||
+                  isRedeeming
+                }
+              >
+                {isRedeeming ? (
+                  <span className="loading loading-spinner loading-sm"></span>
+                ) : (
+                  "Withdraw All"
+                )}
+              </button>
+            </div>
+            <div className="p-4 bg-base-200 rounded-xl">
+              <div className="text-lg mb-4">
+                Withdraw all your vSTRK shares back to STRK.
+              </div>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                <div className="p-4 bg-base-300 rounded-lg">
+                  <span className="block text-sm opacity-70">
+                    Deposited vSTRK (shares)
+                  </span>
+                  <span className="text-xl font-medium">
+                    {vStrkBalance
+                      ? (Number(vStrkBalance) / 10 ** 18).toFixed(6)
+                      : "0.000000"}{" "}
+                    vSTRK
+                  </span>
+                </div>
+                <div className="p-4 bg-base-300 rounded-lg">
+                  <span className="block text-sm opacity-70">
+                    Available STRK
+                  </span>
+                  <span className="text-xl font-medium">
+                    {availableStrk
+                      ? (Number(availableStrk) / 10 ** 18).toFixed(6)
+                      : "0.000000"}{" "}
+                    STRK
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
+            <h2 className="text-2xl font-bold mb-6 text-secondary">Deposit</h2>
+            <div className="space-y-6">
+              <div className="form-control">
+                <label className="label">
+                  <span className="label-text text-lg font-medium">
+                    Amount (STRK)
+                  </span>
+                </label>
+                <div className="bg-base-200 p-4 rounded-xl border-2 border-secondary">
+                  <div className="flex flex-col space-y-4">
+                    <div className="flex bg-base-300 text-accent rounded-lg">
+                      <input
+                        type="number"
+                        className="input input-ghost focus:outline-none h-[2.2rem] min-h-[2.2rem] px-4 w-full text-xs placeholder:text-[#9596BF] text-neutral rounded-lg"
+                        value={displayAmount || ""}
+                        onChange={(e) => {
+                          const value = e.target.value;
+                          setDisplayAmount(value);
+                          if (value && value !== "") {
+                            try {
+                              const amountInWei = BigInt(
+                                Math.floor(Number(value) * 10 ** 18),
+                              );
+                              setAmountWei(amountInWei);
+                            } catch (error) {
+                              console.error("Invalid number input:", error);
+                              setAmountWei(0n);
+                            }
+                          } else {
+                            setAmountWei(0n);
+                          }
+                        }}
+                        placeholder="Enter amount"
+                        autoComplete="off"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <button
+                className="btn btn-primary btn-lg w-full text-lg"
+                onClick={() => depositStrk()}
+                disabled={
+                  !vStrk ||
+                  !connectedAddress ||
+                  amountWei === 0n ||
+                  isDepositing
+                }
+              >
+                {isDepositing ? (
+                  <span className="loading loading-spinner loading-sm"></span>
+                ) : (
+                  "Deposit STRK"
+                )}
+              </button>
+            </div>
+          </div>
+          <div className="bg-base-100 p-8 rounded-3xl border border-gradient shadow-lg">
+            <h2 className="text-2xl font-bold mb-6 text-secondary">
+              vSTRK Activity
+            </h2>
+            <div className="space-y-6">
+              <div>
+                <h3 className="text-lg font-semibold mb-2">Deposits</h3>
+                <div className="space-y-3">
+                  {depositEvents?.length ? (
+                    depositEvents.map((evt, idx) => (
+                      <div
+                        key={`dep-${idx}`}
+                        className="p-4 bg-base-200 rounded-xl"
+                      >
+                        <p className="text-sm opacity-70 break-all">
+                          Owner: {toHex(evt.args.owner)}
+                        </p>
+                        <p className="text-lg">
+                          Assets:{" "}
+                          {(Number(evt.args.assets) / 10 ** 18).toFixed(6)} STRK
+                          · Shares:{" "}
+                          {(Number(evt.args.shares) / 10 ** 18).toFixed(6)}{" "}
+                          vSTRK
+                        </p>
+                      </div>
+                    ))
+                  ) : (
+                    <span className="opacity-60">No deposit events</span>
+                  )}
+                </div>
+              </div>
+              <div>
+                <h3 className="text-lg font-semibold mb-2">Withdrawals</h3>
+                <div className="space-y-3">
+                  {withdrawEvents?.length ? (
+                    withdrawEvents.map((evt, idx) => (
+                      <div
+                        key={`with-${idx}`}
+                        className="p-4 bg-base-200 rounded-xl"
+                      >
+                        <p className="text-sm opacity-70 break-all">
+                          Owner: {toHex(evt.args.owner)}
+                        </p>
+                        <p className="text-lg">
+                          Assets:{" "}
+                          {(Number(evt.args.assets) / 10 ** 18).toFixed(6)} STRK
+                          · Shares:{" "}
+                          {(Number(evt.args.shares) / 10 ** 18).toFixed(6)}{" "}
+                          vSTRK
+                        </p>
+                      </div>
+                    ))
+                  ) : (
+                    <span className="opacity-60">No withdraw events</span>
+                  )}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+export default Home;
diff --git a/packages/nextjs/components/Header.tsx b/packages/nextjs/components/Header.tsx
index 7c8c8c1..87a7d6f 100644
--- a/packages/nextjs/components/Header.tsx
+++ b/packages/nextjs/components/Header.tsx
@@ -30,6 +30,13 @@ export const menuLinks: HeaderMenuLink[] = [
     href: "/debug",
     icon: <BugAntIcon className="h-4 w-4" />,
   },
+  {
+    label: "Vesu",
+    href: "/vesu",
+    icon: (
+      <Image src={"/vesu-symbol-icon.svg"} alt="Vesu" width={16} height={16} />
+    ),
+  },
 ];
 
 export const HeaderMenuLinks = () => {
diff --git a/packages/nextjs/public/vesu-symbol-icon.svg b/packages/nextjs/public/vesu-symbol-icon.svg
new file mode 100644
index 0000000..d909c31
--- /dev/null
+++ b/packages/nextjs/public/vesu-symbol-icon.svg
@@ -0,0 +1,87 @@
+<svg width="71" height="76" viewBox="24 29 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.228 32.6907L34.1968 46.2665C34.4358 46.9194 34.9593 47.3008 35.5308 47.4108H31.7735C31.1499 47.4108 30.5927 47.0212 30.3786 46.4355L25.2781 32.4809C24.6879 30.8659 25.5741 29.1559 27.2936 29.1559H30.5605C30.0015 29.3555 29.5743 29.7783 29.3194 30.2888C28.9697 30.9895 28.9269 31.8682 29.228 32.6907Z" fill="url(#paint0_linear_1843_10937)"/>
+<mask id="mask0_1843_10937" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="24" y="29" width="15" height="19">
+<path d="M38.9752 29.7749H24V47.8442H38.9752V29.7749Z" fill="url(#paint1_linear_1843_10937)"/>
+</mask>
+<g mask="url(#mask0_1843_10937)">
+<g filter="url(#filter0_f_1843_10937)">
+<path d="M29.228 32.6908L34.1969 46.2665C34.4359 46.9195 34.9594 47.3009 35.5309 47.4109H31.7736C31.15 47.4109 30.5927 47.0212 30.3787 46.4355L25.2782 32.4809C24.6879 30.8659 25.5741 29.1559 27.2936 29.1559H30.5606C30.0016 29.3555 29.5744 29.7784 29.3195 30.2889C28.9697 30.9895 28.927 31.8683 29.228 32.6908Z" fill="url(#paint2_linear_1843_10937)"/>
+</g>
+</g>
+<path d="M36.8701 46.0113C36.5332 46.9319 35.2312 46.9319 34.8943 46.0113L29.9254 32.4356C29.4525 31.1434 30.0996 29.7747 31.2899 29.7747H40.4745C41.6648 29.7747 42.3119 31.1434 41.839 32.4356L36.8701 46.0113Z" fill="url(#paint3_linear_1843_10937)"/>
+<path d="M36.8701 46.0113C36.5332 46.9319 35.2312 46.9319 34.8943 46.0113L29.9254 32.4356C29.4525 31.1434 30.0996 29.7747 31.2899 29.7747H40.4745C41.6648 29.7747 42.3119 31.1434 41.839 32.4356L36.8701 46.0113Z" fill="url(#paint4_radial_1843_10937)"/>
+<path d="M36.8701 46.0113C36.5332 46.9319 35.2312 46.9319 34.8943 46.0113L29.9254 32.4356C29.4525 31.1434 30.0996 29.7747 31.2899 29.7747H40.4745C41.6648 29.7747 42.3119 31.1434 41.839 32.4356L36.8701 46.0113Z" fill="url(#paint5_radial_1843_10937)"/>
+<path d="M36.8701 46.0113C36.5332 46.9319 35.2312 46.9319 34.8943 46.0113L29.9254 32.4356C29.4525 31.1434 30.0996 29.7747 31.2899 29.7747H40.4745C41.6648 29.7747 42.3119 31.1434 41.839 32.4356L36.8701 46.0113Z" fill="url(#paint6_radial_1843_10937)"/>
+<path d="M36.8701 46.0113C36.5332 46.9319 35.2312 46.9319 34.8943 46.0113L29.9254 32.4356C29.4525 31.1434 30.0996 29.7747 31.2899 29.7747H40.4745C41.6648 29.7747 42.3119 31.1434 41.839 32.4356L36.8701 46.0113Z" fill="url(#paint7_linear_1843_10937)" fill-opacity="0.8"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M34.7202 46.0751L29.7512 32.4994C29.4986 31.8092 29.542 31.0906 29.818 30.5377C30.0957 29.9813 30.6137 29.5891 31.2901 29.5891H40.4747C41.151 29.5891 41.669 29.9813 41.9467 30.5377C42.2228 31.0906 42.2661 31.8092 42.0135 32.4994L37.0446 46.0751C36.6482 47.1581 35.1165 47.1581 34.7202 46.0751ZM34.8945 46.0113C35.2314 46.9318 36.5333 46.9318 36.8703 46.0113L41.8392 32.4356C42.3121 31.1434 41.665 29.7747 40.4747 29.7747H31.2901C30.0998 29.7747 29.4527 31.1434 29.9256 32.4356L34.8945 46.0113Z" fill="url(#paint8_linear_1843_10937)"/>
+<g filter="url(#filter1_f_1843_10937)">
+<path d="M36.8701 46.0113C36.5332 46.9319 35.2312 46.9319 34.8943 46.0113L29.9254 32.4356C29.4525 31.1434 30.0996 29.7747 31.2899 29.7747H40.4745C41.6648 29.7747 42.3119 31.1434 41.839 32.4356L36.8701 46.0113Z" fill="url(#paint9_radial_1843_10937)"/>
+</g>
+<defs>
+<filter id="filter0_f_1843_10937" x="-3.90429" y="0.155914" width="68.4352" height="76.2549" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="14.5" result="effect1_foregroundBlur_1843_10937"/>
+</filter>
+<filter id="filter1_f_1843_10937" x="0.76973" y="0.77475" width="70.225" height="74.927" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="14.5" result="effect1_foregroundBlur_1843_10937"/>
+</filter>
+<linearGradient id="paint0_linear_1843_10937" x1="30.3132" y1="29.1559" x2="30.3132" y2="47.4108" gradientUnits="userSpaceOnUse">
+<stop offset="0.0214678" stop-color="#C8C8C8" stop-opacity="0"/>
+<stop offset="0.0256676" stop-color="#C8C8C8"/>
+<stop offset="0.0693822" stop-color="#C9C9C9" stop-opacity="0.927973"/>
+<stop offset="0.111865" stop-color="#CBCBCB" stop-opacity="0.42"/>
+<stop offset="0.142556" stop-color="#CBCBCB" stop-opacity="0.2"/>
+<stop offset="0.171366" stop-color="#1FADD5"/>
+<stop offset="0.185193" stop-color="#B2ECFD" stop-opacity="0.938703"/>
+<stop offset="0.959939" stop-color="white"/>
+<stop offset="0.969541" stop-color="#D9D9D9" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_1843_10937" x1="31.4876" y1="29.7749" x2="31.4876" y2="47.8442" gradientUnits="userSpaceOnUse">
+<stop offset="0.173679" stop-color="#D9D9D9" stop-opacity="0"/>
+<stop offset="0.811109" stop-color="#D9D9D9"/>
+</linearGradient>
+<linearGradient id="paint2_linear_1843_10937" x1="30.3133" y1="29.1559" x2="30.3133" y2="47.4109" gradientUnits="userSpaceOnUse">
+<stop offset="0.0214678" stop-color="#C8C8C8" stop-opacity="0"/>
+<stop offset="0.0256676" stop-color="#C8C8C8"/>
+<stop offset="0.0693822" stop-color="#C9C9C9" stop-opacity="0.927973"/>
+<stop offset="0.111865" stop-color="#CBCBCB" stop-opacity="0.42"/>
+<stop offset="0.142556" stop-color="#CBCBCB" stop-opacity="0.2"/>
+<stop offset="0.171366" stop-color="#1FADD5"/>
+<stop offset="0.185193" stop-color="#B2ECFD" stop-opacity="0.938703"/>
+<stop offset="0.959939" stop-color="white"/>
+<stop offset="0.969541" stop-color="#D9D9D9" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_1843_10937" x1="37.027" y1="35.901" x2="30.4676" y2="30.2389" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E7CC38"/>
+<stop offset="1" stop-color="#E7CC38" stop-opacity="0"/>
+</linearGradient>
+<radialGradient id="paint4_radial_1843_10937" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(33.0975 29.7747) rotate(75.277) scale(8.76553)">
+<stop stop-color="#5DAF3D"/>
+<stop offset="1" stop-color="#C7E606" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint5_radial_1843_10937" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(32.2931 38.7785) rotate(70.0452) scale(32.0939 9.89838)">
+<stop offset="0.0505218" stop-color="#D55401"/>
+<stop offset="0.651601" stop-color="#E7CC38" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint6_radial_1843_10937" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.9044 29.7747) rotate(99.6503) scale(7.75204)">
+<stop stop-color="#62FAD2"/>
+<stop offset="1" stop-color="#62FA83" stop-opacity="0"/>
+</radialGradient>
+<linearGradient id="paint7_linear_1843_10937" x1="39.8116" y1="39.1497" x2="33.2832" y2="36.7983" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.46419" stop-color="white" stop-opacity="0.41"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint8_linear_1843_10937" x1="38.4814" y1="39.0878" x2="36.2846" y2="38.2524" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<radialGradient id="paint9_radial_1843_10937" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(33.7782 36.396) rotate(105.771) scale(11.1564 7.17091)">
+<stop offset="0.890927" stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</radialGradient>
+</defs>
+</svg>

From 148f3b57c88e0b3d1009bd9317c16b17decaf991 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sun, 19 Oct 2025 13:32:09 +0700
Subject: [PATCH 11/12] revert to get back multicall

---
 .../nextjs/contracts/deployedContracts.ts     | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
index e8353e3..6923166 100644
--- a/packages/nextjs/contracts/deployedContracts.ts
+++ b/packages/nextjs/contracts/deployedContracts.ts
@@ -315,6 +315,92 @@ const deployedContracts = {
         "0x73b00366d0117bee7ae7620469abc7ceefb8b78ff9257b77b3531a9c4411688",
     },
   },
+  mainnet: {
+    Multicall: {
+      address:
+        "0x7ca5ccfeb2e4d6e13e9382d70042712f1f736c003f3a40243d9a397a7317251",
+      abi: [
+        {
+          type: "impl",
+          name: "MulticallImpl",
+          interface_name: "contracts::multicall::IMulticall",
+        },
+        {
+          type: "struct",
+          name: "core::array::Span::<core::starknet::contract_address::ContractAddress>",
+          members: [
+            {
+              name: "snapshot",
+              type: "@core::array::Array::<core::starknet::contract_address::ContractAddress>",
+            },
+          ],
+        },
+        {
+          type: "struct",
+          name: "core::array::Span::<core::felt252>",
+          members: [
+            {
+              name: "snapshot",
+              type: "@core::array::Array::<core::felt252>",
+            },
+          ],
+        },
+        {
+          type: "struct",
+          name: "core::array::Span::<core::array::Span::<core::felt252>>",
+          members: [
+            {
+              name: "snapshot",
+              type: "@core::array::Array::<core::array::Span::<core::felt252>>",
+            },
+          ],
+        },
+        {
+          type: "interface",
+          name: "contracts::multicall::IMulticall",
+          items: [
+            {
+              type: "function",
+              name: "call_contracts",
+              inputs: [
+                {
+                  name: "contracts",
+                  type: "core::array::Span::<core::starknet::contract_address::ContractAddress>",
+                },
+                {
+                  name: "entry_point_selectors",
+                  type: "core::array::Span::<core::felt252>",
+                },
+                {
+                  name: "calldata",
+                  type: "core::array::Span::<core::array::Span::<core::felt252>>",
+                },
+              ],
+              outputs: [
+                {
+                  type: "core::array::Array::<core::array::Span::<core::felt252>>",
+                },
+              ],
+              state_mutability: "view",
+            },
+          ],
+        },
+        {
+          type: "constructor",
+          name: "constructor",
+          inputs: [],
+        },
+        {
+          type: "event",
+          name: "contracts::multicall::Multicall::Event",
+          kind: "enum",
+          variants: [],
+        },
+      ],
+      classHash:
+        "0x67be8d0979b1012f4222674cb81e3a0413e45e16897b8d7c650ae84ba4a3f23",
+    },
+  },
   sepolia: {
     YourContract: {
       address:

From e62fed771e3e9d7dfc96b70f2c2e84e96abd4dc0 Mon Sep 17 00:00:00 2001
From: tu11aa <thanhtuhr01@gmail.com>
Date: Sun, 19 Oct 2025 13:35:47 +0700
Subject: [PATCH 12/12] revert contract

---
 .../nextjs/contracts/deployedContracts.ts     | 110 +++---------------
 1 file changed, 16 insertions(+), 94 deletions(-)

diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
index 6923166..8e089af 100644
--- a/packages/nextjs/contracts/deployedContracts.ts
+++ b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,12 +7,12 @@ const deployedContracts = {
   devnet: {
     YourContract: {
       address:
-        "0x3d0a8a77f45d5e0f52fc3f4734985ce57795caaaf23181eaa35aed377f01184",
+        "0x1a2542704c7588b9c5eb86c9a1b2391b93b77b67694268b74db51097031839d",
       abi: [
         {
           type: "impl",
           name: "YourContractImpl",
-          interface_name: "contracts::your_contract::IYourContract",
+          interface_name: "contracts::YourContract::IYourContract",
         },
         {
           type: "struct",
@@ -60,20 +60,6 @@ const deployedContracts = {
             },
           ],
         },
-        {
-          type: "enum",
-          name: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
-          variants: [
-            {
-              name: "Some",
-              type: "core::starknet::contract_address::ContractAddress",
-            },
-            {
-              name: "None",
-              type: "()",
-            },
-          ],
-        },
         {
           type: "enum",
           name: "core::bool",
@@ -90,7 +76,7 @@ const deployedContracts = {
         },
         {
           type: "interface",
-          name: "contracts::your_contract::IYourContract",
+          name: "contracts::YourContract::IYourContract",
           items: [
             {
               type: "function",
@@ -112,13 +98,9 @@ const deployedContracts = {
                   type: "core::byte_array::ByteArray",
                 },
                 {
-                  name: "option_amount",
+                  name: "amount_strk",
                   type: "core::option::Option::<core::integer::u256>",
                 },
-                {
-                  name: "option_token",
-                  type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
-                },
               ],
               outputs: [],
               state_mutability: "external",
@@ -141,22 +123,6 @@ const deployedContracts = {
               ],
               state_mutability: "view",
             },
-            {
-              type: "function",
-              name: "token_deposits",
-              inputs: [
-                {
-                  name: "token",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [
-                {
-                  type: "core::integer::u256",
-                },
-              ],
-              state_mutability: "view",
-            },
           ],
         },
         {
@@ -263,7 +229,7 @@ const deployedContracts = {
         },
         {
           type: "event",
-          name: "contracts::your_contract::YourContract::GreetingChanged",
+          name: "contracts::YourContract::YourContract::GreetingChanged",
           kind: "struct",
           members: [
             {
@@ -286,16 +252,11 @@ const deployedContracts = {
               type: "core::option::Option::<core::integer::u256>",
               kind: "data",
             },
-            {
-              name: "token",
-              type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
-              kind: "data",
-            },
           ],
         },
         {
           type: "event",
-          name: "contracts::your_contract::YourContract::Event",
+          name: "contracts::YourContract::YourContract::Event",
           kind: "enum",
           variants: [
             {
@@ -305,14 +266,14 @@ const deployedContracts = {
             },
             {
               name: "GreetingChanged",
-              type: "contracts::your_contract::YourContract::GreetingChanged",
+              type: "contracts::YourContract::YourContract::GreetingChanged",
               kind: "nested",
             },
           ],
         },
       ],
       classHash:
-        "0x73b00366d0117bee7ae7620469abc7ceefb8b78ff9257b77b3531a9c4411688",
+        "0x5e4c766477764df946dcce9b0d2c865468882ac572c0d3767aeb98d23cbe74b",
     },
   },
   mainnet: {
@@ -404,12 +365,12 @@ const deployedContracts = {
   sepolia: {
     YourContract: {
       address:
-        "0x6a5b250d1eeda1cdc9e98078d3dadbe1d2bacd7a4a44f55e9e250bfe18c4288",
+        "0x62eb9272c7523ee445d223bae15b5b44a79c3fdbb5216d3412534a47bcc5255",
       abi: [
         {
           type: "impl",
           name: "YourContractImpl",
-          interface_name: "contracts::your_contract::IYourContract",
+          interface_name: "contracts::YourContract::IYourContract",
         },
         {
           type: "struct",
@@ -457,20 +418,6 @@ const deployedContracts = {
             },
           ],
         },
-        {
-          type: "enum",
-          name: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
-          variants: [
-            {
-              name: "Some",
-              type: "core::starknet::contract_address::ContractAddress",
-            },
-            {
-              name: "None",
-              type: "()",
-            },
-          ],
-        },
         {
           type: "enum",
           name: "core::bool",
@@ -487,7 +434,7 @@ const deployedContracts = {
         },
         {
           type: "interface",
-          name: "contracts::your_contract::IYourContract",
+          name: "contracts::YourContract::IYourContract",
           items: [
             {
               type: "function",
@@ -509,13 +456,9 @@ const deployedContracts = {
                   type: "core::byte_array::ByteArray",
                 },
                 {
-                  name: "option_amount",
+                  name: "amount_strk",
                   type: "core::option::Option::<core::integer::u256>",
                 },
-                {
-                  name: "option_token",
-                  type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
-                },
               ],
               outputs: [],
               state_mutability: "external",
@@ -538,22 +481,6 @@ const deployedContracts = {
               ],
               state_mutability: "view",
             },
-            {
-              type: "function",
-              name: "token_deposits",
-              inputs: [
-                {
-                  name: "token",
-                  type: "core::starknet::contract_address::ContractAddress",
-                },
-              ],
-              outputs: [
-                {
-                  type: "core::integer::u256",
-                },
-              ],
-              state_mutability: "view",
-            },
           ],
         },
         {
@@ -660,7 +587,7 @@ const deployedContracts = {
         },
         {
           type: "event",
-          name: "contracts::your_contract::YourContract::GreetingChanged",
+          name: "contracts::YourContract::YourContract::GreetingChanged",
           kind: "struct",
           members: [
             {
@@ -683,16 +610,11 @@ const deployedContracts = {
               type: "core::option::Option::<core::integer::u256>",
               kind: "data",
             },
-            {
-              name: "token",
-              type: "core::option::Option::<core::starknet::contract_address::ContractAddress>",
-              kind: "data",
-            },
           ],
         },
         {
           type: "event",
-          name: "contracts::your_contract::YourContract::Event",
+          name: "contracts::YourContract::YourContract::Event",
           kind: "enum",
           variants: [
             {
@@ -702,14 +624,14 @@ const deployedContracts = {
             },
             {
               name: "GreetingChanged",
-              type: "contracts::your_contract::YourContract::GreetingChanged",
+              type: "contracts::YourContract::YourContract::GreetingChanged",
               kind: "nested",
             },
           ],
         },
       ],
       classHash:
-        "0x73b00366d0117bee7ae7620469abc7ceefb8b78ff9257b77b3531a9c4411688",
+        "0x5e4c766477764df946dcce9b0d2c865468882ac572c0d3767aeb98d23cbe74b",
     },
   },
 } as const;