EasyRF strategy draft (#669)

* strategy draft * updates * add tests fmt * update strategy name * add deploy script * update bun * deploy on sepolia * add docs * remove unused var --------- Co-authored-by: Aditya Anand M C <[email protected]>
allo-protocol · Jan 9, 2025 · cf37467 · cf37467
1 parent 4eaa558
commit cf37467
Show file tree

Hide file tree

Showing 11 changed files with 1,572 additions and 2 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/contracts/strategies/BaseStrategy.sol b/contracts/strategies/BaseStrategy.sol
@@ -254,13 +254,13 @@ abstract contract BaseStrategy is IStrategy, Transfer, Errors {
 
     /// @notice Checks if the pool is active.
     /// @dev Reverts if the pool is not active.
-    function _checkOnlyActivePool() internal view {
+    function _checkOnlyActivePool() internal view virtual {
         if (!poolActive) revert POOL_INACTIVE();
     }
 
     /// @notice Checks if the pool is inactive.
     /// @dev Reverts if the pool is active.
-    function _checkInactivePool() internal view {
+    function _checkInactivePool() internal view virtual {
         if (poolActive) revert POOL_ACTIVE();
     }
 

diff --git a/contracts/strategies/_poc/easy-rf/EasyRetroFundingStrategy.sol b/contracts/strategies/_poc/easy-rf/EasyRetroFundingStrategy.sol
diff --git a/reports/deployment-logs/core/deploy.log b/reports/deployment-logs/core/deploy.log
@@ -669,3 +669,7 @@
 20240912_141937 - Deployment finished with 0 error(s)
 20240912_141937 - Executing: bun hardhat run scripts/strategies/deployDirectAllocation.ts --no-compile --network gnosis | tee ./reports/deployment-logs/strategies/deployDirectAllocation/gnosis/20240912_141426/deploy-20240912_141426.log
 20240912_142146 - Deployment finished with 0 error(s)
+20250107_150303 - Executing: bun hardhat run scripts/strategies/deployEasyRetrofunding.ts --no-compile --network sepolia | tee ./reports/deployment-logs/strategies/deployEasyRetrofunding/sepolia/20250107_150303/deploy-20250107_150303.log
+20250107_150308 - Deployment finished with 0 error(s)
+20250107_150313 - Executing: bun hardhat run scripts/strategies/deployEasyRetroFunding.ts --no-compile --network sepolia | tee ./reports/deployment-logs/strategies/deployEasyRetroFunding/sepolia/20250107_150313/deploy-20250107_150313.log
+20250107_160738 - Deployment finished with 0 error(s)
diff --git a/...logs/strategies/deployEasyRetrofunding/sepolia/20250107_150303/deploy-20250107_150303.log b/...logs/strategies/deployEasyRetrofunding/sepolia/20250107_150303/deploy-20250107_150303.log
diff --git a/...logs/strategies/deployEasyRetrofunding/sepolia/20250107_150313/deploy-20250107_150313.log b/...logs/strategies/deployEasyRetrofunding/sepolia/20250107_150313/deploy-20250107_150313.log
@@ -0,0 +1,31 @@
+
+    ////////////////////////////////////////////////////
+      Deploys EasyRetroFundingStrategy.sol on sepolia
+    ////////////////////////////////////////////////////
+
+┌─────────────────┬──────────────────────────────────────────────┐
+│ (index)         │ Values                                       │
+├─────────────────┼──────────────────────────────────────────────┤
+│ contract        │ 'EasyRetroFundingStrategy.sol'               │
+│ chainId         │ 11155111                                     │
+│ network         │ 'sepolia'                                    │
+│ deployerAddress │ '0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C' │
+│ balance         │ '5.654046747032034805'                       │
+└─────────────────┴──────────────────────────────────────────────┘
+Deploying EasyRetroFundingStrategy.sol
+[35mContract EasyRetroFundingStrategy deployed at address: 0x26B583bF90adAFBf5973B03728ba9a3120D8747D[0m
+
+Verifying contract...
+Successfully submitted source code for contract
+contracts/strategies/_poc/easy-rf/EasyRetroFundingStrategy.sol:EasyRetroFundingStrategy at 0x26B583bF90adAFBf5973B03728ba9a3120D8747D
+for verification on the block explorer. Waiting for verification result...
+
+Successfully verified contract EasyRetroFundingStrategy on the block explorer.
+https://sepolia.etherscan.io/address/0x26B583bF90adAFBf5973B03728ba9a3120D8747D#code
+[90m
+	Validating getAllo() == 0x1133eA7Af70876e64665ecD07C0A0476d09465a1[0m
+[32m	✅ PASSED with Result: 0x1133eA7Af70876e64665ecD07C0A0476d09465a1[0m
+[90m
+	Validating getStrategyId() == 0x060ffd6c79f918819a622248c6823443412aedea610cc19c89d28dadcdef7fba[0m
+[32m	✅ PASSED with Result: 0x060ffd6c79f918819a622248c6823443412aedea610cc19c89d28dadcdef7fba[0m
+Adding EasyRetroFundingStrategy v1.0 to cloneable strategies...
diff --git a/scripts/config/strategies.config.ts b/scripts/config/strategies.config.ts
@@ -121,6 +121,10 @@ export const strategyConfig: DeployParams = {
       name: "DirectAllocationStrategy",
       version: "v1.1",
     },
+    "easy-retro-funding": {
+      name: "EasyRetroFundingStrategy",
+      version: "v1.0",
+    },
   },
   // Optimism
   10: {

diff --git a/scripts/core/deployAllNetworks.sh b/scripts/core/deployAllNetworks.sh
@@ -64,6 +64,7 @@ scripts=(
     # "strategies/deployDonationVotingMerkleDistributionDirect"
     # "strategies/deployDirectGrantsLite"
     # "strategies/deployDirectAllocation"
+    # "strategies/deployEasyRetroFunding"
 
     # "core/transferProxyAdminOwnership"
     # "strategies/deployDirectGrants"

diff --git a/scripts/deployments/easyretrofundingstrategy.deployment.json b/scripts/deployments/easyretrofundingstrategy.deployment.json
@@ -0,0 +1,9 @@
+{
+  "11155111": {
+    "id": "0x060ffd6c79f918819a622248c6823443412aedea610cc19c89d28dadcdef7fba",
+    "name": "EasyRetroFundingStrategy",
+    "version": "v1.0",
+    "address": "0x26B583bF90adAFBf5973B03728ba9a3120D8747D",
+    "deployerAddress": "0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C"
+  }
+}
diff --git a/scripts/strategies/deployEasyRetroFunding.ts b/scripts/strategies/deployEasyRetroFunding.ts
@@ -0,0 +1,43 @@
+import { ethers } from "hardhat";
+import { commonConfig } from "../config/common.config";
+import { strategyConfig } from "../config/strategies.config";
+import { Validator } from "../utils/Validator";
+import { deployStrategies, deployStrategyDirectly } from "./deployStrategies";
+
+export const deployEasyRetroFunding = async () => {
+  const network = await ethers.provider.getNetwork();
+  const chainId = Number(network.chainId);
+
+  const strategyParams = strategyConfig[chainId]["easy-retro-funding"];
+
+  const address = await deployStrategies(
+    strategyParams.name,
+    strategyParams.version,
+    true
+  );
+
+  console.log("==> address", address);
+
+  // const validator = await new Validator(
+  //   strategyParams.name,
+  //   address,
+  // );
+
+  // await validator.validate("PERMIT2", [], commonConfig[chainId].permit2Address);
+
+  // await deployStrategyDirectly(
+  //   strategyParams.name,
+  //   strategyParams.version,
+  //   [commonConfig[chainId].permit2Address],
+  //   true,
+  // );
+
+};
+
+// Check if this script is the main module (being run directly)
+if (require.main === module) {
+  deployEasyRetroFunding().catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+  });
+}