d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update init frag && dropsV2 testing

Browse Source
This commit is contained in:
owen05
2021-05-26 20:03:32 +08:00
parent ab5e768b86
commit 36885daf49
9 changed files with 214 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/utils/DropsContext.ts
View File

@@ -93,8 +93,8 @@ export class DropsContext {
contracts.DROPS_V2
);
await this.DropsERC721.methods.addMintAccount(this.DropsProxy.options.address).send(this.sendParam(this.Deployer));
await this.DropsERC1155.methods.addMintAccount(this.DropsProxy.options.address).send(this.sendParam(this.Deployer));
await this.DropsERC721.methods.addMintAccount(this.DropsV2.options.address).send(this.sendParam(this.Deployer));
await this.DropsERC1155.methods.addMintAccount(this.DropsV2.options.address).send(this.sendParam(this.Deployer));
await this.DODOApprove.methods.init(this.Deployer, this.DODOApproveProxy.options.address).send(this.sendParam(this.Deployer));
await this.DODOApproveProxy.methods.init(this.Deployer, [this.DropsProxy.options.address]).send(this.sendParam(this.Deployer));

37
test/utils/NFTContext.ts
View File

@@ -185,20 +185,28 @@ export class NFTContext {
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 params = []
if (dvmParams == null) {
dvmParams = [
"0", //lpFeeRate
mweiStr("1"), // I
decimalStr("1") // K
];
params.push("0")
params.push(mweiStr("1"))
params.push(decimalStr("1"))
} else {
params.push(dvmParams[0])
params.push(dvmParams[1])
params.push(dvmParams[2])
}
if (fragParams == null) {
fragParams = [
decimalStr("100000000"), //totalSupply
decimalStr("0.2"), //ownerRatio
Math.floor(new Date().getTime() / 1000 + 60 * 60) //buyoutTimeStamp 1h later
]
params.push(decimalStr("100000000"))
params.push(decimalStr("0.2"))
params.push(Math.floor(new Date().getTime() / 1000 + 60 * 60))
params.push(decimalStr("0"))
} else {
params.push(fragParams[0])
params.push(fragParams[1])
params.push(fragParams[2])
params.push(fragParams[3])
}
if (addrs == null) {
addrs = []
addrs.push(ctx.USDT.options.address);//quoteToken
@@ -206,11 +214,10 @@ export class NFTContext {
}
var callData = ctx.NFTProxy.methods.createFragment(
addrs[0],
addrs[1],
dvmParams,
fragParams,
false
addrs,
params,
false,
"HAHA"
).encodeABI();
await nftVaultInstance.methods.createFragment(