Skip to content

Commit

Permalink
fix: renamed diamond comptroller vip files and folders
Browse files Browse the repository at this point in the history
  • Loading branch information
Debugger022 committed Sep 25, 2023
1 parent 2c2f244 commit 2c719fb
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 25 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ethers } from "hardhat";

import { initMainnetUser } from "../../../src/utils";
import { forking, pretendExecutingVip, testVip } from "../../../src/vip-framework";
import { vipDiamondTestnet } from "../../../vips/vip-diamond-comptroller/vip-Diamond-comptroller-testnet";
import { vip174Testnet } from "../../../vips/vip-174/vip-174-testnet";
import Comptroller from "../abi/Comptroller.json";
import IERC20Upgradeable from "../abi/IERC20UpgradableAbi.json";
import VBEP20_DELEGATE_ABI from "../abi/VBep20DelegateAbi.json";
Expand Down Expand Up @@ -178,7 +178,7 @@ forking(33497000, async () => {
});
});

testVip("VIP-Diamond Contract Migration", vipDiamondTestnet());
testVip("VIP-Diamond Contract Migration", vip174Testnet());

describe("Verify Storage slots after VIP execution", async () => {
// These tests checks the storage collision of comptroller while updating it via diamond.
Expand Down Expand Up @@ -363,7 +363,7 @@ forking(33497000, async () => {
let diamondUnitroller: Contract;

before(async () => {
await pretendExecutingVip(vipDiamondTestnet());
await pretendExecutingVip(vip174Testnet());
unitroller = new ethers.Contract(UNITROLLER, Comptroller, ethers.provider);

diamondUnitroller = new ethers.Contract(unitroller.address, Comptroller, ethers.provider);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ethers } from "hardhat";

import { initMainnetUser } from "../../../src/utils";
import { forking, pretendExecutingVip, testVip } from "../../../src/vip-framework";
import { vipDiamondComptroller } from "../../../vips/vip-diamond-comptroller/vip-Diamond-comptroller";
import { vip174 } from "../../../vips/vip-174/vip-174";
import Comptroller from "../abi/Comptroller.json";
import IERC20Upgradeable from "../abi/IERC20UpgradableAbi.json";
import VBEP20_DELEGATE_ABI from "../abi/VBep20DelegateAbi.json";
Expand Down Expand Up @@ -178,7 +178,7 @@ forking(31933620, async () => {
});
});

testVip("VIP-Diamond Contract Migration", vipDiamondComptroller());
testVip("VIP-Diamond Contract Migration", vip174());

describe("Verify Storage slots after VIP execution", async () => {
// These tests checks the storage collision of comptroller while updating it via diamond.
Expand Down Expand Up @@ -363,7 +363,7 @@ forking(31933620, async () => {
let diamondUnitroller: Contract;

before(async () => {
await pretendExecutingVip(vipDiamondComptroller());
await pretendExecutingVip(vip174());
unitroller = new ethers.Contract(UNITROLLER, Comptroller, ethers.provider);

diamondUnitroller = new ethers.Contract(unitroller.address, Comptroller, ethers.provider);
Expand Down
33 changes: 18 additions & 15 deletions src/transactions.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
import { ethers } from "hardhat";

import { getCalldatas } from "./utils";
import GOVERNOR_BRAVO_DELEGATE_ABI from "./vip-framework/abi/governorBravoDelegateAbi.json";

const DEFAULT_GOVERNOR_PROXY = "0x2d56dC077072B53571b8252008C60e945108c75a";
const DEFAULT_GOVERNOR_PROXY = "0x5573422A1a59385C247ec3a66B93B7C08eC2f8f2";

export const loadProposal = async (num: string) => {
const x = await import(`../vips/vip-${num}.ts`);
return x[`vip${num}`]();
const x = await import("../vips/vip-174/vip-174-testnet");
console.log("----------------------------XXX", x);
return x["vip174Testnet"]();
};

export const proposeVIP = async (vipNumber: string, governorProxyAddress?: string) => {
export const proposeVIP = async (vipNumber: string) => {
const proposal = await loadProposal(vipNumber);
console.log("----------------------------proposal", proposal);

const { targets, signatures, values, meta } = proposal;
const [proposer] = await ethers.getSigners();
const governorProxy = await ethers.getContractAt(GOVERNOR_BRAVO_DELEGATE_ABI, DEFAULT_GOVERNOR_PROXY);

const params = [targets, values, signatures, getCalldatas(proposal), JSON.stringify(meta), proposal.type];
let functionSignature = "function propose(address[],uint256[],string[],bytes[],string,uint8)";
const { targets, signatures, values, meta } = proposal;

if (proposal.type === undefined || proposal.type === null) {
functionSignature = "function propose(address[],uint256[],string[],bytes[],string)";
params.pop();
}
await governorProxy
.connect(proposer)
.propose(targets, values, signatures, getCalldatas(proposal), JSON.stringify(meta), proposal.type);

return {
target: governorProxyAddress ?? DEFAULT_GOVERNOR_PROXY,
calldata: new ethers.utils.Interface([functionSignature]).encodeFunctionData("propose", params),
};
// await governorProxy
// .connect(proposer)
// .castVote(296, 1);
};

proposeVIP(130);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cutParams as params } from "../../simulations/vip-diamond-comptroller/vip-diamond-comptroller-testnet/utils/cut-params-testnet.json";
import { cutParams as params } from "../../simulations/vip-174/vip-174-testnet/utils/cut-params.json";
import { ProposalType } from "../../src/types";
import { makeProposal } from "../../src/utils";

Expand Down Expand Up @@ -35,7 +35,7 @@ const grantAccessControl = () => {
return accessProposals;
};

export const vipDiamondTestnet = () => {
export const vip174Testnet = () => {
const meta = {
version: "v1",
title: "VIP Comptroller Diamond proxy",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { cutParams as params } from "../../simulations/vip-diamond-comptroller/vip-diamond-comptroller/utils/cut-params.json";
import { cutParams as params } from "../../simulations/vip-174/vip-174/utils/cut-params.json";
import { ProposalType } from "../../src/types";
import { makeProposal } from "../../src/utils";

Expand Down Expand Up @@ -35,7 +35,7 @@ const grantAccessControl = () => {
return accessProposals;
};

export const vipDiamondComptroller = () => {
export const vip174 = () => {
const meta = {
version: "v1",
title: "VIP Comptroller Diamond proxy",
Expand Down

0 comments on commit 2c719fb

Please sign in to comment.