fix: rebased develop branch and resolved conflicts

VenusProtocol · Jun 16, 2023 · cfe4633 · cfe4633
1 parent b24301f
commit cfe4633
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -83,7 +83,7 @@ function isFork() {
           blockNumber: 21068448,
         },
         accounts: {
-          accountsBalance: "1000000000000000000",
+          accountsBalance: "100000000000000000000000",
         },
         live: false,
       }

diff --git a/src/vip-framework/index.ts b/src/vip-framework/index.ts
@@ -8,17 +8,19 @@ import { Proposal } from "../types";
 import { getCalldatas, initMainnetUser, setForkBlock } from "../utils";
 import GOVERNOR_BRAVO_DELEGATE_ABI from "./abi/governorBravoDelegateAbi.json";
 
-let DEFAULT_PROPOSER_ADDRESS = "0x55A9f5374Af30E3045FB491f1da3C2E8a74d168D";
 const DEFAULT_SUPPORTER_ADDRESS = "0xc444949e0054a23c44fc45789738bdf64aed2391";
+let NORMAL_TIMELOCK_DELAY_BLOCKS = 57600;
+const VOTING_PERIOD = 28800;
+
+let DEFAULT_PROPOSER_ADDRESS = "0x55A9f5374Af30E3045FB491f1da3C2E8a74d168D";
 let GOVERNOR_PROXY = "0x2d56dC077072B53571b8252008C60e945108c75a";
 let NORMAL_TIMELOCK = "0x939bD8d64c0A9583A7Dcea9933f7b21697ab6396";
-const NORMAL_TIMELOCK_DELAY = 172800;
-const VOTING_PERIOD = 28800;
 
 if (process.env.FORK_TESTNET === "true") {
   DEFAULT_PROPOSER_ADDRESS = "0x2Ce1d0ffD7E869D9DF33e28552b12DdDed326706";
   GOVERNOR_PROXY = "0x5573422a1a59385c247ec3a66b93b7c08ec2f8f2";
   NORMAL_TIMELOCK = "0xce10739590001705F7FF231611ba4A48B2820327";
+  NORMAL_TIMELOCK_DELAY_BLOCKS = 200;
 }
 
 export const forking = (blockNumber: number, fn: () => void) => {