Post merge fixes

mstable · Mar 10, 2021 · 6a96562 · 6a96562
1 parent 9f6561d
commit 6a96562
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/contracts/z_mocks/masset/migrate3/MusdV3UpgradeDyDx.sol b/contracts/z_mocks/masset/migrate3/MusdV3UpgradeDyDx.sol
@@ -12,7 +12,7 @@ import { Basket, Basset } from "./MassetStructsV2.sol";
 import { IMassetV2 } from "./IMassetV2.sol";
 
 import { DyDxFlashLoan } from "./dydx/DyDxFlashLoan.sol";
-import { MusdV3 } from "./MusdV3.sol";
+import { MusdV3 } from "../../../masset/mUSD/MusdV3.sol";
 
 contract MusdV3UpgradeDyDx is DyDxFlashLoan {
 

diff --git a/hardhat-fork.config.ts b/hardhat-fork.config.ts
@@ -9,7 +9,7 @@ export default {
             blockGasLimit: 9000000,
             forking: {
                 url: process.env.NODE_URL || "",
-                blockNumber: 11880000,
+                blockNumber: 12000000,
             },
         },
     },

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -21,12 +21,7 @@ import "tsconfig-paths/register"
 export const hardhatConfig = {
     networks: {
         hardhat: {
-            allowUnlimitedContractSize: false,
-            blockGasLimit: 9000000,
-            forking: {
-                url: process.env.NODE_URL || "",
-                blockNumber: 12000000,
-            },
+            allowUnlimitedContractSize: true,
         },
         localhost: { url: "http://localhost:8545" },
         fork: {