[Do not merge] Beta

apps/web/components/Forms/PoolEditForm.tsx

@@ -9,7 +9,6 @@ import { FormRadioButton } from "./FormRadioButton";
 import { FormSelect } from "./FormSelect";
 import { Button } from "../Button";
 import { EthAddress } from "../EthAddress";
-import { InfoBox } from "../InfoBox";
 import { chainConfigMap } from "@/configs/chains";
 import { usePubSubContext } from "@/contexts/pubsub.context";
 import { useChainFromPath } from "@/hooks/useChainFromPath";
@@ -55,7 +54,6 @@ export default function PoolEditForm({
   chainId,
   initValues,
   proposalType,
-  proposalOnDispute: isProposalOnDispute,
   setModalOpen,
 }: Props) {
   const {
@@ -66,7 +64,7 @@ export default function PoolEditForm({
     defaultValues: {
       spendingLimit: initValues.spendingLimit,
       minimumConviction: initValues.minimumConviction,
-      convictionGrowth: initValues.convictionGrowth,
+      convictionGrowth: Math.round(+initValues.convictionGrowth / 3600 / 24), // convert seconds to days
       minThresholdPoints: initValues.minThresholdPoints,
       // arb settings
       defaultResolution: initValues.defaultResolution,

apps/web/components/PoolHeader.tsx

@@ -113,7 +113,7 @@ export default function PoolHeader({
     spendingLimitPct * MAX_RATIO_CONSTANT,
   );
 
-  const convictionGrowth = calculateConvictionGrowthInSeconds(
+  const convictionGrowthSec = calculateConvictionGrowthInSeconds(
     strategy.config.decay,
     blockTime,
   );
@@ -133,7 +133,7 @@ export default function PoolHeader({
     (proposal) => ProposalStatus[proposal.proposalStatus] === "disputed",
   );
 
-  const { value, unit } = convertSecondsToReadableTime(convictionGrowth);
+  const { value, unit } = convertSecondsToReadableTime(convictionGrowthSec);
 
   const poolConfig = [
     {
@@ -240,7 +240,7 @@ export default function PoolHeader({
           <h2>
             {ipfsResult?.title} #{poolId}
           </h2>
-          {(isCouncilMember ?? isCouncilSafe) && (
+          {(!!isCouncilMember || isCouncilSafe) && (
             // true
             <div className="flex gap-2">
               <Button
@@ -297,7 +297,7 @@ export default function PoolHeader({
             proposalOnDispute={proposalOnDispute}
             initValues={{
               minimumConviction: minimumConviction.toFixed(2),
-              convictionGrowth: convictionGrowth.toFixed(2),
+              convictionGrowth: convictionGrowthSec.toFixed(2),
               minThresholdPoints: minThresholdPoints,
               spendingLimit: spendingLimit.toFixed(2),
               defaultResolution: defaultResolution,

apps/web/configs/chains.tsx

@@ -29,10 +29,10 @@ export const chains: Chain[] = [
   sepolia,
 
   arbitrum,
+  optimism,
   polygon,
+  gnosis,
   // mainnet,
-  optimism,
-  // gnosis,
 ];
 
 if (process.env.NODE_ENV === "development") {
@@ -55,7 +55,7 @@ type ChainData = {
 };
 
 const SUBGRAPH_TESTNET_VERSION = "0.25";
-const SUBGRAPH_PRODNET_VERSION = "1.3";
+const SUBGRAPH_PRODNET_VERSION = "0.0.3";
 
 export const chainConfigMap: {
   [key: number | string]: ChainData;
@@ -78,7 +78,7 @@ export const chainConfigMap: {
   421614: {
     name: arbitrumSepolia.name,
     icon: Arbitrum,
-    explorer: "https://sepolia-explorer.arbitrum.io",
+    explorer: "https://arbitrum-sepolia.blockscout.com/",
     blockTime: 0.23,
     confirmations: 7,
     rpcUrl: process.env.NEXT_PUBLIC_RPC_URL_ARB_TESTNET!,

apps/web/services/getTitlesFromUrlSegments.ts

@@ -159,7 +159,7 @@ export async function getTitlesFromUrlSegments(
       chainId: parseInt(segments[1]),
     };
     const tokenData = await fetchToken(tokenArgs)
-      .then((token) => token?.symbol)
+      .then((token) => token?.name)
       .catch(() => {
         console.error("Error fetching token from address: ", tokenArgs);
         toast.error("Token not found");

pkg/contracts/Makefile

@@ -401,10 +401,12 @@ deploy-multi-gnosis:
 	--rpc-url $(RPC_URL_GNOSIS) \
 	--sig "run(string)" 'gnosis' \
 	--account pkGarden \
+	--etherscan-api-key $(GNOSISSCAN_API_KEY) \
 	--ffi \
 	--chain-id 100 \
 	--broadcast \
 	--legacy \
+	--verify \
 	--via-ir \
 	-vvv
 

pkg/contracts/config/networks.json

@@ -113,8 +113,8 @@
       }
     },
     {
-      "name": "mainnet",
-      "chainId": 1,
+      "name": "gnosis",
+      "chainId": 100,
       "testnet": false,
       "no-safe": false,
       "ENVS": {
@@ -125,8 +125,8 @@
       }
     },
     {
-      "name": "gnosis",
-      "chainId": 100,
+      "name": "mainnet",
+      "chainId": 1,
       "testnet": false,
       "no-safe": false,
       "ENVS": {

pkg/subgraph/config/gnosis.json

@@ -0,0 +1,18 @@
+{
+  "network": "gnosis",
+  "chainId": 100,
+  "dataSources": [
+    {
+      "name": "RegistryFactoryV0_0",
+      "startBlock": 36032424,
+      "address": "0x08df82f74d1f56f650e98da2dd4240f1a31711bc",
+      "customTemplate": "registryFactory"
+    },
+    {
+      "name": "PassportScorer",
+      "startBlock": 36032424,
+      "address": "0xd7b72fcb6a4e2857685175f609d1498ff5392e46",
+      "customTemplate": "passportScorer"
+    }
+  ]
+}

pkg/subgraph/package.json

@@ -11,6 +11,7 @@
     "manifest:arbitrum": "node ./src/scripts/mustache arbitrum",
     "manifest:optimism": "node ./src/scripts/mustache optimism",
     "manifest:matic": "node ./src/scripts/mustache matic",
+    "manifest:gnosis": "node ./src/scripts/mustache gnosis",
     "build:arbsep": "pnpm manifest:arbsep && graph codegen && graph build",
     "build:ethsep": "pnpm manifest:ethsep && graph codegen && graph build",
     "create-local": "graph create --node http://localhost:8020/ kamikazebr/gv2",
@@ -21,6 +22,8 @@
     "deploy:arbitrum": "pnpm manifest:arbitrum && graph deploy --studio gv2-arbitrum",
     "deploy:optimism": "pnpm manifest:optimism && graph deploy --studio gv2-optimism",
     "deploy:matic": "pnpm manifest:matic && graph deploy --studio gv2-matic",
+    "deploy:gnosis": "pnpm manifest:gnosis && graph deploy --studio gv2-gnosis",
+    "deploy:prod": "export SUB_PROD_VERSION=0.0.4 && pnpm deploy:arbitrum -l $SUB_PROD_VERSION && pnpm deploy:optimism -l $SUB_PROD_VERSION && pnpm deploy:matic -l $SUB_PROD_VERSION && pnpm deploy:gnosis -l $SUB_PROD_VERSION",
     "build-deploy:arbsep": "pnpm build:arbsep && pnpm deploy:arbsep:last",
     "build-deploy:ethsep": "pnpm build:ethsep && pnpm deploy:ethsep:last",
     "local": "pnpm create-local && pnpm build && pnpm deploy:local",

pkg/subgraph/src/scripts/last-addr.cjs

@@ -4,7 +4,7 @@ const arbitrumSepoliaLatest = require("../../../../broadcast/DeployCVMultiChain.
 // const optimismSepoliaLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/11155420/run-latest.json");
 const sepoliaLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/11155111/run-latest.json");
 const optimismLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/10/run-latest.json");
-// const gnosisLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/100/run-latest.json");
+const gnosisLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/100/run-latest.json");
 const polygonLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/137/run-latest.json");
 const arbitrumLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/42161/run-latest.json");
 // const mainnetLatest = require("../../../../broadcast/DeployCVMultiChain.s.sol/1/run-latest.json");
@@ -19,7 +19,7 @@ const jsons = {
   [viemChains.sepolia.id]: sepoliaLatest,
 
   [viemChains.optimism.id]: optimismLatest,
-  // [viemChains.gnosis.id]: gnosisLatest,
+  [viemChains.gnosis.id]: gnosisLatest,
   [viemChains.polygon.id]: polygonLatest,
   [viemChains.arbitrum.id]: arbitrumLatest,
   // [viemChains.mainnet.id]: mainnetLatest

pkg/subgraph/subgraph.yaml

@@ -6,15 +6,15 @@ schema:
 dataSources:
   - kind: ethereum/contract
     name: RegistryFactoryV0_0
-    network: optimism
+    network: matic
     context:
       chainId: 
         type: Int
-        data: 10
+        data: 137
     source:
-      address: "0x1fac47cf25f1ca9f20ba366099d26b28401f5715"
+      address: "0x57a9835b204dbcc101dbf981625a3625e8043b9c"
       abi: RegistryFactoryV0_0
-      startBlock: 125112016
+      startBlock: 61584765
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -40,15 +40,15 @@ dataSources:
 
   - kind: ethereum/contract
     name: PassportScorer
-    network: optimism
+    network: matic
     context:
       chainId: 
         type: Int
-        data: 10
+        data: 137
     source:
-      address: "0xc93830dd463516ed5f28f6cd4f837173b87ff389"
+      address: "0x1fac47cf25f1ca9f20ba366099d26b28401f5715"
       abi: PassportScorer
-      startBlock: 125112016
+      startBlock: 61584765
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -72,7 +72,7 @@ dataSources:
 templates:
   - kind: ethereum/contract
     name: RegistryCommunityV0_0
-    network: optimism
+    network: matic
     source:
       abi: RegistryCommunityV0_0
     mapping:
@@ -134,7 +134,7 @@ templates:
 
   - kind: ethereum/contract
     name: CVStrategyV0_0
-    network: optimism
+    network: matic
     source:
       abi: CVStrategyV0_0
     mapping: