Aavechan/ghol mextension

Makefile

@@ -8,10 +8,24 @@ update:; forge update
 # Build & test
 build :; forge build --sizes --via-ir
 test :; forge test -vvv
+
+test-contract :; forge test --match-contract ${filter} -vv
+
 test-sd-rewards :; forge test -vvv --match-contract EmissionTestSDPolygon
 test-stmatic-rewards :; forge test -vvv --match-contract EmissionTestSTMATICPolygon
+test-Ethx-rewards :; FOUNDRY_PROFILE=mainnet forge test -vvv --match-contract EmissionTestEthXMainnet
 test-maticx-rewards :; forge test -vvv --match-contract EmissionTestMATICXPolygon
+test-Avax-LM-rewards :; FOUNDRY_PROFILE=avax forge test -vvv --match-contract EmissionTestAVAXLMAvax
+test-lido-rewards :; FOUNDRY_PROFILE=mainnet forge test -vvv --match-contract EmissionTestETHLMETH
+test-arbGHO-rewards :; FOUNDRY_PROFILE=arbitrum forge test -vvv --match-contract EmissionExtensionTestARBLMGHO
+test-base-rewards :; FOUNDRY_PROFILE=base forge test -vvv --match-contract EmissionTestUSDCBase
+test-base-extension :; FOUNDRY_PROFILE=base forge test -vvv --match-contract EmissionTestExtendLIDO
 
 # scripts
+
 deploy-sd-transfer-strategy :; forge script scripts/RewardsConfigHelpers.s.sol:SDDeployTransferStrategy --rpc-url polygon --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
 deploy-stmatic-transfer-strategy :; forge script scripts/RewardsConfigHelpers.s.sol:STMATICDeployTransferStrategy --rpc-url polygon --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv
+deploy-mainnet-sd-transfer-strategy :; forge script scripts/RewardsConfigHelpers.s.sol:SDMainnetDeployTransferStrategy --rpc-url mainnet -- sender ${SENDER} --private-key ${PRIVATE_KEY} --verify -vvvv --slow --broadcast
+deploy-avax-transfer-strategy :; forge script scripts/RewardsConfigHelpers.s.sol:AVAXDeployTransferStrategy --rpc-url avalanche --sender ${SENDER} --private-key ${PRIVATE_KEY} --verify -vvvv --slow --broadcast
+deploy-arb-transfer-strategy :; forge script scripts/RewardsConfigHelpers.s.sol:ARBDeployTransferStrategy --rpc-url arbitrum --sender ${SENDER} --private-key ${PRIVATE_KEY} --verify -vvvv --slow --broadcast
+deploy-base-transfer-strategy :; forge script scripts/RewardsConfigHelpers.s.sol:BASEDeployTransferStrategy --rpc-url base --sender ${SENDER} --private-key ${PRIVATE_KEY} --verify -vvvv --slow --broadcast

README.md

@@ -16,7 +16,7 @@ This repository contains:
 
 2. Do an ERC-20 approve of the total rewards to be distributed to the Transfer Strategy contract, this is contract by Aave which helps to pull the Liquidity Mining rewards from the Rewards Vault address to distribute to the user. To know more about how Transfer Strategy contract works you can check [here](https://github.com/aave/aave-v3-periphery/blob/master/docs/rewards/rewards-transfer-strategies.md).
 
- _Note: The Emission Admin is an address which has access to manage and configure the reward emissions by calling the Emission Manager contract and the  general type of Transfer Strategy contract used for Liquidity Mining is of type PullRewardsStrategy._
+ _Note: The Emission Admin is an address which has access to manage and configure the reward emissions by calling the Emission Manager contract and the general type of Transfer Strategy contract used for Liquidity Mining is of type PullRewardsStrategy._
 
 3. Finally we need to configure the Liquidity Mining emissions on the Emission Manager contract from the Emission Admin by calling the `configureAssets()` function which will take the array of the following struct to configure liquidity mining for mulitple assets for the same reward or multiple assets for mutiple rewards.
 
@@ -108,23 +108,22 @@ Similarly you can also run the test via `forge test -vv` which will emit the sel
 - Why do we need to approve funds from the Rewards Vault to the Aave Transfer Strategy contract?
 
  This is needed so the Transfer Strategy contract can pull the rewards from the Rewards Vault to distribute it to the user when the user claims them.
- 
+
 - Can I reuse an already deployed transfer strategy?
-
- Yes, a transfer strategy could be reused if it has already been deployed for the given network (given that you want the rewards vault, rewards admin and the incentives controller to be the same).
-
+ Yes, a transfer strategy could be reused if it has already been deployed for the given network (given that you want the rewards vault, rewards admin and the incentives controller to be the same).
 - If a transfer strategy does not exist, how do I create one?
 
- The transfer strategy is an immutable contract which determines the logic of the rewards transfer. To create a new pull reward transfer strategy (most common transfer strategy for liquidity mining) you could use the 
-[PullRewardsTransferStrategy.sol](https://github.com/aave/aave-v3-periphery/blob/master/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol) contract with the following constructor params:
+ The transfer strategy is an immutable contract which determines the logic of the rewards transfer. To create a new pull reward transfer strategy (most common transfer strategy for liquidity mining) you could use the
+
+ [PullRewardsTransferStrategy.sol](https://github.com/aave/aave-v3-periphery/blob/master/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol) contract with the following constructor params:
+
+ - `incentivesController`: address of the incentives controller
+ - `rewardsAdmin`: address of the incentives controller for access control
+ - `rewardsVault`: address of the rewards vault containing the funds for the Liquidity Mining program.
 
- - `incentivesController`: address of the incentives controller
- - `rewardsAdmin`: address of the incentives controller for access control
- - `rewardsVault`: address of the rewards vault containing the funds for the Liquidity Mining program.
+ Example to deploy a transfer strategy can be found [here](./scripts/RewardsConfigHelpers.s.sol).
 
- Example to deploy a transfer strategy can be found [here](./scripts/RewardsConfigHelpers.s.sol).
-
- _Note: All transfer strategy should inherit from the base contract [TransferStrategyBase.sol](https://github.com/aave/aave-v3-periphery/blob/master/contracts/rewards/transfer-strategies/TransferStrategyBase.sol) and you could also define your own custom transfer strategy even with NFT’s as rewards, given that you inherit from the base contract._
+ _Note: All transfer strategy should inherit from the base contract [TransferStrategyBase.sol](https://github.com/aave/aave-v3-periphery/blob/master/contracts/rewards/transfer-strategies/TransferStrategyBase.sol) and you could also define your own custom transfer strategy even with NFT’s as rewards, given that you inherit from the base contract._
 
 - Can we stop the liquidity mining program at any time?
 
@@ -135,7 +134,7 @@ Similarly you can also run the test via `forge test -vv` which will emit the sel
 - Can we change the amount of liquidty mining rewards?
 
  Yes, the liquidity mining rewards could be increased or decreased by the Emission Admin. To do so, please refer
-[here](https://github.com/bgd-labs/example-liquidity-mining-aave-v3/tree/feat/configure-emissions#how-to-configure-emissions-after-the-lm-program-has-been-created)
+ [here](https://github.com/bgd-labs/example-liquidity-mining-aave-v3/tree/feat/configure-emissions#how-to-configure-emissions-after-the-lm-program-has-been-created)
 
 ### Setup
 

foundry.toml

@@ -9,6 +9,7 @@ evm_version = 'shanghai'
 
 [rpc_endpoints]
 mainnet = "${RPC_MAINNET}"
+base = "${RPC_BASE}"
 optimism = "${RPC_OPTIMISM}"
 avalanche = "${RPC_AVALANCHE}"
 polygon = "${RPC_POLYGON}"
@@ -18,6 +19,7 @@ harmony = "${RPC_HARMONY}"
 
 [etherscan]
 mainnet={key="${ETHERSCAN_API_KEY_MAINNET}",chainId=1}
+base={key="${ETHERSCAN_API_KEY_BASE}",chainId=8453}
 optimism={key="${ETHERSCAN_API_KEY_OPTIMISM}",chainId=10}
 avalanche={key="${ETHERSCAN_API_KEY_AVALANCHE}",chainId=43114}
 polygon={key="${ETHERSCAN_API_KEY_POLYGON}",chainId=137}

scripts/RewardsConfigHelpers.s.sol

@@ -4,9 +4,13 @@ pragma solidity ^0.8.0;
 import {Script} from 'forge-std/Script.sol';
 import {PullRewardsTransferStrategy} from 'aave-v3-origin/periphery/contracts/rewards/transfer-strategies/PullRewardsTransferStrategy.sol';
 import {AaveV3Polygon} from 'aave-address-book/AaveV3Polygon.sol';
+import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
+import {AaveV3Avalanche} from 'aave-address-book/AaveV3Avalanche.sol';
+import {AaveV3Arbitrum} from 'aave-address-book/AaveV3Arbitrum.sol';
+import {AaveV3Base} from 'aave-address-book/AaveV3Base.sol';
 
 contract SDDeployTransferStrategy is Script {
- address internal constant EMISSION_ADMIN = 0x51358004cFe135E64453d7F6a0dC433CAba09A2a;
+ address internal constant EMISSION_ADMIN = 0xac140648435d03f784879cd789130F22Ef588Fcd;
  address internal constant REWARDS_VAULT = EMISSION_ADMIN;
 
  function run() external {
@@ -35,3 +39,62 @@ contract STMATICDeployTransferStrategy is Script {
  vm.stopBroadcast();
  }
 }
+contract SDMainnetDeployTransferStrategy is Script {
+ address internal constant REWARDS_VAULT = EMISSION_ADMIN;
+ address internal constant EMISSION_ADMIN = 0xac140648435d03f784879cd789130F22Ef588Fcd;
+
+ function run() external {
+ vm.startBroadcast();
+ new PullRewardsTransferStrategy(
+ AaveV3Ethereum.DEFAULT_INCENTIVES_CONTROLLER,
+ EMISSION_ADMIN,
+ REWARDS_VAULT
+ );
+ vm.stopBroadcast();
+ }
+}
+
+contract AVAXDeployTransferStrategy is Script {
+ address internal constant REWARDS_VAULT = EMISSION_ADMIN;
+ address internal constant EMISSION_ADMIN = 0xac140648435d03f784879cd789130F22Ef588Fcd;
+
+ function run() external {
+ vm.startBroadcast();
+ new PullRewardsTransferStrategy(
+ AaveV3Avalanche.DEFAULT_INCENTIVES_CONTROLLER,
+ EMISSION_ADMIN,
+ REWARDS_VAULT
+ );
+ vm.stopBroadcast();
+ }
+}
+
+contract ARBDeployTransferStrategy is Script {
+ address internal constant REWARDS_VAULT = EMISSION_ADMIN;
+ address internal constant EMISSION_ADMIN = 0xac140648435d03f784879cd789130F22Ef588Fcd;
+
+ function run() external {
+ vm.startBroadcast();
+ new PullRewardsTransferStrategy(
+ AaveV3Arbitrum.DEFAULT_INCENTIVES_CONTROLLER,
+ EMISSION_ADMIN,
+ REWARDS_VAULT
+ );
+ vm.stopBroadcast();
+ }
+}
+
+contract BASEDeployTransferStrategy is Script {
+ address internal constant REWARDS_VAULT = EMISSION_ADMIN;
+ address internal constant EMISSION_ADMIN = 0xac140648435d03f784879cd789130F22Ef588Fcd;
+
+ function run() external {
+ vm.startBroadcast();
+ new PullRewardsTransferStrategy(
+ AaveV3Base.DEFAULT_INCENTIVES_CONTROLLER,
+ EMISSION_ADMIN,
+ REWARDS_VAULT
+ );
+ vm.stopBroadcast();
+ }
+}

src/contracts/AddEmissionAdminPayload.sol

@@ -17,11 +17,7 @@ contract AddEmissionAdminPayload is IProposalGenericExecutor {
 
  address public immutable EMISSION_ADMIN;
 
- constructor(
- IEmissionManager emissionManager,
- address reward,
- address emissionAdmin
- ) {
+ constructor(IEmissionManager emissionManager, address reward, address emissionAdmin) {
  EMISSION_MANAGER = emissionManager;
  REWARD = reward;
  EMISSION_ADMIN = emissionAdmin;

src/interfaces/IEmissionManager.sol

@@ -33,11 +33,7 @@ interface ITransferStrategyBase {
  * @param amount Amount to transfer to the "to" address parameter
  * @return Returns true bool if transfer logic succeeds
  */
- function performTransfer(
- address to,
- address reward,
- uint256 amount
- ) external returns (bool);
+ function performTransfer(address to, address reward, uint256 amount) external returns (bool);
 
  /**
  * @return Returns the address of the Incentives Controller
@@ -55,11 +51,7 @@ interface ITransferStrategyBase {
  * @param to Address of the recipient of the withdrawal
  * @param amount Amount of the withdrawal
  */
- function emergencyWithdrawal(
- address token,
- address to,
- uint256 amount
- ) external;
+ function emergencyWithdrawal(address token, address to, uint256 amount) external;
 }
 
 library RewardsDataTypes {
@@ -160,11 +152,7 @@ interface IRewardsDistributor {
  * @param reward The reward token that incentives the asset
  * @param newDistributionEnd The end date of the incentivization, in unix time format
  **/
- function setDistributionEnd(
- address asset,
- address reward,
- uint32 newDistributionEnd
- ) external;
+ function setDistributionEnd(address asset, address reward, uint32 newDistributionEnd) external;
 
  /**
  * @dev Sets the emission per second of a set of reward distributions
@@ -208,15 +196,10 @@ interface IRewardsDistributor {
  * @return The timestamp of the last update of the index
  * @return The timestamp of the distribution end
  **/
- function getRewardsData(address asset, address reward)
- external
- view
- returns (
- uint256,
- uint256,
- uint256,
- uint256
- );
+ function getRewardsData(
+ address asset,
+ address reward
+ ) external view returns (uint256, uint256, uint256, uint256);
 
  /**
  * @dev Returns the list of available reward token addresses of an incentivized asset
@@ -259,10 +242,10 @@ interface IRewardsDistributor {
  * @return The list of reward addresses
  * @return The list of unclaimed amount of rewards
  **/
- function getAllUserRewards(address[] calldata assets, address user)
- external
- view
-   returns (address[] memory, uint256[] memory);
+ function getAllUserRewards(
+ address[] calldata assets,
+ address user
+ ) external view returns (address[] memory, uint256[] memory);
 
  /**
  * @dev Returns the decimals of an asset to calculate the distribution delta
@@ -393,11 +376,7 @@ interface IRewardsController is IRewardsDistributor {
  * @param userBalance The user balance of the asset
  * @param totalSupply The total supply of the asset
  **/
- function handleAction(
- address user,
- uint256 userBalance,
- uint256 totalSupply
- ) external;
+ function handleAction(address user, uint256 userBalance, uint256 totalSupply) external;
 
  /**
  * @dev Claims reward for a user to the desired address, on all the assets of the pool, accumulating the pending rewards
@@ -452,9 +431,10 @@ interface IRewardsController is IRewardsDistributor {
  * @return rewardsList List of addresses of the reward tokens
  * @return claimedAmounts List that contains the claimed amount per reward, following same order as "rewardList"
  **/
- function claimAllRewards(address[] calldata assets, address to)
- external
- returns (address[] memory rewardsList, uint256[] memory claimedAmounts);
+ function claimAllRewards(
+ address[] calldata assets,
+ address to
+ ) external returns (address[] memory rewardsList, uint256[] memory claimedAmounts);
 
  /**
  * @dev Claims all rewards for a user on behalf, on all the assets of the pool, accumulating the pending rewards. The caller must
@@ -477,9 +457,9 @@ interface IRewardsController is IRewardsDistributor {
  * @return rewardsList List of addresses of the reward tokens
  * @return claimedAmounts List that contains the claimed amount per reward, following same order as "rewardsList"
  **/
- function claimAllRewardsToSelf(address[] calldata assets)
- external
-   returns (address[] memory rewardsList, uint256[] memory claimedAmounts);
+ function claimAllRewardsToSelf(
+ address[] calldata assets
+ ) external returns (address[] memory rewardsList, uint256[] memory claimedAmounts);
 }
 
 /**
@@ -542,11 +522,7 @@ interface IEmissionManager {
  * @param reward The reward token that incentives the asset
  * @param newDistributionEnd The end date of the incentivization, in unix time format
  **/
- function setDistributionEnd(
- address asset,
- address reward,
- uint32 newDistributionEnd
- ) external;
+ function setDistributionEnd(address asset, address reward, uint32 newDistributionEnd) external;
 
  /**
  * @dev Sets the emission per second of a set of reward distributions