🐛 fix deployment CVStrategy via createPool

1Hive · Jul 30, 2024 · 3d22017 · 3d22017
1 parent 6c45cbd
commit 3d22017
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 29 deletions.
diff --git a/pkg/contracts/out/Allo.sol/Allo.json b/pkg/contracts/out/Allo.sol/Allo.json
diff --git a/pkg/contracts/out/CVStrategy.sol/CVStrategy.json b/pkg/contracts/out/CVStrategy.sol/CVStrategy.json
diff --git a/pkg/contracts/out/CVStrategy.sol/IPointStrategy.json b/pkg/contracts/out/CVStrategy.sol/IPointStrategy.json
diff --git a/pkg/contracts/out/CVStrategy.sol/StrategyStruct.json b/pkg/contracts/out/CVStrategy.sol/StrategyStruct.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/CVStrategyHelpersV0_0.sol/CVStrategyHelpersV0_0.json b/pkg/contracts/out/CVStrategyHelpersV0_0.sol/CVStrategyHelpersV0_0.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/ERC20/ERC20.sol/ERC20.json b/pkg/contracts/out/ERC20/ERC20.sol/ERC20.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/GV2ERC20.sol/GV2ERC20.json b/pkg/contracts/out/GV2ERC20.sol/GV2ERC20.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/MockERC20.sol/MockERC20.json b/pkg/contracts/out/MockERC20.sol/MockERC20.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/PassportScorerTest.t.sol/PassportScorerTest.json b/pkg/contracts/out/PassportScorerTest.t.sol/PassportScorerTest.json
diff --git a/pkg/contracts/out/Registry.sol/Registry.json b/pkg/contracts/out/Registry.sol/Registry.json
diff --git a/pkg/contracts/out/RegistryCommunity.sol/FAllo.json b/pkg/contracts/out/RegistryCommunity.sol/FAllo.json
diff --git a/pkg/contracts/out/RegistryCommunity.sol/RegistryCommunity.json b/pkg/contracts/out/RegistryCommunity.sol/RegistryCommunity.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/RegistryFactory.sol/RegistryFactory.json b/pkg/contracts/out/RegistryFactory.sol/RegistryFactory.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/RegistrySetup.sol/RegistrySetup.json b/pkg/contracts/out/RegistrySetup.sol/RegistrySetup.json
diff --git a/pkg/contracts/out/RegistrySetup.sol/RegistrySetupFull.json b/pkg/contracts/out/RegistrySetup.sol/RegistrySetupFull.json
diff --git a/pkg/contracts/out/TERC20.sol/TERC20.json b/pkg/contracts/out/TERC20.sol/TERC20.json
diff --git a/pkg/contracts/src/BaseStrategyUpgradeable.sol b/pkg/contracts/src/BaseStrategyUpgradeable.sol
@@ -136,6 +136,7 @@ abstract contract BaseStrategyUpgradeable is UUPSUpgradeable, IStrategy, Transfe
     /// @dev Will revert if the poolId is invalid or already initialized
     /// @param _poolId ID of the pool
     function __BaseStrategy_init(uint256 _poolId) internal virtual onlyAllo {
+        //@todo rename init to InitAllo
         // check if pool ID is not initialized already, if it is, revert
         if (poolId != 0) revert ALREADY_INITIALIZED();
 

diff --git a/pkg/contracts/src/RegistryCommunityV0_0.sol b/pkg/contracts/src/RegistryCommunityV0_0.sol
@@ -22,6 +22,10 @@ import {ISafe} from "./interfaces/ISafe.sol";
 import {RegistryFactory} from "./RegistryFactory.sol";
 import {IPointStrategy, StrategyStruct, CVStrategyV0_0} from "./CVStrategyV0_0.sol";
 
+import {Upgrades} from "@openzeppelin/foundry/LegacyUpgrades.sol";
+
+import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+
 contract RegistryCommunityV0_0 is
     OwnableUpgradeable,
     UUPSUpgradeable,
@@ -281,9 +285,14 @@ contract RegistryCommunityV0_0 is
         returns (uint256 poolId, address strategy)
     {
         // address strategyClone = Clone.createClone(strategyTemplate, cloneNonce++);
-        address strategyClone = address(new CVStrategyV0_0());
+        // address strategyClone = address(new CVStrategyV0_0());
+        address strategyProxy = address(
+            new ERC1967Proxy(
+                address(new CVStrategyV0_0()), abi.encodeWithSelector(CVStrategyV0_0.init.selector, address(allo))
+            )
+        );
 
-        return createPool(strategyClone, _token, _params, _metadata);
+        return createPool(strategyProxy, _token, _params, _metadata);
     }
 
     function createPool(

diff --git a/pkg/contracts/src/RegistryFactoryV0_0.sol b/pkg/contracts/src/RegistryFactoryV0_0.sol
@@ -107,7 +107,7 @@ contract RegistryFactoryV0_0 is OwnableUpgradeable, UUPSUpgradeable {
         return communityToInfo[_community].fee;
     }
 
-    function _authorizeUpgrade(address) internal override onlyOwner {}
+    function _authorizeUpgrade(address) internal virtual override onlyOwner {}
 
     uint256[50] private __gap;
 }