@venusprotocol/governance-contracts 2.5.0-dev.5 → 2.5.0-dev.7

package/deploy/005-remote-timelock.ts

@@ -13,6 +13,7 @@ export enum REMOTE_NETWORKS {
   ZKSYNCMAINNET = "zksyncmainnet",
   OPSEPOLIA = "opsepolia",
   OPMAINNET = "opmainnet",
+  BASESEPOLIA = "basesepolia",
   HARDHAT = "hardhat",
 }
 type DelayTypes = {
@@ -80,6 +81,11 @@ export const delayConfig: DelayConfig = {
     fast: 21600,
     critical: 3600,
   },
+  basesepolia: {
+    normal: 600,
+    fast: 300,
+    critical: 100,
+  },
 };
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
@@ -98,6 +104,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     args: [omnichainGovernanceExecutorAddress, delayConfig[networkName].normal],
     log: true,
     autoMine: true,
+    skipIfAlreadyDeployed: true,
   });
 
   await deploy(live ? "FastTrackTimelock" : "FastTrackTimelockRemote", {
@@ -106,6 +113,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     args: [omnichainGovernanceExecutorAddress, delayConfig[networkName].fast],
     log: true,
     autoMine: true,
+    skipIfAlreadyDeployed: true,
   });
 
   await deploy(live ? "CriticalTimelock" : "CriticalTimelockRemote", {
@@ -114,6 +122,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     args: [omnichainGovernanceExecutorAddress, delayConfig[networkName].critical],
     log: true,
     autoMine: true,
+    skipIfAlreadyDeployed: true,
   });
 };
 

package/deploy/008-configure-acm-commands-aggregator.ts

@@ -28,7 +28,6 @@ import {
   getPrimeRevokePermissions,
   getProtocolShareReservePermissions,
   getRedstoneOraclePermissions,
-  getRedstoneOracleRevokePermissions,
   getResilientOraclePermissions,
   getResilientOracleRevokePermissions,
   getRewardDistributorPermissionsBlockbased,
@@ -71,6 +70,10 @@ const SEPOLIA_sFrxETH_ORACLE = "0x61EB836afA467677e6b403D504fe69D6940e7996";
 const OPBNBTESTNET_RESILIENT_ORACLE = "0xEF4e53a9A4565ef243A2f0ee9a7fc2410E1aA623";
 const OPBNBTESTNET_BINANCE_ORACLE = "0x496B6b03469472572C47bdB407d5549b244a74F2";
 const OPBNBTESTNET_BOUND_VALIDATOR = "0x049537Bb065e6253e9D8D08B45Bf6b753657A746";
+const BASESEPOLIA_RESILIENT_ORACLE = "0xC34871C982cf0Bc6e7aCa2c2670Bc319bDA1C744";
+const BASESEPOLIA_CHAINLINK_ORACLE = "0x801aB33A69AD867500fbCda7b3dB66C73151494b";
+const BASESEPOLIA_REDSTONE_ORACLE = "0x8267FE3f75E0A37ee34e113E767F9C9727206838";
+const BASESEPOLIA_BOUND_VALIDATOR = "0xC76284488E57554A457A75a8b166fB2ADAB430dB";
 
 const ARBITRUMONE_XVS = "0xc1Eb7689147C81aC840d4FF0D298489fc7986d52";
 const ETHEREUM_XVS = "0xd3CC9d8f3689B83c91b7B59cAB4946B063EB894A";
@@ -84,6 +87,8 @@ const OPBNBMAINNET_XVS_BRIDGE_ADMIN = "0x52fcE05aDbf6103d71ed2BA8Be7A31728273183
 const ARBITRUMSEPOLIA_XVS_BRIDGE_ADMIN = "0xc94578caCC89a29B044a0a1D54d20d48A645E5C8";
 const SEPOLIA_XVS_BRIDGE_ADMIN = "0xd3c6bdeeadB2359F726aD4cF42EAa8B7102DAd9B";
 const OPBNBTESTNET_XVS_BRIDGE_ADMIN = "0x19252AFD0B2F539C400aEab7d460CBFbf74c17ff";
+const BASESEPOLIA_XVS = "0xE657EDb5579B82135a274E85187927C42E38C021";
+const BASESEPOLIA_XVS_BRIDGE_ADMIN = "0xE431E82d8fFfd81E7c082BeC7Fe2C306f5c988aD";
 
 const ARBITRUMONE_XVS_VAULT_PROXY = "0x8b79692AAB2822Be30a6382Eb04763A74752d5B4";
 const ETHEREUM_XVS_VAULT_PROXY = "0xA0882C2D5DF29233A092d2887A258C2b90e9b994";
@@ -91,6 +96,7 @@ const OPBNBMAINNET_XVS_VAULT_PROXY = "0x7dc969122450749A8B0777c0e324522d67737988
 const ARBITRUMSEPOLIA_XVS_VAULT_PROXY = "0x407507DC2809D3aa31D54EcA3BEde5C5c4C8A17F";
 const SEPOLIA_XVS_VAULT_PROXY = "0x1129f882eAa912aE6D4f6D445b2E2b1eCbA99fd5";
 const OPBNBTESTNET_XVS_VAULT_PROXY = "0xB14A0e72C5C202139F78963C9e89252c1ad16f01";
+const BASESEPOLIA_XVS_VAULT_PROXY = "0x9b5D0aDfCEcC8ed422d714EcbcE2FFA436e269B8";
 
 const ETHEREUM_XVS_VAULT_TREASURY = "0xaE39C38AF957338b3cEE2b3E5d825ea88df02EfE";
 const SEPOLIA_XVS_VAULT_TREASURY = "0xCCB08e5107b406E67Ad8356023dd489CEbc79B40";
@@ -101,6 +107,7 @@ const OPBNBMAINNET_POOL_REGISTRY = "0x345a030Ad22e2317ac52811AC41C1A63cfa13aEe";
 const SEPOLIA_POOL_REGISTRY = "0x758f5715d817e02857Ba40889251201A5aE3E186";
 const OPBNBTESTNET_POOL_REGISTRY = "0x560eA4e1cC42591E9f5F5D83Ad2fd65F30128951";
 const ARBITRUMSEPOLIA_POOL_REGISTRY = "0xf93Df3135e0D555185c0BC888073374cA551C5fE";
+const BASESEPOLIA_POOL_REGISTRY = "0xCa330282BEeb07a81963336d0bf8f5f34317916c";
 
 const ARBITRUMONE_PRIME = "0xFE69720424C954A2da05648a0FAC84f9bf11Ef49";
 const ARBITRUMONE_PLP = "0x86bf21dB200f29F21253080942Be8af61046Ec29";
@@ -118,6 +125,9 @@ const SEPOLIA_PLP = "0x15242a55Ad1842A1aEa09c59cf8366bD2f3CE9B4";
 const SEPOLIA_PSR = "0xbea70755cc3555708ca11219adB0db4C80F6721B";
 const OPBNBTESTNET_PSR = "0xc355dEb1A9289f8C58CFAa076EEdBf51F3A8Da7F";
 const SEPOLIA_CONVERTER_NETWORK = "0xB5A4208bFC4cC2C4670744849B8fC35B21A690Fa";
+const BASESEPOLIA_PRIME = "0x15A1AC7fA14C5900Ba93853375d66b6bB6A83B50";
+const BASESEPOLIA_PLP = "0xb5BA66311C5f9A5C9d3CeE0183F5426DD694dE37";
+const BASESEPOLIA_PSR = "0x4Ae3D77Ece08Ec3E5f5842B195f746bd3bCb8d73";
 
 const ARBITRUMONE_GUARDIAN = "0x14e0E151b33f9802b3e75b621c1457afc44DcAA0";
 const ETHEREUM_GUARDIAN = "0x285960C5B22fD66A736C7136967A3eB15e93CC67";
@@ -125,10 +135,12 @@ const OPBNBMAINNET_GUARDIAN = "0xC46796a21a3A9FAB6546aF3434F2eBfFd0604207";
 const SEPOLIA_GUARDIAN = "0x94fa6078b6b8a26f0b6edffbe6501b22a10470fb";
 const OPBNBTESTNET_GUARDIAN = "0xb15f6EfEbC276A3b9805df81b5FB3D50C2A62BDf";
 const ARBITRUMSEPOLIA_GUARDIAN = "0x1426A5Ae009c4443188DA8793751024E358A61C2";
+const BASESEPOLIA_GUARDIAN = "0xdf3b635d2b535f906BB02abb22AED71346E36a00";
 
 const ARBITRUMSEPOLIA_OMNICHAIN_EXECUTOR_OWNER = "0xfCA70dd553b7dF6eB8F813CFEA6a9DD039448878";
 const SEPOLIA_OMNICHAIN_EXECUTOR_OWNER = "0xf964158C67439D01e5f17F0A3F39DfF46823F27A";
 const OPBNBTESTNET_OMNICHAIN_EXECUTOR_OWNER = "0x4F570240FF6265Fbb1C79cE824De6408F1948913";
+const BASESEPOLIA_OMNICHAIN_EXECUTOR_OWNER = "0xe3fb08B8817a0c88d39A4DA4eFFD586D3326b73b";
 
 const ETHEREUM_CONVERTERS: string[] = [
   "0xaE39C38AF957338b3cEE2b3E5d825ea88df02EfE",
@@ -257,6 +269,23 @@ const grantPermissions: Permissions = {
     ...getIRMPermissions(),
     ...getOmniChainExecutorOwnerPermissions(OPBNBTESTNET_OMNICHAIN_EXECUTOR_OWNER, OPBNBTESTNET_GUARDIAN),
   ],
+  basesepolia: [
+    ...getResilientOraclePermissions(BASESEPOLIA_RESILIENT_ORACLE),
+    ...getChainlinkOraclePermissions(BASESEPOLIA_CHAINLINK_ORACLE),
+    ...getRedstoneOraclePermissions(BASESEPOLIA_REDSTONE_ORACLE),
+    ...getBoundValidatorPermissions(BASESEPOLIA_BOUND_VALIDATOR),
+    ...getXVSPermissions(BASESEPOLIA_XVS),
+    ...getXVSBridgeAdminPermissions(BASESEPOLIA_XVS_BRIDGE_ADMIN),
+    ...getXVSVaultPermissions(BASESEPOLIA_XVS_VAULT_PROXY),
+    ...getPoolRegistryPermissions(BASESEPOLIA_POOL_REGISTRY),
+    ...getPrimePermissions(BASESEPOLIA_PRIME),
+    ...getPrimeLiquidityProviderPermissions(BASESEPOLIA_PLP),
+    ...getProtocolShareReservePermissions(BASESEPOLIA_PSR),
+    ...getComptrollerPermissions(),
+    ...getVTokenPermissions(),
+    ...getRewardDistributorPermissionsTimebased(),
+    ...getIRMPermissions(),
+  ],
 };
 
 const revokePermissions: Permissions = {
@@ -272,7 +301,6 @@ const revokePermissions: Permissions = {
     ...getComptrollerRevokePermissions(ARBITRUMONE_GUARDIAN),
     ...getVTokenRevokePermissions(ARBITRUMONE_GUARDIAN),
     ...getXVSBridgeAdminRevokePermissions(ARBITRUMONE_XVS_BRIDGE_ADMIN, ARBITRUMONE_GUARDIAN),
-    ...getRedstoneOracleRevokePermissions(ARBITRUMONE_REDSTONE_ORACLE, ARBITRUMONE_GUARDIAN),
   ],
   ethereum: [
     ...getPrimeRevokePermissions(ETHEREUM_PRIME, ETHEREUM_GUARDIAN),
@@ -285,7 +313,6 @@ const revokePermissions: Permissions = {
     ...getPoolRegistryRevokePermissions(ETHEREUM_POOL_REGISTRY, ETHEREUM_GUARDIAN),
     ...getComptrollerRevokePermissions(ETHEREUM_GUARDIAN),
     ...getVTokenRevokePermissions(ETHEREUM_GUARDIAN),
-    ...getRedstoneOracleRevokePermissions(ETHEREUM_REDSTONE_ORACLE, ETHEREUM_GUARDIAN),
     ...getConverterNetworkRevokePermissions(ETHEREUM_CONVERTER_NETWORK, ETHEREUM_GUARDIAN),
     ...getSFrxETHOracleRevokePermissions(ETHEREUM_sFrxETH_ORACLE, ETHEREUM_GUARDIAN),
     ...getConvertersRevokePermissions(ETHEREUM_CONVERTERS, ETHEREUM_GUARDIAN),
@@ -325,7 +352,6 @@ const revokePermissions: Permissions = {
     ...getPoolRegistryRevokePermissions(SEPOLIA_POOL_REGISTRY, SEPOLIA_GUARDIAN),
     ...getComptrollerRevokePermissions(SEPOLIA_GUARDIAN),
     ...getVTokenRevokePermissions(SEPOLIA_GUARDIAN),
-    ...getRedstoneOracleRevokePermissions(SEPOLIA_REDSTONE_ORACLE, SEPOLIA_GUARDIAN),
     ...getConverterNetworkRevokePermissions(SEPOLIA_CONVERTER_NETWORK, SEPOLIA_GUARDIAN),
     ...getSFrxETHOracleRevokePermissions(SEPOLIA_sFrxETH_ORACLE, SEPOLIA_GUARDIAN),
     ...getConvertersRevokePermissions(SEPOLIA_CONVERTERS, SEPOLIA_GUARDIAN),
@@ -345,9 +371,21 @@ const revokePermissions: Permissions = {
     ...getComptrollerRevokePermissions(ARBITRUMSEPOLIA_GUARDIAN),
     ...getVTokenRevokePermissions(ARBITRUMSEPOLIA_GUARDIAN),
     ...getXVSBridgeAdminRevokePermissions(ARBITRUMSEPOLIA_XVS_BRIDGE_ADMIN, ARBITRUMSEPOLIA_GUARDIAN),
-    ...getRedstoneOracleRevokePermissions(ARBITRUMSEPOLIA_REDSTONE_ORACLE, ARBITRUMSEPOLIA_GUARDIAN),
     ...getOmniChainExecutorOwnerRevokePermissions(ARBITRUMSEPOLIA_OMNICHAIN_EXECUTOR_OWNER, ARBITRUMSEPOLIA_GUARDIAN),
   ],
+  basesepolia: [
+    ...getPrimeRevokePermissions(BASESEPOLIA_PRIME, BASESEPOLIA_GUARDIAN),
+    ...getPrimeLiquidityProviderRevokePermissions(BASESEPOLIA_PLP, BASESEPOLIA_GUARDIAN),
+    ...getResilientOracleRevokePermissions(BASESEPOLIA_RESILIENT_ORACLE, BASESEPOLIA_GUARDIAN),
+    ...getBoundValidatorRevokePermissions(BASESEPOLIA_BOUND_VALIDATOR, BASESEPOLIA_GUARDIAN),
+    ...getXVSVaultRevokePermissions(BASESEPOLIA_XVS_VAULT_PROXY, BASESEPOLIA_GUARDIAN),
+    ...getRewardDistributorRevokePermissions(BASESEPOLIA_GUARDIAN, true),
+    ...getIRMRevokePermissions(BASESEPOLIA_GUARDIAN),
+    ...getPoolRegistryRevokePermissions(BASESEPOLIA_POOL_REGISTRY, BASESEPOLIA_GUARDIAN),
+    ...getComptrollerRevokePermissions(BASESEPOLIA_GUARDIAN),
+    ...getVTokenRevokePermissions(BASESEPOLIA_GUARDIAN),
+    ...getXVSBridgeAdminRevokePermissions(BASESEPOLIA_XVS_BRIDGE_ADMIN, BASESEPOLIA_GUARDIAN),
+  ],
 };
 
 function splitPermissions(

package/deploy/010-redstone-and-vault-permission.ts

@@ -0,0 +1,102 @@
+import { ethers } from "hardhat";
+import { DeployFunction } from "hardhat-deploy/types";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { ACMCommandsAggregator } from "typechain";
+
+import {
+  ARBITRUMONE_GUARDIAN,
+  ARBITRUMONE_REDSTONE_ORACLE,
+  ARBITRUMONE_XVS_VAULT_PROXY,
+  ARBITRUMSEPOLIA_GUARDIAN,
+  ARBITRUMSEPOLIA_REDSTONE_ORACLE,
+  ARBITRUMSEPOLIA_XVS_VAULT_PROXY,
+  ETHEREUM_GUARDIAN,
+  ETHEREUM_REDSTONE_ORACLE,
+  ETHEREUM_XVS_VAULT_PROXY,
+  OPBNBMAINNET_GUARDIAN,
+  OPBNBMAINNET_XVS_VAULT_PROXY,
+  OPBNBTESTNET_GUARDIAN,
+  OPBNBTESTNET_XVS_VAULT_PROXY,
+  SEPOLIA_GUARDIAN,
+  SEPOLIA_REDSTONE_ORACLE,
+  SEPOLIA_XVS_VAULT_PROXY,
+} from "../helpers/Addresses";
+import { getXVSVaultRevokePermissions } from "../helpers/permissions";
+
+interface Permissions {
+  [key: string]: string[][];
+}
+
+const getRedstoneOraclePermissionsRevokedPreviously = (redstoneOracle: string, guardian: string): string[][] => {
+  return [
+    [redstoneOracle, "setTokenConfig(TokenConfig)", guardian],
+    [redstoneOracle, "setDirectPrice(address,uint256)", guardian],
+  ];
+};
+const BSCMAINNET_REDSTONE_ORACLE = "0x8455EFA4D7Ff63b8BFD96AdD889483Ea7d39B70a";
+const BSCTESTNET_REDSTONE_ORACLE = "0x0Af51d1504ac5B711A9EAFe2fAC11A51d32029Ad";
+
+const BSCMAINNET_GUARDIAN = "0x3a3284dC0FaFfb0b5F0d074c4C704D14326C98cF";
+const BSCTESTNET_GUARDIAN = "0xFEA1c651A47FE29dB9b1bf3cC1f224d8D9CFF68C";
+
+const grantPermissions: Permissions = {
+  arbitrumone: [...getRedstoneOraclePermissionsRevokedPreviously(ARBITRUMONE_REDSTONE_ORACLE, ARBITRUMONE_GUARDIAN)],
+  arbitrumsepolia: [
+    ...getRedstoneOraclePermissionsRevokedPreviously(ARBITRUMSEPOLIA_REDSTONE_ORACLE, ARBITRUMSEPOLIA_GUARDIAN),
+  ],
+  ethereum: [...getRedstoneOraclePermissionsRevokedPreviously(ETHEREUM_REDSTONE_ORACLE, ETHEREUM_GUARDIAN)],
+  sepolia: [...getRedstoneOraclePermissionsRevokedPreviously(SEPOLIA_REDSTONE_ORACLE, SEPOLIA_GUARDIAN)],
+  bscmainnet: [...getRedstoneOraclePermissionsRevokedPreviously(BSCMAINNET_REDSTONE_ORACLE, BSCMAINNET_GUARDIAN)],
+  bsctestnet: [...getRedstoneOraclePermissionsRevokedPreviously(BSCTESTNET_REDSTONE_ORACLE, BSCTESTNET_GUARDIAN)],
+};
+
+const revokePermissions: Permissions = {
+  arbitrumone: [...getXVSVaultRevokePermissions(ARBITRUMONE_XVS_VAULT_PROXY, ARBITRUMONE_GUARDIAN)],
+  arbitrumsepolia: [...getXVSVaultRevokePermissions(ARBITRUMSEPOLIA_XVS_VAULT_PROXY, ARBITRUMSEPOLIA_GUARDIAN)],
+  ethereum: [...getXVSVaultRevokePermissions(ETHEREUM_XVS_VAULT_PROXY, ETHEREUM_GUARDIAN)],
+  sepolia: [...getXVSVaultRevokePermissions(SEPOLIA_XVS_VAULT_PROXY, SEPOLIA_GUARDIAN)],
+  opbnbmainnet: [...getXVSVaultRevokePermissions(OPBNBMAINNET_XVS_VAULT_PROXY, OPBNBMAINNET_GUARDIAN)],
+  opbnbtestnet: [...getXVSVaultRevokePermissions(OPBNBTESTNET_XVS_VAULT_PROXY, OPBNBTESTNET_GUARDIAN)],
+};
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const acmCommandsAggregator: ACMCommandsAggregator = await ethers.getContract("ACMCommandsAggregator");
+
+  const _grantPermissions: ACMCommandsAggregator.PermissionStruct[] = grantPermissions[hre.network.name].map(
+    permission => ({
+      contractAddress: permission[0],
+      functionSig: permission[1],
+      account: permission[2],
+    }),
+  );
+
+  const _revokePermissions: ACMCommandsAggregator.PermissionStruct[] = revokePermissions[hre.network.name].map(
+    permission => ({
+      contractAddress: permission[0],
+      functionSig: permission[1],
+      account: permission[2],
+    }),
+  );
+
+  try {
+    // Add grant permissions
+    let tx = await acmCommandsAggregator.addGrantPermissions(_grantPermissions);
+    let receipt = await tx.wait();
+    let events = receipt.events?.filter(event => event.event === "GrantPermissionsAdded");
+    console.log(`Grant Permissions for ${hre.network.name} added with indexes: `, events?.[0].args?.index.toString());
+
+    // Add revoke permissions
+    tx = await acmCommandsAggregator.addRevokePermissions(_revokePermissions);
+    receipt = await tx.wait();
+    events = receipt.events?.filter(event => event.event === "RevokePermissionsAdded");
+    console.log(`Revoke Permissions for ${hre.network.name} added with indexes: `, events?.[0].args?.index.toString());
+  } catch (error) {
+    console.error("Error adding adding permissions:", error);
+  }
+};
+
+func.tags = ["redstone-vault-permissions"];
+
+func.skip = async (hre: HardhatRuntimeEnvironment) => hre.network.name === "hardhat";
+
+export default func;