diff --git a/hardhat-fork.config.ts b/hardhat-fork.config.ts index 22f62056..24f883fb 100644 --- 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: 12093567, + blockNumber: 12094042, }, }, }, diff --git a/test-fork/mUSD/mUSD-migrate.spec.ts b/test-fork/mUSD/mUSD-migrate.spec.ts index e79598dd..4d640a65 100644 --- a/test-fork/mUSD/mUSD-migrate.spec.ts +++ b/test-fork/mUSD/mUSD-migrate.spec.ts @@ -219,7 +219,7 @@ const getMusdv3 = async (deployer: Signer): Promise => { } // Test mUSD token storage variables -const validateTokenStorage = async (token: MusdV3 | Masset | Contract, overrideSupply = "42900877457048217549692510") => { +const validateTokenStorage = async (token: MusdV3 | Masset | Contract, overrideSupply = "42495582693426128850845316") => { expect(await token.symbol(), "symbol").to.eq("mUSD") expect(await token.name(), "name").to.eq("mStable USD") expect(await token.decimals(), "decimals").to.eq(18) @@ -411,22 +411,8 @@ describe("mUSD V2.0 to V3.0", () => { basketManager = basketManagerFactory.attach(basketManagerAddress) }) // TODO - exec IRL then remove - it("collects interest one last time", async () => { - await savingsManager.collectAndStreamInterest(mUsdV2.address) - }) - // TODO - exec IRL then remove - it("cleans up TUSD", async () => { - const tusdBalBefore = (await basketManager.getBasset(TUSD.address)).vaultBalance - console.log("REMAINING TUSD before USDC->TUSD: ", formatUnits(tusdBalBefore)) - - await balanceBasset(mUsdV2, USDC, tusdBalBefore.div(2e12), TUSD) - const tusdBalMiddle = (await basketManager.getBasset(TUSD.address)).vaultBalance - console.log("REMAINING TUSD before DAI->TUSD: ", formatUnits(tusdBalMiddle)) - await balanceBasset(mUsdV2, DAI, tusdBalMiddle, TUSD) - - const tusdBalAfter = (await basketManager.getBasset(TUSD.address)).vaultBalance - console.log("REMAINING TUSD after DAI->TUSD: ", formatUnits(tusdBalAfter)) - expect(tusdBalAfter).to.eq(0) + it("removes TUSD from the basket", async () => { + await basketManager.removeBasset(TUSD.address) }) // TODO - exec IRL then remove it("pauses BasketManager and SavingsManager", async () => { @@ -440,12 +426,8 @@ describe("mUSD V2.0 to V3.0", () => { await expect(mUsdV2.mint(intermediaryBassets[0].address, simpleToExactAmount(1))).to.be.revertedWith("Pausable: paused") await expect(savingsManager.collectAndStreamInterest(mUsdV2.address)).to.be.revertedWith("Pausable: paused") }) - // TODO - exec IRL then remove - it("removes TUSD from the basket", async () => { - await basketManager.removeBasset(TUSD.address) - }) it("should have valid storage before upgrade", async () => { - await validateTokenStorage(mUsdV2, "42900877457048217549692510") + await validateTokenStorage(mUsdV2) await validateUnchangedMassetStorage(mUsdV2, "1") // bAsset personal data // Get new vault balances after the bAssets have been balanced @@ -478,7 +460,7 @@ describe("mUSD V2.0 to V3.0", () => { }) it("Should have proper storage", async () => { // validate after the upgrade - await validateTokenStorage(mUsdV3.proxy, "42900877457048217549692510") + await validateTokenStorage(mUsdV3.proxy) await validateUnchangedMassetStorage(mUsdV3.proxy, "1") await validateNewMassetStorage(mUsdV3.proxy, validatorAddress, balancedVaultBalances) })