diff --git a/config/kovan-config.js b/config/kovan-config.js index faf3e37..d334618 100644 --- a/config/kovan-config.js +++ b/config/kovan-config.js @@ -77,7 +77,7 @@ module.exports = { //================= MysteryBox ================= - MysteryBoxV1: "", + MysteryBoxV1: "0x45136c2455Dd2631E31ab884cf167eC618CCf39a", RandomGenerator: "0x53F54E4760FA5f839e5624782D032495613DF218", RandomPool: [ "0xa2e0ef85618732d80e5ef362773da1c92e8b1c57", diff --git a/deploy-nft.txt b/deploy-nft.txt index de30ebd..5d5e5e3 100644 --- a/deploy-nft.txt +++ b/deploy-nft.txt @@ -198,3 +198,9 @@ Init DODONFTProxyAddress Tx: 0x96a1a4b9f8cdf4f6c56a2aa8298f2def0f7b87c493f172268 DODOApproveProxy unlockAddProxy tx: 0x8ef2e4693a45af5fd1fcdf9f5d8e544331148ddcf1551250244599430a0524a0 DODOApproveProxy addDODOProxy tx: 0x275aa8ec28849aa7e0b2c9b18eb3877797d027713be5f92764da8cf55f6d5eca Add AdminList on DODONFTRegistry Tx: 0x4cc991762645beb448c3315369452d4af2e02b507b97d3638ba876d30b46d2f4 +==================================================== +network type: kovan +Deploy time: 2021/4/16 下午1:41:43 +Deploy type: MysteryBoxV1 +MysteryBoxV1Address: 0x45136c2455Dd2631E31ab884cf167eC618CCf39a +Init MysteryBoxV1 Tx: 0xa8c1a3700aa806f234566ee4948f9e8c5ce31ded4d35dbb33821b14dda0d9379 diff --git a/test/DODONFT/nftMainFlow.test.ts b/test/DODONFT/nftMainFlow.test.ts index d42b6d6..48fbfe6 100644 --- a/test/DODONFT/nftMainFlow.test.ts +++ b/test/DODONFT/nftMainFlow.test.ts @@ -143,17 +143,17 @@ describe("DODONFT", () => { assert(nftInfo.tokenId, '0') }); - it("createFragment", async () => { + it.only("createFragment", async () => { var erc721Address = await ctx.createERC721(ctx, author); var vaultAddress = await ctx.createNFTVault(ctx, author); var nftVaultInstance = contracts.getContractWithAddress(contracts.NFT_VAULT, vaultAddress); var erc721Instance = contracts.getContractWithAddress(contracts.ERC721, erc721Address); await erc721Instance.methods.safeTransferFrom(author, vaultAddress, 0).send(ctx.sendParam(author)); - // var quoteToken = "0x156595bAF85D5C29E91d959889B022d952190A64"; - // var vaultPreOwner = "0x7e83d9d94837eE82F0cc18a691da6f42F03F1d86"; - var quoteToken = ctx.USDT.options.address; - var vaultPreOwner = author; + var quoteToken = "0x156595bAF85D5C29E91d959889B022d952190A64"; + var vaultPreOwner = "0x7e83d9d94837eE82F0cc18a691da6f42F03F1d86"; + // var quoteToken = ctx.USDT.options.address; + // var vaultPreOwner = author; var stakeToken = "0x0000000000000000000000000000000000000000"; @@ -180,18 +180,18 @@ describe("DODONFT", () => { ).encodeABI(); console.log("data:", callData); - await logGas(await nftVaultInstance.methods.createFragment( - ctx.NFTProxy.options.address, - callData - ), ctx.sendParam(author), "createFragment"); + // await logGas(await nftVaultInstance.methods.createFragment( + // ctx.NFTProxy.options.address, + // callData + // ), ctx.sendParam(author), "createFragment"); - let [fragAddress, , dvmAddress] = await ctx.getRegistry(ctx, vaultAddress); + // let [fragAddress, , dvmAddress] = await ctx.getRegistry(ctx, vaultAddress); - var dvmInstance = contracts.getContractWithAddress(contracts.DVM_NAME, dvmAddress); - var midPrice = await dvmInstance.methods.getMidPrice().call(); - assert(midPrice, mweiStr("1")); - let newVaultOwner = await nftVaultInstance.methods._OWNER_().call(); - assert(fragAddress, newVaultOwner); + // var dvmInstance = contracts.getContractWithAddress(contracts.DVM_NAME, dvmAddress); + // var midPrice = await dvmInstance.methods.getMidPrice().call(); + // assert(midPrice, mweiStr("1")); + // let newVaultOwner = await nftVaultInstance.methods._OWNER_().call(); + // assert(fragAddress, newVaultOwner); }); it("stakeToFeeDistributor", async () => {