fixup! feat: upgrade RiskFund to support ACM in sweepTokensFromPool

VenusProtocol · Aug 28, 2024 · 50e42af · 50e42af
1 parent bfb6855
commit 50e42af
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/...ons/vip-352/abi/AccessControlManager.json → ...ons/vip-357/abi/AccessControlManager.json b/...ons/vip-352/abi/AccessControlManager.json → ...ons/vip-357/abi/AccessControlManager.json
diff --git a/...ations/vip-352/abi/DefaultProxyAdmin.json → ...ations/vip-357/abi/DefaultProxyAdmin.json b/...ations/vip-352/abi/DefaultProxyAdmin.json → ...ations/vip-357/abi/DefaultProxyAdmin.json
diff --git a/simulations/vip-352/abi/RiskFundV2.json → simulations/vip-357/abi/RiskFundV2.json b/simulations/vip-352/abi/RiskFundV2.json → simulations/vip-357/abi/RiskFundV2.json
diff --git a/...ions/vip-352/abi/TransparentProxyAbi.json → ...ions/vip-357/abi/TransparentProxyAbi.json b/...ions/vip-352/abi/TransparentProxyAbi.json → ...ions/vip-357/abi/TransparentProxyAbi.json
diff --git a/simulations/vip-352/bscmainnet.ts → simulations/vip-357/bscmainnet.ts b/simulations/vip-352/bscmainnet.ts → simulations/vip-357/bscmainnet.ts
@@ -6,7 +6,7 @@ import { ethers } from "hardhat";
 import { expectEvents, initMainnetUser } from "src/utils";
 import { CRITICAL_TIMELOCK, forking, testVip } from "src/vip-framework";
 
-import { NEW_RISK_FUND_IMPL, OLD_RISK_FUND_IMPL, PROXY_ADMIN, RISK_FUND, vip352 } from "../../vips/vip-352/bscmainnet";
+import { NEW_RISK_FUND_IMPL, OLD_RISK_FUND_IMPL, PROXY_ADMIN, RISK_FUND, vip357 } from "../../vips/vip-357/bscmainnet";
 import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json";
 import PROXY_ADMIN_ABI from "./abi/DefaultProxyAdmin.json";
 import RISK_FUND_ABI from "./abi/RiskFundV2.json";
@@ -41,7 +41,7 @@ forking(41350730, async () => {
     });
   });
 
-  testVip("VIP-352", await vip352(), {
+  testVip("VIP-357", await vip357(), {
     callbackAfterExecution: async (txResponse: TransactionResponse) => {
       await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["RoleGranted"], [5]);
       await expectEvents(txResponse, [TRANSPARENT_PROXY_ABI], ["Upgraded"], [1]);

diff --git a/simulations/vip-352/bsctestnet.ts → simulations/vip-357/bsctestnet.ts b/simulations/vip-352/bsctestnet.ts → simulations/vip-357/bsctestnet.ts
@@ -6,7 +6,7 @@ import { ethers } from "hardhat";
 import { expectEvents, initMainnetUser } from "src/utils";
 import { CRITICAL_TIMELOCK, forking, testVip } from "src/vip-framework";
 
-import { NEW_RISK_FUND_IMPL, OLD_RISK_FUND_IMPL, PROXY_ADMIN, RISK_FUND, vip352 } from "../../vips/vip-352/bsctestnet";
+import { NEW_RISK_FUND_IMPL, OLD_RISK_FUND_IMPL, PROXY_ADMIN, RISK_FUND, vip357 } from "../../vips/vip-357/bsctestnet";
 import ACCESS_CONTROL_MANAGER_ABI from "./abi/AccessControlManager.json";
 import PROXY_ADMIN_ABI from "./abi/DefaultProxyAdmin.json";
 import RISK_FUND_ABI from "./abi/RiskFundV2.json";
@@ -41,7 +41,7 @@ forking(43116000, async () => {
     });
   });
 
-  testVip("VIP-352", await vip352(), {
+  testVip("VIP-357", await vip357(), {
     callbackAfterExecution: async (txResponse: TransactionResponse) => {
       await expectEvents(txResponse, [ACCESS_CONTROL_MANAGER_ABI], ["RoleGranted"], [5]);
       await expectEvents(txResponse, [TRANSPARENT_PROXY_ABI], ["Upgraded"], [1]);

diff --git a/vips/vip-352/bscmainnet.ts → vips/vip-357/bscmainnet.ts b/vips/vip-352/bscmainnet.ts → vips/vip-357/bscmainnet.ts
@@ -11,10 +11,10 @@ export const LIQUIDATOR_CONTRACT = "0x0870793286aada55d39ce7f82fb2766e8004cf43";
 
 export const EXPLOITER_WALLET = "0x489A8756C18C0b8B24EC2a2b9FF3D4d447F79BEc";
 
-export const vip352 = async () => {
+export const vip357 = async () => {
   const meta = {
     version: "v2",
-    title: "VIP-352",
+    title: "VIP-357",
     description: ``,
     forDescription: "I agree that Venus Protocol should proceed with this proposal",
     againstDescription: "I do not think that Venus Protocol should proceed with this proposal",
@@ -74,4 +74,4 @@ export const vip352 = async () => {
   );
 };
 
-export default vip352;
+export default vip357;
diff --git a/vips/vip-352/bsctestnet.ts → vips/vip-357/bsctestnet.ts b/vips/vip-352/bsctestnet.ts → vips/vip-357/bsctestnet.ts
@@ -9,10 +9,10 @@ export const OLD_RISK_FUND_IMPL = "0xcA2A023FBe3be30b7187E88D7FDE1A9a4358B509";
 export const NEW_RISK_FUND_IMPL = "0x394C9a8cDbbFcAbEAb21fB105311B6B1f09b667a";
 export const LIQUIDATOR_CONTRACT = "0x55AEABa76ecf144031Ef64E222166eb28Cb4865F";
 
-export const vip352 = async () => {
+export const vip357 = async () => {
   const meta = {
     version: "v2",
-    title: "VIP-352",
+    title: "VIP-357",
     description: ``,
     forDescription: "I agree that Venus Protocol should proceed with this proposal",
     againstDescription: "I do not think that Venus Protocol should proceed with this proposal",
@@ -57,4 +57,4 @@ export const vip352 = async () => {
   );
 };
 
-export default vip352;
+export default vip357;