diff --git a/deploy/97_DEXEDAOMultiplier.migration.js b/deploy/97_DEXEDAOMultiplier.migration.js index 7d243885..ebcdaee6 100644 --- a/deploy/97_DEXEDAOMultiplier.migration.js +++ b/deploy/97_DEXEDAOMultiplier.migration.js @@ -1,14 +1,14 @@ const { Reporter } = require("@solarity/hardhat-migrate"); -const config = require("./config/utils.js").getConfig(); const ERC1967Proxy = artifacts.require("ERC1967Proxy"); -const DexeMultiplier = artifacts.require("DexeERC721Multiplier.sol"); +const DexeMultiplier = artifacts.require("DexeERC721Multiplier"); module.exports = async (deployer) => { - let dexeMultiplier = await deployer.deploy(DexeMiltiplier); + let dexeMultiplier = await deployer.deploy(DexeMultiplier); await deployer.deploy(ERC1967Proxy, [dexeMultiplier.address, "0x"], { name: "multiplierProxy" }); - dexeMultiplier = await deployer.deployed(DexeMiltiplier, "multiplierProxy"); + dexeMultiplier = await deployer.deployed(DexeMultiplier, "multiplierProxy"); + await dexeMultiplier.__ERC721Multiplier_init("DeXe Multiplier NFT", "DEXE MULTNFT"); await dexeMultiplier.transferOwnership(deployer.dexeDaoAddress); diff --git a/test/gov/ERC721/DexeERC721Multiplier.test.js b/test/gov/ERC721/DexeERC721Multiplier.test.js index 504ae9a5..938caf46 100644 --- a/test/gov/ERC721/DexeERC721Multiplier.test.js +++ b/test/gov/ERC721/DexeERC721Multiplier.test.js @@ -5,6 +5,7 @@ const { PRECISION } = require("../../../scripts/utils/constants"); const Reverter = require("../../helpers/reverter"); const truffleAssert = require("truffle-assertions"); +const Proxy = artifacts.require("ERC1967Proxy"); const DexeERC721Multiplier = artifacts.require("DexeERC721MultiplierMock"); const GovPoolMock = artifacts.require("GovPoolMock"); @@ -61,9 +62,9 @@ describe("DexeERC721Multiplier", () => { describe("upgradeability", () => { beforeEach(async () => { - const Proxy = artifacts.require("ERC1967Proxy"); const proxy = await Proxy.new(nft.address, "0x"); dexeNft = await DexeERC721Multiplier.at(proxy.address); + dexeNft.__ERC721Multiplier_init(NFT_NAME, NFT_SYMBOL); }); @@ -78,6 +79,7 @@ describe("DexeERC721Multiplier", () => { it("could upgrade", async () => { const nft1 = await DexeERC721Multiplier.new(); await dexeNft.upgradeTo(nft1.address); + assert.equal(await dexeNft.getImplementation(), nft1.address); }); });