Merge branch 'dev' into fixing-dev

Author: Mati0x

apps/web/components/Forms/CommunityForm.tsx

@@ -210,7 +210,7 @@ export const CommunityForm = ({
   };
 
   const addressIsSAFE = async (walletAddress: Address) => {
-    if (localStorage.getItem("bypassSafeCheck") === "true") {
+    if (localStorage.getItem("bypassSafeCheck") === "true" || chainFromPath.isTestnet) {
       return true;
     }
     let isSafe = false;

apps/web/configs/chains.tsx

@@ -107,8 +107,8 @@ export const chainConfigMap: {
     ),
     globalTribunal: "0xb05A948B5c1b057B88D381bDe3A375EfEA87EbAD",
     allo: "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",
-    arbitrator: "0x5534fecacd5f84e22c0aba9ea9813ff594d37262",
-    passportScorer: "0x32fe66622a4d4607241ac723e23fef487acdabb5",
+    arbitrator: "0x05EC011e0d8B4d2add98e1cc4AC7DF38a95EF4Ed",
+    passportScorer: "0x2053E225672776deb23Af0A3EBa9CE2c87838a72",
     isTestnet: true,
   },
   // 11155111: {
@@ -149,8 +149,8 @@ export const chainConfigMap: {
     ),
     globalTribunal: "0x1b8c7f06f537711a7caf6770051a43b4f3e69a7e",
     allo: "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",
-    arbitrator: "0xd58ff588177f02cc535a0e235a4c002a17e27202",
-    passportScorer: "0xa2d5900d53a548637dd61312d02b90f3ff1d6a5e",
+    arbitrator: "0x10B469b23a47BC557daB81743af8A97Ef9e9f833",
+    passportScorer: "0x8cd4bA4ad10d85A550fe45d567a49E49e1D23CE1",
     isTestnet: false,
     safePrefix: "arb",
   },
@@ -168,8 +168,8 @@ export const chainConfigMap: {
     ),
     globalTribunal: "0x1B8C7f06F537711A7CAf6770051A43B4F3E69A7e",
     allo: "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",
-    arbitrator: "0xb39dfa15f96055664179e8ecaa890f3fa26c21e9",
-    passportScorer: "0xc93830dd463516ed5f28f6cd4f837173b87ff389",
+    arbitrator: "0x01b415E97310611EF5fea5c0b43470F6217456aA",
+    passportScorer: "0x084a5504dCFeac0ec3E10517247639e50c8DcFFd",
     isTestnet: false,
     safePrefix: "opt",
   },
@@ -187,8 +187,8 @@ export const chainConfigMap: {
     ),
     globalTribunal: "0x1B8C7f06F537711A7CAf6770051A43B4F3E69A7e",
     allo: "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",
-    arbitrator: "0x7842e2d0dda2e64727c251382e9b1ee70fa33b94",
-    passportScorer: "0x1fac47cf25f1ca9f20ba366099d26b28401f5715",
+    arbitrator: "0x8cb85C8FF0be6802AF7aE7462A44cD2a4103688e",
+    passportScorer: "0x190Fa730E6FfC64Ebd0031bE59b3007cC9eE2bB3",
     isTestnet: false,
     safePrefix: "matic",
   },
@@ -206,8 +206,8 @@ export const chainConfigMap: {
     ),
     globalTribunal: "0x1B8C7f06F537711A7CAf6770051A43B4F3E69A7e",
     allo: "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",
-    arbitrator: "0x450967c1497ab95df8530a9a8eaae5e951171dee",
-    passportScorer: "0xd7b72fcb6a4e2857685175f609d1498ff5392e46",
+    arbitrator: "0x7dd4020A2344A9e039092F12e46ba4F1EF1e3c91",
+    passportScorer: "0x20965C5C8a021ac6fFeD5dE7A402f7CEaC3b0A82",
     isTestnet: false,
     safePrefix: "gno",
   },

apps/web/configs/subgraph.json

@@ -1,4 +1,4 @@
 {
-  "VERSION_TESTNET": "0.2.0",
-  "VERSION_PROD": "0.1.4"
+  "VERSION_TESTNET": "0.2.4",
+  "VERSION_PROD": "0.1.7"
 }

apps/web/hooks/useConvictionRead.ts

@@ -59,7 +59,7 @@ export const useConvictionRead = ({
   const { data: thresholdFromContract, error: errorThreshold } =
     useContractRead({
       ...cvStrategyContract,
-      functionName: "calculateThreshold" as any,
+      functionName: "calculateThreshold",
       args: [proposalData?.requestedAmount ?? 0],
       enabled: enabled && PoolTypes[strategyConfig?.proposalType] === "funding",
     });
@@ -135,6 +135,7 @@ export const useConvictionRead = ({
 
   logOnce("debug", "Conviction computed numbers", {
     thresholdPct,
+    thresholdFromContract,
     totalSupportPct,
     currentConvictionPct,
   });

broadcast/DeployPassportScorer.s.sol/10/run-1732386580.json

@@ -14,7 +14,7 @@ extra_output = ["storageLayout"]
 optimizer = true
 optimizer-runs = 0
 # prompt_timeout = 120
-fs_permissions = [{ access = "read", path = "./"}]
+fs_permissions = [{ access = "read-write", path = "./"}]
 # fs_permissions = []
 # auto_detect_remappings = true # recursive auto-detection of remappings
 # remappings = ["ds-test/=lib/forge-std/lib/ds-test/src/",

broadcast/DeployPassportScorer.s.sol/10/run-latest.json

@@ -265,37 +265,50 @@ transfer-ownership-arbsep:
 	--account pkGarden \
 	--sig "run(string)" 'arbsepolia' \
 	--chain-id 421614 \
-	--via-ir \
 	--broadcast \
+	--via-ir \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--verify \
 	-vvvv
 
 deploy-passport-scorer-arbsep:
 	-forge script script/DeployPassportScorer.s.sol:DeployPassportScorer \
 	--rpc-url $(RPC_URL_ARB_TESTNET) \
-	--account pkGarden \
 	--sig "run(string)" 'arbsepolia' \
 	--chain-id 421614 \
-	--via-ir \
 	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
 	--verify \
 	--broadcast \
-	-vvvv
-
+	-vv
 
 deploy-safe-arbitrator-arbsep:
 	-forge script script/DeploySafeArbitrator.s.sol:DeploySafeArbitrator \
 	--rpc-url $(RPC_URL_ARB_TESTNET) \
-	--account pkGarden \
 	--sig "run(string)" 'arbsepolia' \
 	--chain-id 421614 \
-	--via-ir \
 	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
 	--verify \
 	--broadcast \
-	-vvvv
+	-vv
 
 # Arbitrum
 
+transfer-ownership-arbitrum:
+	-forge script script/TransferOwnershipAllContracts.s.sol:TransferOwnershipAllContracts \
+	--rpc-url $(RPC_URL_ARB) \
+	--account pkGarden \
+	--sig "run(string)" 'arbitrum' \
+	--chain-id 42161 \
+	--broadcast \
+	--via-ir \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--verify \
+	-vvv
+
 deploy-new-collateral-vault-template-arbitrum: 
 	-forge script script/DeployCollateralVaultTemplate.s.sol:DeployCollateralVaultTemplate \
 	--rpc-url $(RPC_URL_ARB) \
@@ -357,23 +370,59 @@ change-passport-manager-arbitrum:
 	-forge script script/PassportScorerWriter.s.sol:PassportScorerWriter \
 	--rpc-url $(RPC_URL_ARB) \
 	--sig "run(string)" 'arbitrum' \
+	--chain-id 42161 \
 	--account pkGarden \
 	--ffi \
-	--chain-id 42161 \
 	--broadcast \
 	--legacy \
 	-vvv
 
+deploy-passport-scorer-arbitrum:
+	-forge script script/DeployPassportScorer.s.sol:DeployPassportScorer \
+	--rpc-url $(RPC_URL_ARB) \
+	--sig "run(string)" 'arbitrum' \
+	--chain-id 42161 \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
+deploy-safe-arbitrator-arbitrum:
+	-forge script script/DeploySafeArbitrator.s.sol:DeploySafeArbitrator \
+	--rpc-url $(RPC_URL_ARB) \
+	--sig "run(string)" 'arbitrum' \
+	--chain-id 42161 \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
 # Optimism
 
+transfer-ownership-optimism:
+	-forge script script/TransferOwnershipAllContracts.s.sol:TransferOwnershipAllContracts \
+	--rpc-url $(RPC_URL_OPT) \
+	--sig "run(string)" 'optimism' \
+	--etherscan-api-key $(OPTIMISM_API_KEY) \
+	--chain-id 10 \
+	--account pkGarden \
+	--broadcast \
+	--via-ir \
+	--verify \
+	-vvv
+
 deploy-new-collateral-vault-template-optimism: 
 	-forge script script/DeployCollateralVaultTemplate.s.sol:DeployCollateralVaultTemplate \
 	--rpc-url $(RPC_URL_OPT) \
 	--sig "run(string)" 'optimism' \
-	--account pkGarden \
 	--etherscan-api-key $(OPTIMISM_API_KEY) \
-	--ffi \
 	--chain-id 10 \
+	--account pkGarden \
+	--ffi \
 	--legacy \
 	--broadcast \
 	--via-ir \
@@ -429,23 +478,59 @@ change-passport-manager-optimism:
 	-forge script script/PassportScorerWriter.s.sol:PassportScorerWriter \
 	--rpc-url $(RPC_URL_OPT) \
 	--sig "run(string)" 'optimism' \
+	--chain-id 10 \
 	--account pkGarden \
 	--ffi \
-	--chain-id 10 \
 	--broadcast \
 	--legacy \
 	-vvv
 
+deploy-passport-scorer-optimism:
+	-forge script script/DeployPassportScorer.s.sol:DeployPassportScorer \
+	--rpc-url $(RPC_URL_OPT) \
+	--sig "run(string)" 'optimism' \
+	--chain-id 10 \
+	--etherscan-api-key $(OPTIMISM_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
+deploy-safe-arbitrator-optimism:
+	-forge script script/DeploySafeArbitrator.s.sol:DeploySafeArbitrator \
+	--rpc-url $(RPC_URL_OPT) \
+	--sig "run(string)" 'optimism' \
+	--chain-id 10 \
+	--etherscan-api-key $(OPTIMISM_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
 # Polygon
 
+transfer-ownership-polygon:
+	-forge script script/TransferOwnershipAllContracts.s.sol:TransferOwnershipAllContracts \
+	--rpc-url $(RPC_URL_POLYGON) \
+	--sig "run(string)" 'polygon' \
+	--etherscan-api-key $(POLYGONSCAN_API_KEY) \
+	--chain-id 137 \
+	--account pkGarden \
+	--broadcast \
+	--via-ir \
+	--verify \
+	-vvv
+
 deploy-new-collateral-vault-template-polygon: 
 	-forge script script/DeployCollateralVaultTemplate.s.sol:DeployCollateralVaultTemplate \
 	--rpc-url $(RPC_URL_POLYGON) \
 	--sig "run(string)" 'polygon' \
-	--account pkGarden \
 	--etherscan-api-key $(POLYGONSCAN_API_KEY) \
-	--ffi \
 	--chain-id 137 \
+	--account pkGarden \
+	--ffi \
 	--legacy \
 	--broadcast \
 	--via-ir \
@@ -499,23 +584,59 @@ change-passport-manager-polygon:
 	-forge script script/PassportScorerWriter.s.sol:PassportScorerWriter \
 	--rpc-url $(RPC_URL_POLYGON) \
 	--sig "run(string)" 'polygon' \
+	--chain-id 137 \
 	--account pkGarden \
 	--ffi \
-	--chain-id 137 \
 	--broadcast \
 	--legacy \
 	-vvv
 
+deploy-passport-scorer-polygon:
+	-forge script script/DeployPassportScorer.s.sol:DeployPassportScorer \
+	--rpc-url $(RPC_URL_POLYGON) \
+	--sig "run(string)" 'polygon' \
+	--chain-id 137 \
+	--etherscan-api-key $(POLYGONSCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
+deploy-safe-arbitrator-polygon:
+	-forge script script/DeploySafeArbitrator.s.sol:DeploySafeArbitrator \
+	--rpc-url $(RPC_URL_POLYGON) \
+	--sig "run(string)" 'polygon' \
+	--chain-id 137 \
+	--etherscan-api-key $(POLYGONSCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
 # Gnosis
 
+transfer-ownership-gnosis:
+	-forge script script/TransferOwnershipAllContracts.s.sol:TransferOwnershipAllContracts \
+	--rpc-url $(RPC_URL_GNOSIS) \
+	--sig "run(string)" 'gnosis' \
+	--etherscan-api-key $(GNOSISSCAN_API_KEY) \
+	--chain-id 100 \
+	--account pkGarden \
+	--broadcast \
+	--via-ir \
+	--verify \
+	-vvv
+
 deploy-new-collateral-vault-template-gnosis: 
 	-forge script script/DeployCollateralVaultTemplate.s.sol:DeployCollateralVaultTemplate \
 	--rpc-url $(RPC_URL_GNOSIS) \
 	--sig "run(string)" 'gnosis' \
-	--account pkGarden \
 	--etherscan-api-key $(GNOSISSCAN_API_KEY) \
-	--ffi \
 	--chain-id 100 \
+	--account pkGarden \
+	--ffi \
 	--legacy \
 	--broadcast \
 	--via-ir \
@@ -554,17 +675,41 @@ verify-blockscout-gnosis:
 	-forge script script/UpgradeCVMultichainProd.s.sol:UpgradeCVMultichainProd \
 	--rpc-url $(RPC_URL_GNOSIS) \
 	--sig "run(string)" 'gnosis' \
+	--chain-id 100 \
 	--account pkGarden \
 	--verifier blockscout \
 	--verifier-url https://gnosis.blockscout.com/api/ \
 	--ffi \
-	--chain-id 100 \
 	--legacy \
 	--verify \
 	--via-ir \
 	-vvv \
 	--slow
 
+deploy-passport-scorer-gnosis:
+	-forge script script/DeployPassportScorer.s.sol:DeployPassportScorer \
+	--rpc-url $(RPC_URL_GNOSIS) \
+	--sig "run(string)" 'gnosis' \
+	--chain-id 100 \
+	--etherscan-api-key $(GNOSISSCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
+deploy-safe-arbitrator-gnosis:
+	-forge script script/DeploySafeArbitrator.s.sol:DeploySafeArbitrator \
+	--rpc-url $(RPC_URL_GNOSIS) \
+	--sig "run(string)" 'gnosis' \
+	--chain-id 100 \
+	--etherscan-api-key $(GNOSISSCAN_API_KEY) \
+	--account pkGarden \
+	--via-ir \
+	--verify \
+	--broadcast \
+	-vv
+
 # verify-tenderly-gnosis: 
 # 	-forge script script/UpgradeCVMultichainProd.s.sol:UpgradeCVMultichainProd \
 # 	--rpc-url $(RPC_URL_GNOSIS) \