fix: deployed OneJumpOracle

VenusProtocol · Aug 16, 2024 · ecc31c4 · ecc31c4
1 parent 4e6d7b9
commit ecc31c4
Show file tree

Hide file tree

Showing 10 changed files with 1,062 additions and 98 deletions.
diff --git a/contracts/interfaces/IAccountantWithRateProviders.sol b/contracts/interfaces/IAccountantWithRateProviders.sol
diff --git a/contracts/oracles/WeETHAccountantOracle.sol b/contracts/oracles/WeETHAccountantOracle.sol
diff --git a/contracts/test/MockAccountantWithRateProviders.sol b/contracts/test/MockAccountantWithRateProviders.sol
diff --git a/deploy/13-dependencies-accountant-oracle.ts b/deploy/13-dependencies-accountant-oracle.ts
diff --git a/deploy/13-deploy-accountant-oracle.ts → deploy/13-deploy-weETHs-oracle.ts b/deploy/13-deploy-accountant-oracle.ts → deploy/13-deploy-weETHs-oracle.ts
@@ -13,22 +13,20 @@ const func: DeployFunction = async ({
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
+  const redStoneOracle = await ethers.getContract("RedStoneOracle");
   const resilientOracle = await ethers.getContract("ResilientOracle");
   const proxyOwnerAddress = network.live ? ADDRESSES[network.name].timelock : deployer;
   const defaultProxyAdmin = await artifacts.readArtifact(
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
-  let { weETHsAccountant } = ADDRESSES[network.name];
   const { weETHs, WETH } = ADDRESSES[network.name];
 
-  weETHsAccountant = weETHsAccountant || (await ethers.getContract("weETHsMockAccountantWithRateProviders")).address;
-
-  await deploy("WeETHsAccountantOracle", {
-    contract: "WeETHAccountantOracle",
+  await deploy("weETHsOneJumpRedStoneOracle", {
+    contract: "OneJumpOracle",
     from: deployer,
     log: true,
     deterministicDeployment: false,
-    args: [weETHsAccountant, weETHs, WETH, resilientOracle.address],
+    args: [weETHs, WETH, resilientOracle.address, redStoneOracle.address],
     proxy: {
       owner: proxyOwnerAddress,
       proxyContract: "OptimizedTransparentUpgradeableProxy",
@@ -42,5 +40,5 @@ const func: DeployFunction = async ({
 };
 
 export default func;
-func.tags = ["accountant-oracle"];
+func.tags = ["weETHs"];
 func.skip = async (hre: HardhatRuntimeEnvironment) => hre.network.name !== "ethereum" && hre.network.name !== "sepolia";
diff --git a/deployments/sepolia/solcInputs/04b8d48531fd1efbae754b96568494bd.json b/deployments/sepolia/solcInputs/04b8d48531fd1efbae754b96568494bd.json
diff --git a/deployments/sepolia/weETHsOneJumpRedStoneOracle.json b/deployments/sepolia/weETHsOneJumpRedStoneOracle.json
diff --git a/deployments/sepolia/weETHsOneJumpRedStoneOracle_Implementation.json b/deployments/sepolia/weETHsOneJumpRedStoneOracle_Implementation.json
diff --git a/deployments/sepolia/weETHsOneJumpRedStoneOracle_Proxy.json b/deployments/sepolia/weETHsOneJumpRedStoneOracle_Proxy.json
diff --git a/helpers/deploymentConfig.ts b/helpers/deploymentConfig.ts
@@ -117,7 +117,7 @@ export const ADDRESSES: PreconfiguredAddresses = {
     sfrxETH: "0x14AECeEc177085fd09EA07348B4E1F7Fcc030fA1",
     rsETH: "0xfA0614E5C803E15070d31f7C38d2d430EBe68E47",
     ezETH: "0xB8eb706b85Ae7355c9FE4371a499F50f3484809c",
-    weETHs: "0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88",
+    weETHs: "0xE233527306c2fa1E159e251a2E5893334505A5E0",
   },
   ethereum: {
     vBNBAddress: ethers.constants.AddressZero,
@@ -142,7 +142,6 @@ export const ADDRESSES: PreconfiguredAddresses = {
     rsETH: "0xA1290d69c65A6Fe4DF752f95823fae25cB99e5A7",
     ezETH: "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110",
     weETHs: "0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88",
-    weETHsAccountant: "0xbe16605B22a7faCEf247363312121670DFe5afBE",
   },
   opbnbtestnet: {
     vBNBAddress: ethers.constants.AddressZero,