avax rewards: aave v3

contracts/avalanche/connectors/aave/aave-rewards/helpers.sol

@@ -1,13 +0,0 @@
-//SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
-
-import { DSMath } from "../../../common/math.sol";
-import { Basic } from "../../../common/basic.sol";
-import { AaveIncentivesInterface } from "./interface.sol";
-
-abstract contract Helpers is DSMath, Basic {
-    /**
-     * @dev Aave Incentives
-     */
-    AaveIncentivesInterface internal constant incentives = AaveIncentivesInterface(0x01D83Fe6A10D2f2B7AF17034343746188272cAc9);
-}

contracts/avalanche/connectors/aave/aave-rewards/main.sol

@@ -1,51 +0,0 @@
-//SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
-
-
-/**
- * @title Aave Rewards.
- * @dev Claim Aave rewards.
- */
- 
-import { TokenInterface } from "../../../common/interfaces.sol";
-import { Stores } from "../../../common/stores.sol";
-import { Helpers } from "./helpers.sol";
-import { Events } from "./events.sol";
-
-abstract contract IncentivesResolver is Helpers, Events {
-
-    /**
-     * @dev Claim Pending Rewards.
-     * @notice Claim Pending Rewards from Aave incentives contract.
-     * @param assets The list of assets supplied and borrowed.
-     * @param amt The amount of reward to claim. (uint(-1) for max)
-     * @param getId ID to retrieve amt.
-     * @param setId ID stores the amount of rewards claimed.
-    */
-    function claim(
-        address[] calldata assets,
-        uint256 amt,
-        uint256 getId,
-        uint256 setId
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
-        uint _amt = getUint(getId, amt);
-
-        require(assets.length > 0, "invalid-assets");
-
-        _amt = incentives.claimRewards(assets, _amt, address(this));
-
-
-        TokenInterface wavax =  TokenInterface(wavaxAddr);
-        uint256 wavaxAmount = wavax.balanceOf(address(this));
-        convertWavaxToAvax(wavaxAmount > 0, wavax, wavaxAmount);
-
-        setUint(setId, _amt);
-
-        _eventName = "LogClaimed(address[],uint256,uint256,uint256)";
-        _eventParam = abi.encode(assets, _amt, getId, setId);
-    }
-}
-
-contract ConnectV2AaveIncentivesAvalanche is IncentivesResolver {
-    string public constant name = "Aave-Incentives-v1";
-}

contracts/avalanche/connectors/aave/aave-rewards/v2/helpers.sol

@@ -0,0 +1,14 @@
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+import { DSMath } from "../../../../common/math.sol";
+import { Basic } from "../../../../common/basic.sol";
+import { AaveIncentivesInterface } from "./interface.sol";
+
+abstract contract Helpers is DSMath, Basic {
+	/**
+	 * @dev Aave Incentives
+	 */
+	AaveIncentivesInterface internal constant incentives =
+		AaveIncentivesInterface(0x929EC64c34a17401F460460D4B9390518E5B473e);
+}

contracts/avalanche/connectors/aave/aave-rewards/v2/main.sol

@@ -0,0 +1,52 @@
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+/**
+ * @title Aave Rewards.
+ * @dev Claim Aave rewards.
+ */
+
+import { TokenInterface } from "../../../../common/interfaces.sol";
+import { Stores } from "../../../../common/stores.sol";
+import { Helpers } from "./helpers.sol";
+import { Events } from "./events.sol";
+
+abstract contract IncentivesResolver is Helpers, Events {
+	/**
+	 * @dev Claim Pending Rewards.
+	 * @notice Claim Pending Rewards from Aave incentives contract.
+	 * @param assets The list of assets supplied and borrowed.
+	 * @param amt The amount of reward to claim. (uint(-1) for max)
+	 * @param getId ID to retrieve amt.
+	 * @param setId ID stores the amount of rewards claimed.
+	 */
+	function claim(
+		address[] calldata assets,
+		uint256 amt,
+		uint256 getId,
+		uint256 setId
+	)
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
+
+		require(assets.length > 0, "invalid-assets");
+
+		_amt = incentives.claimRewards(assets, _amt, address(this));
+
+		TokenInterface wavax = TokenInterface(wavaxAddr);
+		uint256 wavaxAmount = wavax.balanceOf(address(this));
+		convertWavaxToAvax(wavaxAmount > 0, wavax, wavaxAmount);
+
+		setUint(setId, _amt);
+
+		_eventName = "LogClaimed(address[],uint256,uint256,uint256)";
+		_eventParam = abi.encode(assets, _amt, getId, setId);
+	}
+}
+
+contract ConnectV2AaveIncentivesAvalanche is IncentivesResolver {
+	string public constant name = "Aave-Incentives-v1";
+}

contracts/avalanche/connectors/aave/aave-rewards/v3/events.sol

@@ -0,0 +1,13 @@
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+contract Events {
+	event LogClaimed(
+		address[] assets,
+		uint256 amt,
+		uint256 getId,
+		uint256 setId
+	);
+
+	event LogAllClaimed(address[] assets, uint256[] amt);
+}

contracts/avalanche/connectors/aave/aave-rewards/v3/helpers.sol

@@ -0,0 +1,14 @@
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+import { DSMath } from "../../../../common/math.sol";
+import { Basic } from "../../../../common/basic.sol";
+import { AaveIncentivesInterface } from "./interface.sol";
+
+abstract contract Helpers is DSMath, Basic {
+	/**
+	 * @dev Aave v3 Incentives
+	 */
+	AaveIncentivesInterface internal constant incentives =
+		AaveIncentivesInterface(0x01D83Fe6A10D2f2B7AF17034343746188272cAc9);
+}

contracts/avalanche/connectors/aave/aave-rewards/v3/interface.sol

@@ -0,0 +1,15 @@
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+interface AaveIncentivesInterface {
+	function claimRewards(
+		address[] calldata assets,
+		uint256 amount,
+		address to,
+		address reward
+	) external returns (uint256);
+
+	function claimAllRewards(address[] calldata assets, address to)
+		external
+		returns (address[] memory rewardsList, uint256[] memory claimedAmounts);
+}

contracts/avalanche/connectors/aave/aave-rewards/v3/main.sol

@@ -0,0 +1,78 @@
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.7.0;
+
+/**
+ * @title Aave v3 Rewards.
+ * @dev Claim Aave v3 rewards.
+ */
+
+import { TokenInterface } from "../../../../common/interfaces.sol";
+import { Stores } from "../../../../common/stores.sol";
+import { Helpers } from "./helpers.sol";
+import { Events } from "./events.sol";
+
+abstract contract IncentivesResolver is Helpers, Events {
+	/**
+	 * @dev Claim Pending Rewards.
+	 * @notice Claim Pending Rewards from Aave v3 incentives contract.
+	 * @param assets The list of assets supplied and borrowed.
+	 * @param amt The amount of reward to claim. (uint(-1) for max)
+	 * @param reward The address of reward token to claim.
+	 * @param getId ID to retrieve amt.
+	 * @param setId ID stores the amount of rewards claimed.
+	 */
+	function claim(
+		address[] calldata assets,
+		uint256 amt,
+		address reward,
+		uint256 getId,
+		uint256 setId
+	)
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
+
+		require(assets.length > 0, "invalid-assets");
+
+		_amt = incentives.claimRewards(assets, _amt, address(this), reward);
+
+		TokenInterface wavax = TokenInterface(wavaxAddr);
+		uint256 wavaxAmount = wavax.balanceOf(address(this));
+		convertWavaxToAvax(wavaxAmount > 0, wavax, wavaxAmount);
+
+		setUint(setId, _amt);
+
+		_eventName = "LogClaimed(address[],uint256,uint256,uint256)";
+		_eventParam = abi.encode(assets, _amt, getId, setId);
+	}
+
+	/**
+	 * @dev Claim All Pending Rewards.
+	 * @notice Claim All Pending Rewards from Aave v3 incentives contract.
+	 * @param assets The list of assets supplied and borrowed.
+	 */
+	function claimAll(address[] calldata assets)
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		require(assets.length > 0, "invalid-assets");
+		uint256[] memory _amt = new uint256[](assets.length);
+		address[] memory _rewards = new address[](assets.length);
+
+		(_rewards, _amt) = incentives.claimAllRewards(assets, address(this));
+
+		TokenInterface wavax = TokenInterface(wavaxAddr);
+		uint256 wavaxAmount = wavax.balanceOf(address(this));
+		convertWavaxToAvax(wavaxAmount > 0, wavax, wavaxAmount);
+
+		_eventName = "LogAllClaimed(address[],uint256[])";
+		_eventParam = abi.encode(assets, _amt);
+	}
+}
+
+contract ConnectV3AaveIncentivesAvalanche is IncentivesResolver {
+	string public constant name = "Aave-Incentives-v1";
+}