refactor: add imports for arbitrum one

VenusProtocol · Jun 21, 2024 · f9144a9 · f9144a9
1 parent 1173de8
commit f9144a9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
     "@typescript-eslint/eslint-plugin": "^5.27.1",
     "@typescript-eslint/parser": "^5.27.1",
     "@venusprotocol/governance-contracts": "2.1.0",
-    "@venusprotocol/oracle": "2.2.0",
+    "@venusprotocol/oracle": "2.3.0",
     "@venusprotocol/protocol-reserve": "2.2.0",
     "@venusprotocol/venus-protocol": "9.0.0",
     "bignumber.js": "9.0.0",

diff --git a/tests/hardhat/Fork/constants.ts b/tests/hardhat/Fork/constants.ts
@@ -1,24 +1,28 @@
+import GovernanceArbOne from "@venusprotocol/governance-contracts/deployments/arbitrumone.json";
 import GovernanceArbSep from "@venusprotocol/governance-contracts/deployments/arbitrumsepolia.json";
 import GovernanceBscMainnet from "@venusprotocol/governance-contracts/deployments/bscmainnet.json";
 import GovernanceBscTestnet from "@venusprotocol/governance-contracts/deployments/bsctestnet.json";
 import GovernanceEthMainnet from "@venusprotocol/governance-contracts/deployments/ethereum.json";
 import GovernanceOpBnbMainnet from "@venusprotocol/governance-contracts/deployments/opbnbmainnet.json";
 import GovernanceOpBnbTestnet from "@venusprotocol/governance-contracts/deployments/opbnbtestnet.json";
 import GovernanceSepTestnet from "@venusprotocol/governance-contracts/deployments/sepolia.json";
+import OracleArbOne from "@venusprotocol/oracle/deployments/arbitrumone.json";
 import OracleArbSep from "@venusprotocol/oracle/deployments/arbitrumsepolia.json";
 import OracleBscMainnet from "@venusprotocol/oracle/deployments/bscmainnet.json";
 import OracleBscTestnet from "@venusprotocol/oracle/deployments/bsctestnet.json";
 import OracleEthMainnet from "@venusprotocol/oracle/deployments/ethereum.json";
 import OracleOpBnbMainnet from "@venusprotocol/oracle/deployments/opbnbmainnet.json";
 import OracleOpBnbTestnet from "@venusprotocol/oracle/deployments/opbnbtestnet.json";
 import OracleSepTestnet from "@venusprotocol/oracle/deployments/sepolia.json";
+import PsrArbOne from "@venusprotocol/protocol-reserve/deployments/arbitrumone.json";
 import PsrArbSep from "@venusprotocol/protocol-reserve/deployments/arbitrumsepolia.json";
 import PsrBscMainnet from "@venusprotocol/protocol-reserve/deployments/bscmainnet.json";
 import PsrBscTestnet from "@venusprotocol/protocol-reserve/deployments/bsctestnet.json";
 import PsrEthereum from "@venusprotocol/protocol-reserve/deployments/ethereum.json";
 import PsrOpBnbTestnet from "@venusprotocol/protocol-reserve/deployments/opbnbtestnet/ProtocolShareReserve.json";
 import PsrSepTestnet from "@venusprotocol/protocol-reserve/deployments/sepolia.json";
 
+import { contracts as ArbOneContracts } from "../../../deployments/arbitrumone.json";
 import { contracts as ArbSepContracts } from "../../../deployments/arbitrumsepolia.json";
 import { contracts as MainnetContracts } from "../../../deployments/bscmainnet.json";
 import { contracts as TestnetContracts } from "../../../deployments/bsctestnet.json";
@@ -78,7 +82,7 @@ export const contractAddresses = {
     COMPTROLLER: TestnetContracts.Comptroller_StableCoins.address,
     PSR: PsrBscTestnet.contracts.ProtocolShareReserve.address,
     SHORTFALL: TestnetContracts.Shortfall.address,
-    RISKFUND: TestnetContracts.RiskFund.address,
+    RISKFUND: PsrBscTestnet.contracts.RiskFundV2.address,
     REWARD_DISTRIBUTOR1: TestnetContracts.RewardsDistributor_StableCoins_0.address,
     POOL_REGISTRY: TestnetContracts.PoolRegistry.address,
     RESILIENT_ORACLE: OracleBscTestnet.contracts.ResilientOracle.address,
@@ -102,7 +106,7 @@ export const contractAddresses = {
     COMPTROLLER: MainnetContracts.Comptroller_Stablecoins.address,
     PSR: PsrBscMainnet.contracts.ProtocolShareReserve.address,
     SHORTFALL: MainnetContracts.Shortfall.address,
-    RISKFUND: MainnetContracts.RiskFund.address,
+    RISKFUND: PsrBscMainnet.contracts.RiskFundV2.address,
     REWARD_DISTRIBUTOR1: MainnetContracts.RewardsDistributor_Stablecoins_0.address,
     POOL_REGISTRY: MainnetContracts.PoolRegistry.address,
     RESILIENT_ORACLE: OracleBscMainnet.contracts.ResilientOracle.address,
@@ -166,7 +170,7 @@ export const contractAddresses = {
     VTOKEN2: ArbSepContracts.VToken_vARB_Core.address,
     COMPTROLLER: ArbSepContracts.Comptroller_Core.address,
     PSR: PsrArbSep.contracts.ProtocolShareReserve.address,
-    REWARD_DISTRIBUTOR1: "0x8E73FE3F7E29100Ad9d1C7F35fba2D2c823c8579",
+    REWARD_DISTRIBUTOR1: ArbSepContracts.RewardsDistributor_Core_0.address,
     POOL_REGISTRY: ArbSepContracts.PoolRegistry.address,
     RESILIENT_ORACLE: OracleArbSep.contracts.ResilientOracle.address,
     CHAINLINK_ORACLE: OracleArbSep.contracts.ChainlinkOracle.address,
@@ -179,4 +183,24 @@ export const contractAddresses = {
     ACC3: "0x13E0a421c17Ff1e7FFccFa05714957cF530b3aa4",
     BLOCK_NUMBER: 40468900,
   },
+  arbitrumone: {
+    ADMIN: "0x14e0E151b33f9802b3e75b621c1457afc44DcAA0",
+    ACM: GovernanceArbOne.contracts.AccessControlManager.address,
+    VTOKEN1: ArbOneContracts.VToken_vWETH_Core.address,
+    VTOKEN2: ArbOneContracts.VToken_vARB_Core.address,
+    COMPTROLLER: ArbOneContracts.Comptroller_Core.address,
+    PSR: PsrArbOne.contracts.ProtocolShareReserve.address,
+    REWARD_DISTRIBUTOR1: ArbOneContracts.RewardsDistributor_Core_0.address,
+    POOL_REGISTRY: ArbOneContracts.PoolRegistry.address,
+    RESILIENT_ORACLE: OracleArbOne.contracts.ResilientOracle.address,
+    CHAINLINK_ORACLE: OracleArbOne.contracts.SequencerChainlinkOracle.address,
+    TOKEN1: "0x82af49447d8a07e3bd95bd0d56f35241523fbab1", // WETH
+    TOKEN2: "0x912ce59144191c1204e64559fe8253a0e49e6548", // ARB
+    TOKEN1_HOLDER: "0xf3fc178157fb3c87548baa86f9d24ba38e649b58",
+    TOKEN2_HOLDER: "0xf3fc178157fb3c87548baa86f9d24ba38e649b58",
+    ACC1: "0x32B701d3957fee432664cFA57FB44b0fE8496659",
+    ACC2: "0xB09F16F625B363875e39ADa56C03682088471523",
+    ACC3: "0x4A2339eE9c4fD4c99DE1d3AeB513B53ab42Db5ca",
+    BLOCK_NUMBER: 224198807,
+  },
 };
diff --git a/yarn.lock b/yarn.lock
@@ -3131,17 +3131,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@venusprotocol/governance-contracts@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@venusprotocol/governance-contracts@npm:2.0.0"
-  dependencies:
-    "@venusprotocol/solidity-utilities": 2.0.0
-    hardhat-deploy-ethers: ^0.3.0-beta.13
-    module-alias: ^2.2.2
-  checksum: 18b56d951c4e68fa1edadc93ed44daa55c8b81294778a4969d940a084de6d949630eacd4702d1b92f04ad5d709963a3a0a790014871ec34b0b2f4806cebc731c
-  languageName: node
-  linkType: hard
-
 "@venusprotocol/isolated-pools@npm:^2.3.0":
   version: 2.8.0
   resolution: "@venusprotocol/isolated-pools@npm:2.8.0"
@@ -3187,7 +3176,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^5.27.1
     "@typescript-eslint/parser": ^5.27.1
     "@venusprotocol/governance-contracts": 2.1.0
-    "@venusprotocol/oracle": 2.2.0
+    "@venusprotocol/oracle": 2.3.0
     "@venusprotocol/protocol-reserve": 2.2.0
     "@venusprotocol/solidity-utilities": ^2.0.0
     "@venusprotocol/venus-protocol": 9.0.0
@@ -3220,24 +3209,24 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@venusprotocol/oracle@npm:2.2.0":
-  version: 2.2.0
-  resolution: "@venusprotocol/oracle@npm:2.2.0"
+"@venusprotocol/oracle@npm:2.3.0":
+  version: 2.3.0
+  resolution: "@venusprotocol/oracle@npm:2.3.0"
   dependencies:
     "@chainlink/contracts": ^0.5.1
     "@defi-wonderland/smock": ^2.3.4
     "@nomicfoundation/hardhat-network-helpers": ^1.0.8
     "@openzeppelin/contracts": ^4.6.0
     "@openzeppelin/contracts-upgradeable": ^4.7.3
-    "@venusprotocol/governance-contracts": ^2.0.0
+    "@venusprotocol/governance-contracts": ^2.1.0
     "@venusprotocol/solidity-utilities": ^2.0.0
     "@venusprotocol/venus-protocol": ^6.0.0
     ethers: ^5.6.8
     hardhat: ^2.16.1
     hardhat-deploy: ^0.11.14
     module-alias: ^2.2.2
     solidity-docgen: ^0.6.0-beta.29
-  checksum: 5ff2e0af88dbbe077c423b62f9c92cd0a9173f4a618f79bc9aec9df8b96e6e908e565adc82175dbe78b200c3d77abeb48878506fd85ada2c8c87b8d568dc1a3e
+  checksum: 6ba484f72eef7701a92be1673ec5c3d7d180c79aa17c7b7ef0c3848fbf15b456e5cc7633bf0a1fbb4ff36ba05524b3f70f966e40c4f32f8b8cff551c6605878b
   languageName: node
   linkType: hard