Merge pull request #11 from 1Hive/dev

[Dev to Main] Sepolia

apps/web/app/(app)/gardens/communities/page.tsx

@@ -118,13 +118,13 @@ const conmmunities: Community[] = [
         name: "Pool 1",
         strategy: "C.V",
         proposals: 3,
-        href: "1",
+        href: `${contractsAddresses.poolID}`,
       },
       {
         name: "Pool 2",
         strategy: "C.V",
         proposals: 3,
-        href: "2",
+        href: `${contractsAddresses.poolID + 1}`,
       },
     ],
   },
@@ -137,13 +137,13 @@ const conmmunities: Community[] = [
         name: "Pool 1",
         strategy: "C.V",
         proposals: 3,
-        href: "1",
+        href: `${contractsAddresses.poolID}`,
       },
       {
         name: "Pool 2",
         strategy: "C.V",
         proposals: 3,
-        href: "2",
+        href: `${contractsAddresses.poolID + 1}`,
       },
     ],
   },
@@ -156,20 +156,20 @@ const conmmunities: Community[] = [
         name: "Pool 1",
         strategy: "C.V",
         proposals: 3,
-        href: "1",
+        href: `${contractsAddresses.poolID}`,
       },
       {
         name: "Pool 2",
         strategy: "C.V",
         proposals: 3,
-        href: "2",
-      },
-      {
-        name: "Pool 3",
-        strategy: "C.V",
-        proposals: 3,
-        href: "3",
+        href: `${contractsAddresses.poolID + 1}`,
       },
+      // {
+      //   name: "Pool 3",
+      //   strategy: "C.V",
+      //   proposals: 3,
+      //   href: "3",
+      // },
     ],
   },
   {
@@ -181,7 +181,7 @@ const conmmunities: Community[] = [
         name: "Pool 1",
         strategy: "C.V",
         proposals: 3,
-        href: "1",
+        href: `${contractsAddresses.poolID}`,
       },
     ],
   },

apps/web/app/(app)/gardens/communities/pool/[poolId]/page.tsx

@@ -6,6 +6,7 @@ import { useContractRead, useContractWrite } from "wagmi";
 import { cvStrategyABI, alloABI } from "@/src/generated";
 import { useProposalsRead } from "@/hooks/useProposalsRead";
 import { formatEther } from "viem";
+import { contractsAddresses } from "@/constants/contracts";
 
 //some metadata for each pool
 const poolInfo = [
@@ -56,19 +57,19 @@ export default function Pool({
         <header className="flex flex-col items-center justify-center">
           <h2 className="text-center font-press">Pool {poolId} </h2>
           <h4 className="text-2xl ">
-            {poolInfo[(poolId as unknown as number) - 1].title}
+            {/* {poolInfo[(poolId as unknown as number) - 1].title} */}
           </h4>
         </header>
         <main className="flex flex-col gap-10">
           {/* header: description - data - bottom land image */}
           <section className="relative flex w-full flex-col items-center overflow-hidden rounded-lg border-2 border-black bg-white">
             <div className="mt-4 flex flex-col gap-12 p-8">
               <p className="max-w-4xl text-center text-lg font-semibold">
-                {poolInfo[(poolId as unknown as number) - 1].description}
+                {/* {poolInfo[(poolId as unknown as number) - 1].description} */}
               </p>
               <div className="flex w-full p-4">
                 <div className="flex flex-1 flex-col space-y-4 text-xl font-semibold">
-                  {poolId === "1" && (
+                  {poolId === contractsAddresses.poolID && (
                     <>
                       {status === "idle" ? (
                         <>

apps/web/components/Proposals.tsx

@@ -86,7 +86,7 @@ export function Proposals({ poolId }: { poolId: string }) {
 
   const submit = () => {
     const encodedData = getEncodedProposals(inputs, proposals);
-    const poolId = 1;
+    const poolId = Number(contractsAddresses.poolID);
 
     writeContract({
       args: [BigInt(poolId), encodedData as `0x${string}`],

apps/web/constants/contracts/index.ts

@@ -1,7 +1,54 @@
-export const contractsAddresses = {
-  allo: "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0" as `0x${string}`,
-  strategy: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e" as `0x${string}`,
+// read env variables
+// const envPoolIdSignaling = process.env.POOL_ID_SIGNALING || "";
+// const envStrat2Address = process.env.STRAT2_ADDR_ARB_SEPOLIA || "";
+// const envTokenAddressArbSepolia = process.env.TOKEN_ADDR_ARB_SEPOLIA || "";
+// const envTokenNativeAddressArbSepolia =
+// process.env.TOKEN_NATIVE_ADDR_ARB_SEPOLIA || "";
+const ENV = process.env.NEXT_PUBLIC_ENV_GARDENS || "";
+
+const envAlloAddress = process.env.NEXT_PUBLIC_ALLO_ADDRESS_ARB_SEPOLIA || "";
+
+const envPoolId = process.env.NEXT_PUBLIC_POOL_ID || 1;
+
+const envStrat1Address = process.env.NEXT_PUBLIC_STRAT1_ADDR_ARB_SEPOLIA || "";
+
+const envRegistryGardensAddArbSep =
+  process.env.NEXT_PUBLIC_REGISTRY_GARDENS_ADDR_ARB_SEPOLIA || "";
+
+const envAlloRegistryAddArbSep =
+  process.env.NEXT_PUBLIC_ALLO_REGISTRY_ADDR_ARB_SEPOLIA || "";
+
+const envPoolAdminAddressArbSepolia =
+  process.env.NEXT_PUBLIC_POOL_ADMIN_ADDR_ARB_SEPOLIA || "";
+
+const envCouncilSafeAddressArbSepolia =
+  process.env.NEXT_PUBLIC_COUNCIL_SAFE_ADDR_ARB_SEPOLIA || "";
+
+const envRpcUrlArbTestnet = process.env.NEXT_PUBLIC_RPC_URL_ARB_TESTNET || "";
+
+let __contractsAddresses = {
+  allo: `0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0` as `0x${string}`,
+  strategy: `0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e` as `0x${string}`,
   registryGardens:
-    "0x61c36a8d610163660E21a8b7359e1Cac0C9133e1" as `0x${string}`,
-  registry: "0x5FbDB2315678afecb367f032d93F642f64180aa3" as `0x${string}`,
+    `0x61c36a8d610163660E21a8b7359e1Cac0C9133e1` as `0x${string}`,
+  registry: `0x5FbDB2315678afecb367f032d93F642f64180aa3` as `0x${string}`,
+  poolID: `1`,
+  rpcUrl: `http://127.0.0.1:8545`,
 };
+
+if (ENV === "prod") {
+  __contractsAddresses = {
+    allo: `${envAlloAddress}` as `0x${string}`,
+    strategy: `${envStrat1Address}` as `0x${string}`,
+    registryGardens: `${envRegistryGardensAddArbSep}` as `0x${string}`,
+    registry: `${envAlloRegistryAddArbSep}` as `0x${string}`,
+    poolID: `${envPoolId}`,
+    rpcUrl: `${envRpcUrlArbTestnet}`,
+  };
+}
+console.log("env", ENV);
+console.log("envs", __contractsAddresses);
+
+export const contractsAddresses = __contractsAddresses;
+
+export const isProd = ENV === "prod";

apps/web/hooks/useConviction.tsx

@@ -10,7 +10,9 @@ export const useConviction = () => {
   const [data, setData] = useState([]);
 
   const proposalId = 1;
-  const { proposals } = useProposalsRead({ poolId: Number(1) });
+  const { proposals } = useProposalsRead({
+    poolId: Number(contractsAddresses.poolID),
+  });
 
   const proposalsReadsContract = proposals?.filter(
     (proposal) => proposal.id === Number(proposalId),

apps/web/hooks/useProposalsRead.tsx

@@ -93,7 +93,9 @@ export const useProposalsRead = ({ poolId }: { poolId: number }) => {
 
     // Choose between proposalsMock and proposalsMock2 based on poolId
     const selectedProposalsMock =
-      poolId === 1 ? fundingProposals : signalingProposals;
+      poolId === Number(contractsAddresses.poolID)
+        ? fundingProposals
+        : signalingProposals;
 
     // Merge the additional data from proposalsMock based on the index
 

apps/web/providers/WagmiProvider.tsx

@@ -5,12 +5,20 @@ import { walletConnectProvider, EIP6963Connector } from "@web3modal/wagmi";
 
 import { WagmiConfig, configureChains, createConfig } from "wagmi";
 import { publicProvider } from "wagmi/providers/public";
-import { sepolia, optimism, gnosis, mainnet, arbitrum } from "viem/chains";
+import {
+  sepolia,
+  optimism,
+  gnosis,
+  mainnet,
+  arbitrum,
+  arbitrumSepolia,
+} from "viem/chains";
 import { CoinbaseWalletConnector } from "wagmi/connectors/coinbaseWallet";
 import { InjectedConnector } from "wagmi/connectors/injected";
 import { WalletConnectConnector } from "wagmi/connectors/walletConnect";
 import { jsonRpcProvider } from "wagmi/providers/jsonRpc";
 
+import { contractsAddresses, isProd } from "@/constants/contracts";
 type WagmiProviderType = {
   children: React.ReactNode;
 };
@@ -37,7 +45,7 @@ const localChain = {
 };
 
 const { chains, publicClient } = configureChains(
-  [localChain, arbitrum],
+  isProd ? [arbitrumSepolia] : [localChain, arbitrumSepolia],
   [
     jsonRpcProvider({ rpc: (chain: any) => chain.rpcUrls.default }),
     walletConnectProvider({ projectId }),