Merge branch 'allowlist-feature' into ui-allowlist

1Hive · Sep 15, 2024 · 5b8ed37 · 5b8ed37
2 parents a1565d6 + 286cc76
commit 5b8ed37
Show file tree

Hide file tree

Showing 23 changed files with 1,067 additions and 1,058 deletions.
diff --git a/apps/web/configs/chains.tsx b/apps/web/configs/chains.tsx
@@ -54,7 +54,7 @@ type ChainData = {
  isTestnet: boolean;
 };
 
-const SUBGRAPH_TESTNET_VERSION = "0.1.0";
+const SUBGRAPH_TESTNET_VERSION = "0.1.1";
 const SUBGRAPH_PRODNET_VERSION = "1.3";
 
 export const chainConfigMap: {

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/out/CVStrategyHelpers.sol/CVStrategyHelpers.json b/pkg/contracts/out/CVStrategyHelpers.sol/CVStrategyHelpers.json
diff --git a/pkg/contracts/out/CVStrategyV0_0.sol/CVStrategyV0_0.json b/pkg/contracts/out/CVStrategyV0_0.sol/CVStrategyV0_0.json
diff --git a/pkg/contracts/out/CVStrategyV0_0.sol/IPointStrategy.json b/pkg/contracts/out/CVStrategyV0_0.sol/IPointStrategy.json
diff --git a/pkg/contracts/out/CVStrategyV0_0.sol/StrategyStruct.json b/pkg/contracts/out/CVStrategyV0_0.sol/StrategyStruct.json
diff --git a/pkg/contracts/out/CVStrategyV0_1.sol/CVStrategyV0_1.json b/pkg/contracts/out/CVStrategyV0_1.sol/CVStrategyV0_1.json
diff --git a/pkg/contracts/out/CVStrategyV0_1.sol/StrategyStruct2.json b/pkg/contracts/out/CVStrategyV0_1.sol/StrategyStruct2.json
diff --git a/pkg/contracts/out/FAllo.sol/FAllo.json b/pkg/contracts/out/FAllo.sol/FAllo.json
diff --git a/pkg/contracts/out/IArbitrator.sol/IArbitrator.json b/pkg/contracts/out/IArbitrator.sol/IArbitrator.json
diff --git a/pkg/contracts/out/IRegistryFactory.sol/IRegistryFactory.json b/pkg/contracts/out/IRegistryFactory.sol/IRegistryFactory.json
diff --git a/pkg/contracts/out/ISafe.sol/Enum.json b/pkg/contracts/out/ISafe.sol/Enum.json
diff --git a/pkg/contracts/out/ISafe.sol/ISafe.json b/pkg/contracts/out/ISafe.sol/ISafe.json
diff --git a/pkg/contracts/out/ISafe.sol/SafeProxyFactory.json b/pkg/contracts/out/ISafe.sol/SafeProxyFactory.json
diff --git a/pkg/contracts/out/PassportScorer.sol/PassportScorer.json b/pkg/contracts/out/PassportScorer.sol/PassportScorer.json
diff --git a/pkg/contracts/out/RegistryCommunityV0_0.sol/RegistryCommunityV0_0.json b/pkg/contracts/out/RegistryCommunityV0_0.sol/RegistryCommunityV0_0.json
diff --git a/pkg/contracts/out/RegistryCommunityV0_1.sol/RegistryCommunityV0_1.json b/pkg/contracts/out/RegistryCommunityV0_1.sol/RegistryCommunityV0_1.json
diff --git a/pkg/contracts/out/RegistryFactoryV0_0.sol/RegistryFactoryV0_0.json b/pkg/contracts/out/RegistryFactoryV0_0.sol/RegistryFactoryV0_0.json
diff --git a/pkg/contracts/out/RegistryFactoryV0_1.sol/RegistryFactoryV0_1.json b/pkg/contracts/out/RegistryFactoryV0_1.sol/RegistryFactoryV0_1.json
diff --git a/pkg/contracts/out/SafeArbitrator.sol/SafeArbitrator.json b/pkg/contracts/out/SafeArbitrator.sol/SafeArbitrator.json
diff --git a/pkg/contracts/src/CVStrategy/CVStrategyV0_1.sol b/pkg/contracts/src/CVStrategy/CVStrategyV0_1.sol
@@ -54,11 +54,20 @@ contract CVStrategyV0_1 is CVStrategyV0_0 {
  address[] memory membersToRemove
  ) internal virtual {
  super._setPoolParams(_arbitrableConfig, _cvParams);
-
  _addToAllowList(membersToAdd);
  _removeFromAllowList(membersToRemove);
  }
 
+ function setPoolParams(
+ StrategyStruct.ArbitrableConfig memory _arbitrableConfig,
+ StrategyStruct.CVParams memory _cvParams,
+ address[] memory membersToAdd,
+ address[] memory membersToRemove
+ ) external virtual {
+ onlyCouncilSafe();
+ _setPoolParams(_arbitrableConfig, _cvParams, membersToAdd, membersToRemove);
+ }
+
  function _canExecuteAction(address _user) internal view override returns (bool) {
  if (address(sybilScorer) == address(0)) {
  bytes32 allowlistRole = keccak256(abi.encodePacked("ALLOWLIST", poolId));

diff --git a/pkg/subgraph/config/arbsepolia.json b/pkg/subgraph/config/arbsepolia.json
@@ -4,14 +4,14 @@
  "dataSources": [
  {
  "name": "RegistryFactoryV0_0",
- "startBlock": 79714794,
- "address": "0xf7e551e8b815b9ecc3922f833551d6f47a8159ec",
+ "startBlock": 80895286,
+ "address": "0x5b1ed8559c26b06b79729e46aee400605f07a109",
  "customTemplate": "registryFactory"
  },
  {
  "name": "PassportScorer",
- "startBlock": 79714794,
- "address": "0xd49884140c6bcf4bda7cce84cc607a7ef2b9b2f1",
+ "startBlock": 80895286,
+ "address": "0xbeca1cf897ecd4bb21b835eaa221f1b6a96524f4",
  "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: "0xf7e551e8b815b9ecc3922f833551d6f47a8159ec"
+ address: "0x5b1ed8559c26b06b79729e46aee400605f07a109"
  abi: RegistryFactoryV0_0
- startBlock: 79714794
+ startBlock: 80895286
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.7
@@ -46,9 +46,9 @@ dataSources:
  type: Int
  data: 421614
  source:
- address: "0xd49884140c6bcf4bda7cce84cc607a7ef2b9b2f1"
+ address: "0xbeca1cf897ecd4bb21b835eaa221f1b6a96524f4"
  abi: PassportScorer
- startBlock: 79714794
+ startBlock: 80895286
  mapping:
  kind: ethereum/events
  apiVersion: 0.0.7