✨ Deploy script

.gitignore

@@ -45,3 +45,4 @@ pkg/contracts/broadcast/**/dry-run/
 # subgraph
 pkg/subgraph/generated
 pkg/**/data
+

.vscode/settings.json

@@ -2,7 +2,7 @@
   "solidity.packageDefaultDependenciesContractsDirectory": "pkg/contracts/src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
   "[solidity]": {
-    "editor.defaultFormatter": "JuanBlanco.solidity",
+    "editor.defaultFormatter": "NomicFoundation.hardhat-solidity",
     "editor.formatOnSave": true
   },
   "solidity.formatter": "forge",

foundry.toml

@@ -1,7 +1,7 @@
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#default-profile
 [profile.default]
 # solc-version = "0.8.19"
-src = 'pkg/contracts/src'
+src = 'pkg/contracts'
 test = 'pkg/contracts/test'
 out = 'pkg/contracts/out'
 libs = ['lib']
@@ -10,7 +10,11 @@ optimizer = true
 optimizer-runs = 1_000
 
 # auto_detect_remappings = true # recursive auto-detection of remappings
-# remappings = []
+# remappings = ["ds-test/=lib/forge-std/lib/ds-test/src/",
+# "forge-std/=lib/forge-std/src/",
+# "allo-v2/=lib/allo-v2/"
+# ,"allo-v2-contracts/=lib/allo-v2/contracts/"
+# ,"allo-v2-test/=lib/allo-v2/test/","safe-contracts/=lib/safe-contracts/"]
 # # list of libraries to link in the form of `<path to lib>:<lib name>:<address>`: `"src/MyLib.sol:MyLib:0x8De6DDbCd5053d32292AAA0D2105A32d108484a6"`
 # # the <path to lib> supports remappings
 # libraries = []

pkg/contracts/Makefile

@@ -0,0 +1,24 @@
+# Lets creata commans to foundry
+# forge script DeployCV.s.sol --account pk 
+
+# read RPC_URL from .env file
+include .env
+
+# create RPC_URL_LOCALHOST variable
+RPC_URL_LOCALHOST = http://localhost:8545
+# print RPC_URL
+print : 
+	@echo $(RPC_URL)
+
+deploy : 
+	forge script script/DeployCV.s.sol:DeployCV --account pk --rpc-url $(RPC_URL_LOCALHOST) --account pk  --sender 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266 --broadcast --unlocked -vv
+
+fork:
+	anvil -f $(RPC_URL)
+
+test1:
+	forge test --fork-url $(RPC_URL_LOCALHOST) --mc CVStrategyTest --sender 0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266 -vv
+
+
+cast1:
+	 cast send --account pk --rpc-url $(RPC_URL_LOCALHOST) "0xfEcFbe13c84595Ba47464CD4d8d3bb359372Fc6f" "nonce()" 

pkg/contracts/example.env

@@ -0,0 +1,4 @@
+RPC_URL=
+ALLO_PROXY=0x1133eA7Af70876e64665ecD07C0A0476d09465a1
+ALLO_IMPL=0xB087535DB0df98fC4327136e897A5985E5Cfbd66
+REGISTRY=0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3

pkg/contracts/script/DeployCV.s.sol

@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/console2.sol";
+
+import "forge-std/Script.sol";
+
+import "../src/CVStrategy.sol";
+
+import {IAllo} from "allo-v2-contracts/core/interfaces/IAllo.sol";
+
+import {Allo} from "allo-v2-contracts/core/Allo.sol";
+
+import {IRegistry} from "allo-v2-contracts/core/interfaces/IRegistry.sol";
+
+import {Native} from "allo-v2-contracts/core/libraries/Native.sol";
+
+import {CVStrategyHelpers} from "../test/CVStrategyHelpers.sol";
+
+import {MockERC20 as AMockERC20} from "allo-v2-test/utils/MockERC20.sol";
+// import "allo-v2-test/utils/MockERC20.sol";
+
+import {RegistryFactory} from "../src/RegistryFactory.sol";
+import {SafeSetup} from "../test/shared/SafeSetup.sol";
+import {Metadata} from "allo-v2-contracts/core/libraries/Metadata.sol";
+
+import {Accounts} from "allo-v2-test/foundry/shared/Accounts.sol";
+
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+contract DeployCV is Native, CVStrategyHelpers, Script, SafeSetup {
+    address public ALLO_PROXY_ADDRESS;
+
+    uint256 public constant MINIMUM_STAKE = 50;
+
+    AMockERC20 public token;
+
+    function pool_admin() public virtual override returns (address) {
+        // return makeAddr("pool_admin");
+        return address(0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266);
+    }
+
+    function run() public {
+        ALLO_PROXY_ADDRESS = vm.envAddress("ALLO_PROXY");
+        Allo allo = Allo(ALLO_PROXY_ADDRESS);
+
+        vm.startBroadcast(pool_admin());
+
+        token = new AMockERC20();
+
+        IRegistry registry = allo.getRegistry();
+
+        RegistryFactory registryFactory = new RegistryFactory();
+        RegistryGardens.InitializeParams memory params;
+        params._allo = address(allo);
+
+        params._gardenToken = IERC20(address(token));
+
+        params._minimumStakeAmount = MINIMUM_STAKE;
+        params._protocolFee = 2;
+        params._metadata = metadata;
+        params._councilSafe = payable(address(_councilSafe()));
+        RegistryGardens registryGardens = RegistryGardens(registryFactory.createRegistry(params));
+
+        CVStrategy strategy = new CVStrategy(ALLO_PROXY_ADDRESS);
+
+        vm.stopBroadcast();
+
+        address[] memory membersStaked = new address[](4);
+
+        membersStaked[0] = address(0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266);
+        membersStaked[1] = address(0x70997970C51812dc3A010C7d01b50e0d17dc79C8);
+        membersStaked[2] = address(0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC);
+        membersStaked[3] = address(0x90F79bf6EB2c4f870365E785982E1f101E93b906);
+
+        for (uint256 i = 0; i < membersStaked.length; i++) {
+            vm.startBroadcast(address(membersStaked[i]));
+            token.mint(address(membersStaked[i]), 100 ether);
+            token.approve(address(registryGardens), MINIMUM_STAKE);
+            registryGardens.stakeAndregisterMember();
+            vm.stopBroadcast();
+        }
+
+        vm.startBroadcast(address(allo.owner()));
+        allo.addToCloneableStrategies(address(strategy));
+        vm.stopBroadcast();
+
+        vm.startBroadcast(pool_admin());
+        vm.deal(address(pool_admin()), 1 ether);
+
+        token.mint(address(pool_admin()), 100 ether);
+
+        uint256 poolId = createPool(Allo(address(allo)), address(strategy), address(0), registry, address(token));
+        token.approve(address(allo), 100 ether);
+        allo.fundPool(poolId, 0.1 ether); // gonna sue TOKENS here
+
+        uint256 poolIdNative = createPool(Allo(address(allo)), address(strategy), address(0), registry, address(0));
+        allo.fundPool{value: 0.1 ether}(poolIdNative, 0.1 ether);
+
+        vm.stopBroadcast();
+
+        console2.log("PoolId: %s", poolId);
+        console2.log("Allo Addr: %s", address(allo));
+        console2.log("Strategy Addr: %s", address(strategy));
+        console2.log("Token Addr: %s", address(token));
+
+        console2.log("Registry Gardens Addr: %s", address(registryGardens));
+
+        console2.log("Registry Addr: %s", address(registry));
+        console2.log("Pool Admin: %s", pool_admin());
+        console2.log("Council Safe: %s", address(_councilSafe()));
+    }
+}

pkg/contracts/src/CVStrategy.sol

@@ -25,9 +25,12 @@ contract CVStrategy is BaseStrategy, IWithdrawMember {
     error NotEnoughPointsToSupport(uint256 pointsSupport, uint256 pointsBalance);
     error TokenCannotBeZero();
     error ProposalSupportDuplicated(uint256 _proposalId, uint256 index);
+    error ProposalIdAlreadyExist(uint256 _proposalId);
+
     /*|--------------------------------------------|*/
     /*|              CUSTOM EVENTS                 |*/
     /*|--------------------------------------------|*/
+
     event InitializedCV(uint256 poolId, bytes data);
     /*|--------------------------------------------|*o
     /*|              STRUCTS/ENUMS                 |*/
@@ -54,6 +57,7 @@ contract CVStrategy is BaseStrategy, IWithdrawMember {
         Paused, // A vote that is being challenged by Agreements
         Cancelled, // A vote that has been cancelled
         Executed // A vote that has been executed
+
     }
 
     struct Proposal {
@@ -186,7 +190,13 @@ contract CVStrategy is BaseStrategy, IWithdrawMember {
         if (proposal.amountRequested == 0) {
             revert UserCannotBeZero();
         }
+
         Proposal storage p = proposals[proposal.proposalId];
+
+        if (p.proposalId == proposal.proposalId) {
+            revert ProposalIdAlreadyExist(proposal.proposalId);
+        }
+
         p.proposalId = proposal.proposalId;
         p.submitter = _sender;
         p.beneficiary = proposal.beneficiary;
@@ -481,7 +491,6 @@ contract CVStrategy is BaseStrategy, IWithdrawMember {
      * @param _oldAmount Amount of tokens staked until now
      * @return Current conviction
      */
-
     function calculateConviction(uint256 _timePassed, uint256 _lastConv, uint256 _oldAmount)
         public
         view

pkg/contracts/src/RegistryGardens.sol

@@ -45,7 +45,6 @@ contract RegistryGardens is ReentrancyGuard, AccessControl {
         _;
     }
 
-
     /*|--------------------------------------------|*/
     /*|              CUSTOM ERRORS                 |*/
     /*|--------------------------------------------|*/
@@ -152,7 +151,7 @@ contract RegistryGardens is ReentrancyGuard, AccessControl {
     }
 
     function acceptCouncilSafe() public {
-        if (msg.sender != pendingCouncilSafe){
+        if (msg.sender != pendingCouncilSafe) {
             revert CallerIsNotNewOnwer();
         }
         _changeCouncilSafe();

pkg/contracts/test/CVStrategyHelpers.sol

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: UNLICENSED
+
+pragma solidity ^0.8.13;
+
+import {Allo} from "allo-v2-contracts/core/Allo.sol";
+import {Metadata} from "allo-v2-contracts/core/libraries/Metadata.sol";
+import {CVStrategy} from "../src/CVStrategy.sol";
+import {Native} from "allo-v2-contracts/core/libraries/Native.sol";
+import {IRegistry} from "allo-v2-contracts/core/interfaces/IRegistry.sol";
+
+import {Accounts} from "allo-v2-test/foundry/shared/Accounts.sol";
+
+contract CVStrategyHelpers is Native, Accounts {
+    Metadata public metadata = Metadata({protocol: 1, pointer: "strategy pointer"});
+
+    bytes32 internal _poolProfileId_;
+
+    function poolProfile_id(IRegistry registry) public virtual returns (bytes32) {
+        if (_poolProfileId_ == bytes32(0)) {
+            _poolProfileId_ = registry.createProfile(
+                0, "Pool Profile 1", Metadata({protocol: 1, pointer: "PoolProfile1"}), pool_admin(), pool_managers()
+            );
+        }
+        return _poolProfileId_;
+    }
+
+    function createPool(Allo allo, address strategy, address registryGardens, IRegistry registry, address token)
+        public
+        returns (uint256 poolId)
+    {
+        // IAllo allo = IAllo(ALLO_PROXY_ADDRESS);
+        CVStrategy.InitializeParams memory params;
+        params.decay = _etherToFloat(0.9 ether); // alpha = decay
+        params.maxRatio = _etherToFloat(0.2 ether); // beta = maxRatio
+        params.weight = _etherToFloat(0.002 ether); // RHO = p  = weight
+        params.minThresholdStakePercentage = 0.2 ether; // 20%
+        params.registryGardens = registryGardens;
+
+        address[] memory pool_managers = new address[](2);
+        pool_managers[0] = address(this);
+        pool_managers[1] = address(msg.sender);
+
+        // bytes32 memory_poolProfileId_ = registry.createProfile(
+        //     0, "Pool Profile 1", Metadata({protocol: 1, pointer: "PoolProfile1"}), pool_admin(), pool_managers()
+        // );
+        address _token = NATIVE;
+        if (token != address(0)) {
+            _token = token;
+        }
+        // poolId = allo.createPoolWithCustomStrategy(
+        poolId = allo.createPool(
+            poolProfile_id(registry), address(strategy), abi.encode(params), _token, 0, metadata, pool_managers
+        );
+    }
+
+    function _etherToFloat(uint256 _amount) internal pure returns (uint256) {
+        return _amount / 10 ** 11;
+    }
+}

pkg/contracts/test/CVStrategyTest.t.sol

@@ -79,7 +79,6 @@ contract CVStrategyTest is Test, AlloSetup, RegistrySetupFull, Native, Errors, G
         params._metadata = metadata;
         params._councilSafe = payable(address(_councilSafe()));
         registryGardens = RegistryGardens(registryFactory.createRegistry(params));
-
     }
 
     function _registryGardens() internal view returns (RegistryGardens) {
@@ -206,9 +205,11 @@ contract CVStrategyTest is Test, AlloSetup, RegistrySetupFull, Native, Errors, G
          */
         startMeasuringGas("Support a Proposal");
         CVStrategy.ProposalSupport[] memory votes = new CVStrategy.ProposalSupport[](1);
-        votes[0] = CVStrategy.ProposalSupport(1, 80); // 0 + 70 = 70% = 35
+        votes[0] = CVStrategy.ProposalSupport(1, 80); // 0 + 70 = 70% = 35 range is -100 +100
         bytes memory data = abi.encode(votes);
+
         allo().allocate(poolId, data);
+
         stopMeasuringGas();
 
         CVStrategy cv = CVStrategy(payable(address(pool.strategy)));
@@ -231,6 +232,7 @@ contract CVStrategyTest is Test, AlloSetup, RegistrySetupFull, Native, Errors, G
         assertEq(cv.getProposalStakedAmount(1), 40 + 50);
     }
 
+    // @todo write that test vote without have points
     function test_conviction_check_function() public {
         (IAllo.Pool memory pool, uint256 poolId) = _createProposal();
 
@@ -459,7 +461,6 @@ contract CVStrategyTest is Test, AlloSetup, RegistrySetupFull, Native, Errors, G
          * ASSERTS
          *
          */
-
         vm.warp(10 days);
 
         (
@@ -488,4 +489,15 @@ contract CVStrategyTest is Test, AlloSetup, RegistrySetupFull, Native, Errors, G
         // console.log("Beneficiary: %s", beneficiary);
         // console.log("Submitter: %s", submitter);
     }
+
+    function testRevert_registerRecipient_ProposalIdAlreadyExist() public {
+        (, uint256 poolId) = _createProposal();
+
+        CVStrategy.CreateProposal memory proposal = CVStrategy.CreateProposal(
+            1, poolId, pool_admin(), pool_admin(), CVStrategy.ProposalType.Signaling, REQUESTED_AMOUNT, NATIVE
+        );
+        bytes memory data = abi.encode(proposal);
+        vm.expectRevert(abi.encodeWithSelector(CVStrategy.ProposalIdAlreadyExist.selector, 1));
+        allo().registerRecipient(poolId, data);
+    }
 }