New deploy + subgraph 0.2.0

1Hive · Nov 10, 2024 · 167f76f · 167f76f
1 parent 16a4047
commit 167f76f
Show file tree

Hide file tree

Showing 7 changed files with 3,034 additions and 1,281 deletions.
diff --git a/apps/web/configs/subgraph.json b/apps/web/configs/subgraph.json
@@ -1,4 +1,4 @@
 {
-  "VERSION_TESTNET": "0.1.26",
+  "VERSION_TESTNET": "0.2.0",
   "VERSION_PROD": "0.1.4"
 }
diff --git a/broadcast/DeployCVMultiChain.s.sol/421614/run-1731213222.json b/broadcast/DeployCVMultiChain.s.sol/421614/run-1731213222.json
diff --git a/broadcast/DeployCVMultiChain.s.sol/421614/run-latest.json b/broadcast/DeployCVMultiChain.s.sol/421614/run-latest.json
diff --git a/pkg/contracts/Makefile b/pkg/contracts/Makefile
@@ -132,7 +132,7 @@ deploy-arbsep:
 	--legacy \
 	--via-ir \
 	--verify \
-	-vvvvv
+	-vv
 
 upgrade-arbsep: 
 	-forge script script/UpgradeCVMultichainTest.s.sol:UpgradeCVMultichainTest \

diff --git a/pkg/contracts/script/DeployCVMultiChain.s.sol b/pkg/contracts/script/DeployCVMultiChain.s.sol
@@ -51,12 +51,12 @@ contract DeployCVMultiChain is Native, CVStrategyHelpers, Script, SafeSetup {
 
     string public CURRENT_NETWORK = "arbsepolia";
 
-    address BENEFICIARY = 0xc583789751910E39Fd2Ddb988AD05567Bcd81334;
+    address BENEFICIARY = 0xb05A948B5c1b057B88D381bDe3A375EfEA87EbAD;
 
-    ProxyOwner public PROXY_OWNER;
+    address public PROXY_OWNER = 0xD28473FbD87183864CAc0482DBEe1C54EE3d8Cd1;
     RegistryFactoryV0_0 public REGISTRY_FACTORY; // = RegistryFactoryV0_0(0xd7b72Fcb6A4e2857685175F609D1498ff5392E46);
-    PassportScorer PASSPORT_SCORER; // = PassportScorer(0x83bDE2E2D8AcAAad2D300DA195dF3cf86b234bdd);
-    SafeArbitrator ARBITRATOR; // = SafeArbitrator(0x450967C1497Ab95dF8530A9a8eAaE5E951171Dee);
+    PassportScorer PASSPORT_SCORER = PassportScorer(0x32Fe66622a4D4607241AC723e23Fef487ACDABb5);
+    SafeArbitrator ARBITRATOR = SafeArbitrator(0x5534FECacD5f84e22C0aBA9ea9813ff594D37262);
 
     uint256 councilMemberPKEnv;
     address allo_proxy;
@@ -131,10 +131,10 @@ contract DeployCVMultiChain is Native, CVStrategyHelpers, Script, SafeSetup {
             revert("ALLO_PROXY not set");
         }
         // get PK from env
-        councilMemberPKEnv = vm.envUint("PK");
-        if (councilMemberPKEnv == 0) {
-            revert("PK not set");
-        }
+        // councilMemberPKEnv = vm.envUint("PK");
+        // if (councilMemberPKEnv == 0) {
+        //     revert("PK not set");
+        // }
 
         allo = Allo(allo_proxy);
 
@@ -147,9 +147,9 @@ contract DeployCVMultiChain is Native, CVStrategyHelpers, Script, SafeSetup {
                 address(new ProxyOwner()), abi.encodeWithSelector(ProxyOwner.initialize.selector, SENDER)
             );
 
-            PROXY_OWNER = ProxyOwner(payable(address(proxyOwnerProxy)));
+            PROXY_OWNER = address(proxyOwnerProxy);
         }
-        console2.log("Proxy owner Addr: %s", address(PROXY_OWNER));
+        console2.log("Proxy owner Addr: %s", PROXY_OWNER);
 
         if (address(PASSPORT_SCORER) == address(0)) {
             ERC1967Proxy scorerProxy = new ERC1967Proxy(

diff --git a/pkg/subgraph/config/arbsepolia.json b/pkg/subgraph/config/arbsepolia.json
@@ -4,14 +4,14 @@
   "dataSources": [
     {
       "name": "RegistryFactoryV0_0",
-      "startBlock": 73590779,
-      "address": "0x7a603877488db46c0f6b40c2c770becfd7a65593",
+      "startBlock": 95965509,
+      "address": "0x2689b1e4afcbfb393d9727fba2ab52930035ee85",
       "customTemplate": "registryFactory"
     },
     {
       "name": "PassportScorer",
-      "startBlock": 73590779,
-      "address": "0xfF53a163e43EccC00d8FdE7acA24aa9FA4da7356",
+      "startBlock": 95965509,
+      "address": "0x32Fe66622a4D4607241AC723e23Fef487ACDABb5",
       "customTemplate": "passportScorer"
     }
   ]

diff --git a/pkg/subgraph/subgraph.yaml b/pkg/subgraph/subgraph.yaml
@@ -12,9 +12,9 @@ dataSources:
         type: Int
         data: 421614
     source:
-      address: "0x7a603877488db46c0f6b40c2c770becfd7a65593"
+      address: "0x2689b1e4afcbfb393d9727fba2ab52930035ee85"
       abi: RegistryFactoryV0_0
-      startBlock: 73590779
+      startBlock: 95965509
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -46,9 +46,9 @@ dataSources:
         type: Int
         data: 421614
     source:
-      address: "0xfF53a163e43EccC00d8FdE7acA24aa9FA4da7356"
+      address: "0x32Fe66622a4D4607241AC723e23Fef487ACDABb5"
       abi: PassportScorer
-      startBlock: 73590779
+      startBlock: 95965509
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7