Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added scripts for morpho strategies #171

Merged
merged 5 commits into from
Jan 8, 2025
Merged

feat: added scripts for morpho strategies #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c58ff7
feat: added scripts for morpho strategies
0xKoaj Jan 8, 2025
11af0cd
feat: use create2
0xKoaj Jan 8, 2025
167689e
refactor: more suggestions
0xKoaj Jan 8, 2025
e3e4fe0
chore: remove logs
0xKoaj Jan 8, 2025
7ff42f0
refactor: remove comments
0xKoaj Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion script/DeployManagers.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { GuardianManager } from "src/strategies/layers/guardian/external/Guardia
import { LiquidityMiningManager } from "src/strategies/layers/liquidity-mining/external/LiquidityMiningManager.sol";
import { DelayedWithdrawalManager } from "src/delayed-withdrawal-manager/DelayedWithdrawalManager.sol";
import { TOSManager } from "src/strategies/layers/creation-validation/external/TOSManager.sol";
import { MorphoRewardsManager } from "src/strategies/layers/connector/morpho/MorphoRewardsManager.sol";
import { GlobalValidationManagersRegistry } from
"src/strategies/layers/creation-validation/external/GlobalValidationManagersRegistry.sol";
import { SignatureBasedWhitelistManager } from
Expand Down Expand Up @@ -114,7 +115,12 @@ contract DeployManagers is BaseDeployPeriphery {
);
console2.log("Liquidity mining manager:", liquidityMiningManager);

GlobalEarnRegistry.InitialConfig[] memory config = new GlobalEarnRegistry.InitialConfig[](5);
address morphoRewardsManager = deployContract(
"V1_RM_MORPHO", abi.encodePacked(type(MorphoRewardsManager).creationCode, abi.encode(admin, initialAdmins))
);
console2.log("Rewards manager deployed: ", morphoRewardsManager);

GlobalEarnRegistry.InitialConfig[] memory config = new GlobalEarnRegistry.InitialConfig[](6);
config[0] = GlobalEarnRegistry.InitialConfig({ id: keccak256("FEE_MANAGER"), contractAddress: feeManager });
config[1] =
GlobalEarnRegistry.InitialConfig({ id: keccak256("GUARDIAN_MANAGER"), contractAddress: guardianManager });
Expand All @@ -130,6 +136,11 @@ contract DeployManagers is BaseDeployPeriphery {
id: keccak256("VALIDATION_MANAGERS_REGISTRY"),
contractAddress: validationManagersRegistry
});
config[5] = GlobalEarnRegistry.InitialConfig({
id: keccak256("MORPHO_REWARDS_MANAGER"),
contractAddress: morphoRewardsManager
});

address globalRegistry = deployContract(
"V1_GLOBAL_REGISTRY", abi.encodePacked(type(GlobalEarnRegistry).creationCode, abi.encode(config, admin))
);
Expand Down
12 changes: 6 additions & 6 deletions script/DeployPeriphery.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ pragma solidity ^0.8.13;
import { BaseDeployPeriphery } from "./BaseDeployPeriphery.sol";
import { DeployManagers } from "./DeployManagers.sol";
import { DeployCompanion } from "./DeployCompanion.sol";
import { DeployStrategies } from "./strategies/aave-v3/base/DeployStrategies.sol";

contract DeployPeriphery is BaseDeployPeriphery, DeployManagers, DeployCompanion, DeployStrategies {
function run() external override(DeployManagers, DeployCompanion, DeployStrategies) {
contract DeployPeriphery is BaseDeployPeriphery, DeployManagers, DeployCompanion {
function run() external virtual override(DeployManagers, DeployCompanion) {
vm.startBroadcast();
deployPeriphery();
vm.stopBroadcast();
}

function deployPeriphery() internal {
deployCompanion();
deployManagers();
deployStrategies();

vm.stopBroadcast();
}
}
48 changes: 32 additions & 16 deletions script/strategies/aave-v3/BaseDeployStrategies.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ contract BaseDeployStrategies is BaseDeployPeriphery {
bytes32 signerGroup,
address[] memory guardians,
address[] memory judges,
Fees memory fees
Fees memory fees,
bytes32 guard
)
internal
returns (IEarnBalmyStrategy strategy, StrategyId strategyId)
Expand Down Expand Up @@ -58,22 +59,37 @@ contract BaseDeployStrategies is BaseDeployPeriphery {
bytes memory guardianData = guardians.length > 0 || judges.length > 0 ? abi.encode(guardians, judges) : bytes("");
bytes memory liquidityMiningData = "";
bytes memory feesData = fees.equals(DEFAULT_FEES) ? bytes("") : abi.encode(fees);
(strategy, strategyId) = aaveV3StrategyFactory.cloneStrategyAndRegister(
admin,
AaveV3StrategyData(
IEarnVault(vault),
IGlobalEarnRegistry(globalRegistry),
aToken,
IAaveV3Pool(aaveV3Pool),
IAaveV3Rewards(aaveV3Rewards),
creationValidationData,
guardianData,
feesData,
liquidityMiningData
)
bytes32 salt = keccak256(abi.encode("V1_S_AAVEV3", guard));

address computedAddress = aaveV3StrategyFactory.addressOfClone2(
IEarnVault(vault),
IGlobalEarnRegistry(globalRegistry),
aToken,
IAaveV3Pool(aaveV3Pool),
IAaveV3Rewards(aaveV3Rewards),
salt
);
if (computedAddress.code.length > 0) {
console2.log("Strategy already deployed", computedAddress);
} else {
(strategy, strategyId) = aaveV3StrategyFactory.clone2StrategyAndRegister(
admin,
AaveV3StrategyData(
IEarnVault(vault),
IGlobalEarnRegistry(globalRegistry),
aToken,
IAaveV3Pool(aaveV3Pool),
IAaveV3Rewards(aaveV3Rewards),
creationValidationData,
guardianData,
feesData,
liquidityMiningData
),
salt
);

console2.log("Strategy:", address(strategy));
console2.log("Strategy ID:", StrategyId.unwrap(strategyId));
console2.log("Strategy:", address(strategy));
console2.log("Strategy ID:", StrategyId.unwrap(strategyId));
}
}
}
103 changes: 48 additions & 55 deletions script/strategies/aave-v3/base/DeployStrategies.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.13;

import { BaseDeployStrategies, IAToken, StrategyId } from "../BaseDeployStrategies.sol";
import { BaseDeployStrategies, IAToken, IEarnBalmyStrategy } from "../BaseDeployStrategies.sol";
import { console2 } from "forge-std/console2.sol";
import { Fees } from "src/strategies/layers/fees/external/FeeManager.sol";
import { DeployPeriphery } from "script/DeployPeriphery.sol";

contract DeployStrategies is BaseDeployStrategies {
function run() external virtual {
contract DeployStrategies is DeployPeriphery, BaseDeployStrategies {
function run() external override(DeployPeriphery) {
vm.startBroadcast();
deployStrategies();
deployPeriphery();
deployAaveV3Strategies();
vm.stopBroadcast();
}

function deployStrategies() internal {
function deployAaveV3Strategies() internal {
address aaveV3Pool = 0xA238Dd80C259a72e81d7e4664a9801593F98d1c5;
address aaveV3Rewards = 0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44;
address[] memory guardians = new address[](1);
Expand All @@ -20,20 +23,21 @@ contract DeployStrategies is BaseDeployStrategies {
address[] memory judges = new address[](1);
judges[0] = getMsig();

StrategyId strategyId;
IEarnBalmyStrategy strategy;
// Tier 0 = default fees
// USDC
deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: bytes32(0),
guardians: guardians,
judges: judges,
fees: DEFAULT_FEES
fees: DEFAULT_FEES,
guard: "v1-t0"
});

console2.log("strategy tier 0 - usdc", address(strategy));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also log strategy id. It can be useful, but it's also easy to ignore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a strategy id log in BaseDeployStrategy after deploy, this log is only to know tier and token

// WETH
deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
Expand All @@ -43,135 +47,124 @@ contract DeployStrategies is BaseDeployStrategies {
signerGroup: bytes32(0),
guardians: guardians,
judges: judges,
fees: DEFAULT_FEES
fees: DEFAULT_FEES,
guard: "v1-t0"
});

console2.log("strategy tier 0 - weth", address(strategy));
// cbBTC
deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: bytes32(0),
guardians: guardians,
judges: judges,
fees: DEFAULT_FEES
fees: DEFAULT_FEES,
guard: "v1-t0"
});

console2.log("strategy tier 0 - cbbtc", address(strategy));
// Tier 1 = 7.5% performance fee + 3.75% rescue fee
Fees memory tier1Fees = Fees({ depositFee: 0, withdrawFee: 0, performanceFee: 750, rescueFee: 375 });

// USDC
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier1Fees
fees: tier1Fees,
guard: "v1-t1"
});
console2.log("strategy tier 1 - usdc", address(strategy));

// WETH
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier1Fees
fees: tier1Fees,
guard: "v1-t1"
});

console2.log("strategy tier 1 - weth", address(strategy));
// cbBTC
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier1Fees
fees: tier1Fees,
guard: "v1-t1"
});
console2.log("strategy tier 1 - cbbtc", address(strategy));

// Tier 2 = 5% performance fee + 2.5% rescue fee
Fees memory tier2Fees = Fees({ depositFee: 0, withdrawFee: 0, performanceFee: 500, rescueFee: 250 });
// USDC
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier2Fees
fees: tier2Fees,
guard: "v1-t2"
});
console2.log("strategy tier 2 - usdc", address(strategy));

// WETH
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier2Fees
});

// cbBTC
(, strategyId) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier2Fees
fees: tier2Fees,
guard: "v1-t2"
});

console2.log("strategy tier 2 - weth", address(strategy));
// Tier 3 = 2.5% performance fee + 1% rescue fee
Fees memory tier3Fees = Fees({ depositFee: 0, withdrawFee: 0, performanceFee: 250, rescueFee: 100 });

// USDC
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier3Fees
fees: tier3Fees,
guard: "v1-t3"
});

console2.log("strategy tier 3 - usdc", address(strategy));
// WETH
(, strategyId) = deployAaveV3Strategy({
(strategy,) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier3Fees
});

// cbBTC
(, strategyId) = deployAaveV3Strategy({
aaveV3Pool: aaveV3Pool,
aaveV3Rewards: aaveV3Rewards,
aToken: IAToken(0xBdb9300b7CDE636d9cD4AFF00f6F009fFBBc8EE6),
tosGroup: BALMY_GUARDIAN_TOS_GROUP,
signerGroup: DEFAULT_SIGNER_GROUP,
guardians: guardians,
judges: judges,
fees: tier3Fees
fees: tier3Fees,
guard: "v1-t3"
});
console2.log("strategy tier 3 - weth", address(strategy));
}
}
Loading
Loading