Merge pull request #1078 from ionicprotocol/development

merge

Author: rhlsthrm

packages/contracts/chainDeploy/mainnets/lisk.ts

@@ -1,7 +1,8 @@
 import { lisk } from "@ionicprotocol/chains";
 
 import { ChainDeployConfig, deployChainlinkOracle } from "../helpers";
-import { Address } from "viem";
+import { Address, formatEther, Hash, Hex, zeroAddress, parseEther } from "viem";
+
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { assetSymbols, ChainlinkSpecificParams, OracleTypes } from "@ionicprotocol/types";
 import { addUnderlyingsToMpo } from "../helpers/oracles/utils";
@@ -26,7 +27,20 @@ export const deployConfig: ChainDeployConfig = {
     uniswapV3Quoter: lisk.chainAddresses.UNISWAP_V3?.QUOTER_V2 as Address
   },
   wtoken: lisk.chainAddresses.W_TOKEN as Address,
-  nativeTokenUsdChainlinkFeed: lisk.chainAddresses.W_TOKEN_USD_CHAINLINK_PRICE_FEED as Address
+  nativeTokenUsdChainlinkFeed: lisk.chainAddresses.W_TOKEN_USD_CHAINLINK_PRICE_FEED as Address,
+  veION: {
+    lpTokens: ["0x076d0CD6228B042aA28E1E6A0894Cf6C97abc23b"],
+    lpStakingStrategies: ["VeloAeroStakingStrategy"],
+    lpStakingWalletImplementations: ["VeloAeroStakingWallet"],
+    lpExternalStakingContracts: ["0x6BFF62258b7BD76F79B4F0818cDDF3628A2fFA58"],
+    lpTokenWhitelistStatuses: [true],
+    lpTokenTypes: [0],
+    minimumLockAmounts: [parseEther("0.01")],
+    minimumLockDuration: 6 * 30 * 24 * 60 * 60,
+    maxEarlyWithdrawFee: parseEther("0.8"),
+    maxVotingNum: 20
+  },
+  ION: "0x3f608A49a3ab475dA7fBb167C1Be6b7a45cD7013"
 };
 
 export const deploy = async ({

packages/contracts/contracts/test/DevTesting.t.sol

@@ -9,6 +9,8 @@ import { ComptrollerExtensionInterface } from "../compound/ComptrollerInterface.
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 import { Ownable2StepUpgradeable } from "@openzeppelin-contracts-upgradeable/contracts/access/Ownable2StepUpgradeable.sol";
+import { veIONSecondExtension } from "./veIONSecondExtension.sol";
+import { Voter } from "./Voter.sol";
 
 contract VoterLens is Initializable, Ownable2StepUpgradeable {
   struct BribeInfo {
@@ -17,6 +19,13 @@ contract VoterLens is Initializable, Ownable2StepUpgradeable {
     address bribeBorrow;
   }
 
+  struct MarketVoteInfo {
+    address market;
+    IVoter.MarketSide side;
+    uint256 votes;
+    uint256 votesValueInEth;
+  }
+
   struct IncentiveInfo {
     address market;
     address bribeSupply;
@@ -33,6 +42,7 @@ contract VoterLens is Initializable, Ownable2StepUpgradeable {
   PoolDirectory poolDirectory;
   IMasterPriceOracle mpo;
   uint256 constant PRECISION = 1e18;
+  address veIONAddress;
 
   function initialize(address _voter, PoolDirectory _poolDirectory) public initializer {
     voter = _voter;
@@ -133,19 +143,129 @@ contract VoterLens is Initializable, Ownable2StepUpgradeable {
     }
   }
 
+  struct UserBribes {
+    uint256 tokenId;
+    address market;
+    address bribe;
+    address reward;
+    uint256 earned;
+  }
+
+  struct UserBribeVars {
+    uint256[] userTokens;
+    address[] lpTokens;
+    uint256 count;
+    IVoter.VoteDetails voteDetails;
+    address rewardAccumulator;
+    address bribeRewards;
+    uint256 bribesLength;
+    address reward;
+    uint256 rewardEarned;
+  }
+
+  function getUserBribeRewards(address _user) external view returns (UserBribes[] memory _userBribes) {
+    UserBribeVars memory vars;
+    vars.userTokens = veIONSecondExtension(veIONAddress).getOwnedTokenIds(_user);
+    vars.lpTokens = Voter(voter).getAllLpRewardTokens();
+    vars.count = 0;
+
+    for (uint256 i = 0; i < vars.userTokens.length; i++) {
+      for (uint256 j = 0; j < vars.lpTokens.length; j++) {
+        vars.voteDetails = IVoterView(voter).getVoteDetails(vars.userTokens[i], vars.lpTokens[j]);
+        for (uint256 k; k < vars.voteDetails.marketVotes.length; k++) {
+          vars.rewardAccumulator = IVoterView(voter).marketToRewardAccumulators(
+            vars.voteDetails.marketVotes[k],
+            vars.voteDetails.marketVoteSides[k]
+          );
+          vars.bribeRewards = IVoterView(voter).rewardAccumulatorToBribe(vars.rewardAccumulator);
+          vars.bribesLength = IBribeRewardsView(vars.bribeRewards).rewardsListLength();
+          for (uint256 x; x < vars.bribesLength; x++) {
+            vars.reward = IBribeRewardsView(vars.bribeRewards).rewards(x);
+            vars.rewardEarned = IBribeRewardsView(vars.bribeRewards).earned(vars.reward, vars.userTokens[i]);
+            if (vars.rewardEarned != 0) vars.count++;
+          }
+        }
+      }
+    }
+
+    _userBribes = new UserBribes[](vars.count);
+    vars.count = 0;
+    for (uint256 i = 0; i < vars.userTokens.length; i++) {
+      for (uint256 j = 0; j < vars.lpTokens.length; j++) {
+        vars.voteDetails = IVoterView(voter).getVoteDetails(vars.userTokens[i], vars.lpTokens[j]);
+        for (uint256 k; k < vars.voteDetails.marketVotes.length; k++) {
+          vars.rewardAccumulator = IVoterView(voter).marketToRewardAccumulators(
+            vars.voteDetails.marketVotes[k],
+            vars.voteDetails.marketVoteSides[k]
+          );
+          vars.bribeRewards = IVoterView(voter).rewardAccumulatorToBribe(vars.rewardAccumulator);
+          vars.bribesLength = IBribeRewardsView(vars.bribeRewards).rewardsListLength();
+          for (uint256 x; x < vars.bribesLength; x++) {
+            vars.reward = IBribeRewardsView(vars.bribeRewards).rewards(x);
+            vars.rewardEarned = IBribeRewardsView(vars.bribeRewards).earned(vars.reward, vars.userTokens[i]);
+            if (vars.rewardEarned != 0) {
+              _userBribes[vars.count].tokenId = vars.userTokens[i];
+              _userBribes[vars.count].market = vars.voteDetails.marketVotes[k];
+              _userBribes[vars.count].bribe = vars.bribeRewards;
+              _userBribes[vars.count].reward = vars.reward;
+              _userBribes[vars.count].earned = vars.rewardEarned;
+
+              vars.count++;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  function getAllMarketVotes(address lp) public view returns (MarketVoteInfo[] memory _marketVoteInfo) {
+    uint256 marketsLength = IVoter(voter).marketsLength();
+    _marketVoteInfo = new MarketVoteInfo[](marketsLength);
+    for (uint256 i; i < marketsLength; i++) {
+      IVoter.Market memory _market = IVoterView(voter).markets(i);
+      _marketVoteInfo[i].market = _market.marketAddress;
+      _marketVoteInfo[i].side = _market.side;
+      _marketVoteInfo[i].votes = IVoterView(voter).weights(_market.marketAddress, _market.side, lp);
+
+      _marketVoteInfo[i].votesValueInEth =
+        (_marketVoteInfo[i].votes * 10 ** (18 - ERC20(lp).decimals()) * mpo.price(lp)) /
+        PRECISION;
+    }
+  }
+
+  function getTotalMarketVotes() external view returns (uint256 _total) {
+    address[] memory lpTokens = IVoter(voter).getAllLpRewardTokens();
+    for (uint256 i = 0; i < lpTokens.length; i++) {
+      MarketVoteInfo[] memory marketVotes = getAllMarketVotes(lpTokens[i]);
+      for (uint256 j = 0; j < marketVotes.length; j++) {
+        _total += marketVotes[j].votesValueInEth;
+      }
+    }
+  }
+
   function setMasterPriceOracle(address _masterPriceOracle) external onlyOwner {
     mpo = IMasterPriceOracle(_masterPriceOracle);
   }
+
+  function setVeIONAddress(address _veIONAddress) external onlyOwner {
+    veIONAddress = _veIONAddress;
+  }
 }
 
 interface IVoterView {
   function rewardAccumulatorToBribe(address rewardAccumulator) external view returns (address);
   function marketToRewardAccumulators(address market, IVoter.MarketSide marketSide) external view returns (address);
+  function marketVote(uint256 tokenId, address lpAsset) external view returns (address[] memory);
+  function marketVoteSide(uint256 tokenId, address lpAsset) external view returns (IVoter.MarketSide[] memory);
+  function getVoteDetails(uint256 _tokenId, address _lpAsset) external view returns (IVoter.VoteDetails memory);
+  function markets(uint256 index) external view returns (IVoter.Market memory);
+  function weights(address market, IVoter.MarketSide marketSide, address lp) external view returns (uint256);
 }
 
 interface IBribeRewardsView {
   function rewards(uint256 index) external view returns (address);
   function rewardsListLength() external view returns (uint256);
+  function earned(address token, uint256 tokenId) external view returns (uint256);
 }
 
 interface IMasterPriceOracle {

packages/contracts/contracts/veION/VoterLens.sol

@@ -67,8 +67,8 @@ const func: DeployFunction = async ({ viem, getNamedAccounts, deployments, getCh
             methodName: "initialize",
             args: [addressesProvider.address]
           }
-        }
-        // owner: deployer
+        },
+        owner: deployer
       }
     });
     if (veION.transactionHash) await publicClient.waitForTransactionReceipt({ hash: veION.transactionHash as Hash });

packages/contracts/deploy/21-deploy-veion.ts

@@ -285,6 +285,14 @@ const func: DeployFunction = async ({ viem, getNamedAccounts, deployments, getCh
   } catch (error) {
     console.error("Error setting max voting number:", error);
   }
+
+  try {
+    const txHash = await voterLens.write.setVeIONAddress([veION.address], { from: deployer });
+    await publicClient.waitForTransactionReceipt({ hash: txHash });
+    console.log(`Successfully set ve to ${veION.address}`);
+  } catch (error) {
+    console.error("Error setting max voting number:", error);
+  }
 };
 
 func.tags = ["prod", "veion", "voter"];