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

fix dvm test

Browse Source
This commit is contained in:
mingda
2020-11-25 17:16:49 +08:00
parent b96c5e9126
commit 1c92f2e6b4
5 changed files with 75 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/DVM/AMMLikeCase.test.ts
View File

@@ -18,15 +18,13 @@ let trader: string;
async function init(ctx: DVMContext): Promise<void> { async function init(ctx: DVMContext): Promise<void> {
lp = ctx.SpareAccounts[0]; lp = ctx.SpareAccounts[0];
trader = ctx.SpareAccounts[1]; trader = ctx.SpareAccounts[1];
await ctx.approveProxy(lp);
await ctx.approveProxy(trader);
await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000")); await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000"));
await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000")); await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000"));
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("1000")) await ctx.transferQuoteToDVM(lp, decimalStr("1000"))
.send(ctx.sendParam(lp)); await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp));
console.log("deposit") console.log("deposit")
} }
@@ -66,7 +64,8 @@ describe("AMMLikeCase", () => {
console.log("BASE0 before buy", await ctx.DVM.methods.getBase0().call()) console.log("BASE0 before buy", await ctx.DVM.methods.getBase0().call())
// buy // buy
await logGas(ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token") await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await ctx.DVM.methods.sellQuote(trader).send(ctx.sendParam(trader))
console.log("BASE0 after buy", await ctx.DVM.methods.getBase0().call()) console.log("BASE0 after buy", await ctx.DVM.methods.getBase0().call())
// trader balances // trader balances
console.log( console.log(

79
test/DVM/funding.test.ts
View File

@@ -19,8 +19,6 @@ let trader: string;
async function init(ctx: DVMContext): Promise<void> { async function init(ctx: DVMContext): Promise<void> {
lp = ctx.SpareAccounts[0]; lp = ctx.SpareAccounts[0];
trader = ctx.SpareAccounts[1]; trader = ctx.SpareAccounts[1];
await ctx.approveProxy(lp);
await ctx.approveProxy(trader);
await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000")); await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000"));
await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000")); await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000"));
@@ -47,9 +45,8 @@ describe("Funding", () => {
it("buy shares from init states", async () => { it("buy shares from init states", async () => {
await logGas(ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0")) await logGas(ctx.DVM.methods.buyShares(lp), ctx.sendParam(lp), "buy shares");
, ctx.sendParam(lp), "buy shares");
// vault balances // vault balances
assert.equal( assert.equal(
@@ -74,24 +71,27 @@ describe("Funding", () => {
}); });
it("buy shares from init states with quote != 0", async () => { it("buy shares from init states with quote != 0", async () => {
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("100")) await ctx.transferQuoteToDVM(lp, decimalStr("100"))
.send(ctx.sendParam(lp)); await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp));
assert.equal(await ctx.DVM.methods.balanceOf(lp).call(), decimalStr("10")) assert.equal(await ctx.DVM.methods.balanceOf(lp).call(), decimalStr("10"))
assert.equal(await ctx.DVM.methods.getMidPrice().call(), "102078438912577213500") assert.equal(await ctx.DVM.methods.getMidPrice().call(), "102078438912577213500")
}) })
it("buy shares with balanced input", async () => { it("buy shares with balanced input", async () => {
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0")) await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp))
.send(ctx.sendParam(lp));
await ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader)) await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await ctx.DVM.methods.sellQuote(trader).send(ctx.sendParam(trader))
var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call()) var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call())
var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call()) var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call())
var increaseRatio = new BigNumber("0.1") var increaseRatio = new BigNumber("0.1")
await ctx.DVMProxy.methods.depositToDVM(ctx.DVM.options.address, trader, vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0), vaultQuoteBalance.multipliedBy(increaseRatio).toFixed(0)).send(ctx.sendParam(trader)) await ctx.transferBaseToDVM(trader, vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0))
await ctx.transferQuoteToDVM(trader, vaultQuoteBalance.multipliedBy(increaseRatio).toFixed(0))
await ctx.DVM.methods.buyShares(trader).send(ctx.sendParam(trader))
assert.equal( assert.equal(
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(), await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
@@ -99,57 +99,58 @@ describe("Funding", () => {
); );
assert.equal( assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(), await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
"219999999999999999800" "220000000000000000000"
); );
assert.equal(await ctx.DVM.methods.balanceOf(trader).call(), "999999999999999990") assert.equal(await ctx.DVM.methods.balanceOf(trader).call(), "999999999999999990")
}) })
it("buy shares with unbalanced input (less quote)", async () => { it("buy shares with unbalanced input (less quote)", async () => {
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0")) await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp))
.send(ctx.sendParam(lp));
await ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader)) await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await ctx.DVM.methods.sellQuote(trader).send(ctx.sendParam(trader))
var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call()) var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call())
var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call()) var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call())
var increaseRatio = new BigNumber("0.1") var increaseRatio = new BigNumber("0.1")
await ctx.DVMProxy.methods.depositToDVM(
ctx.DVM.options.address, await ctx.transferBaseToDVM(trader, vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0))
trader, await ctx.transferQuoteToDVM(trader, vaultQuoteBalance.multipliedBy(increaseRatio).div(2).toFixed(0))
vaultBaseBalance.multipliedBy(increaseRatio).toFixed(0), await ctx.DVM.methods.buyShares(trader).send(ctx.sendParam(trader))
vaultQuoteBalance.multipliedBy(increaseRatio).div(2).toFixed(0)
).send(ctx.sendParam(trader)) assert.equal(await ctx.DVM.methods.balanceOf(trader).call(), "500000000000000000")
assert.equal(await ctx.DVM.methods.balanceOf(trader).call(), "499999999999999990")
}) })
it("buy shares with unbalanced input (less base)", async () => { it("buy shares with unbalanced input (less base)", async () => {
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0")) await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp))
.send(ctx.sendParam(lp));
await ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send(ctx.sendParam(trader)) await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await ctx.DVM.methods.sellQuote(trader).send(ctx.sendParam(trader))
var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call()) var vaultBaseBalance = new BigNumber(await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call())
var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call()) var vaultQuoteBalance = new BigNumber(await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call())
var increaseRatio = new BigNumber("0.1") var increaseRatio = new BigNumber("0.1")
await ctx.DVMProxy.methods.depositToDVM(
ctx.DVM.options.address, await ctx.transferBaseToDVM(trader, vaultBaseBalance.multipliedBy(increaseRatio).div(2).toFixed(0))
trader, await ctx.transferQuoteToDVM(trader, vaultQuoteBalance.multipliedBy(increaseRatio).toFixed(0))
vaultBaseBalance.multipliedBy(increaseRatio).div(2).toFixed(0), await ctx.DVM.methods.buyShares(trader).send(ctx.sendParam(trader))
vaultQuoteBalance.multipliedBy(increaseRatio).toFixed(0)
).send(ctx.sendParam(trader))
assert.equal(await ctx.DVM.methods.balanceOf(trader).call(), "499999999999999990") assert.equal(await ctx.DVM.methods.balanceOf(trader).call(), "499999999999999990")
}) })
}); });
describe("sell shares", () => { describe("sell shares", () => {
it("sell shares", async () => { it("sell shares", async () => {
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("100")) await ctx.transferQuoteToDVM(lp, decimalStr("100"))
.send(ctx.sendParam(lp)); await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp))
var vaultShares = await ctx.DVM.methods.balanceOf(lp).call() var vaultShares = await ctx.DVM.methods.balanceOf(lp).call()
var bob = ctx.SpareAccounts[5] var bob = ctx.SpareAccounts[5]
await ctx.DVM.methods.sellShares(bob, vaultShares, "0x").send(ctx.sendParam(lp)) await ctx.DVM.methods.sellShares(vaultShares, bob, "0x").send(ctx.sendParam(lp))
assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("10")) assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("10"))
assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), decimalStr("100")) assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), decimalStr("100"))
}) })

20
test/DVM/trader.test.ts
View File

@@ -20,15 +20,12 @@ let trader: string;
async function init(ctx: DVMContext): Promise<void> { async function init(ctx: DVMContext): Promise<void> {
lp = ctx.SpareAccounts[0]; lp = ctx.SpareAccounts[0];
trader = ctx.SpareAccounts[1]; trader = ctx.SpareAccounts[1];
await ctx.approveProxy(lp);
await ctx.approveProxy(trader);
await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000")); await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000"));
await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000")); await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000"));
await ctx.DVMProxy.methods await ctx.transferBaseToDVM(lp, decimalStr("10"))
.depositToDVM(ctx.DVM.options.address, lp, decimalStr("10"), decimalStr("0")) await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp))
.send(ctx.sendParam(lp));
console.log("deposit") console.log("deposit")
} }
@@ -74,7 +71,8 @@ describe("Trader", () => {
console.log("BASE0 before buy", await ctx.DVM.methods.getBase0().call()) console.log("BASE0 before buy", await ctx.DVM.methods.getBase0().call())
// buy // buy
await logGas(ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token") await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await logGas(ctx.DVM.methods.sellQuote(trader), ctx.sendParam(trader), "buy base token")
console.log("BASE0 after buy", await ctx.DVM.methods.getBase0().call()) console.log("BASE0 after buy", await ctx.DVM.methods.getBase0().call())
// trader balances // trader balances
assert.equal( assert.equal(
@@ -105,7 +103,8 @@ describe("Trader", () => {
); );
// sell // sell
await logGas(ctx.DVMProxy.methods.sellBaseOnDVM(ctx.DVM.options.address, trader, decimalStr("1"), decimalStr("100")), ctx.sendParam(trader), "sell base token") await ctx.transferBaseToDVM(trader, decimalStr("1"))
await logGas(ctx.DVM.methods.sellBase(trader), ctx.sendParam(trader), "sell base token")
console.log("BASE0 after sell", await ctx.DVM.methods.getBase0().call()) console.log("BASE0 after sell", await ctx.DVM.methods.getBase0().call())
// trader balances // trader balances
assert.equal( assert.equal(
@@ -136,7 +135,8 @@ describe("Trader", () => {
); );
// buy when quoet is not 0 // buy when quoet is not 0
await logGas(ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")), ctx.sendParam(trader), "buy base token") await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await logGas(ctx.DVM.methods.sellQuote(trader), ctx.sendParam(trader), "buy base token")
console.log("BASE0 after second buy", await ctx.DVM.methods.getBase0().call()) console.log("BASE0 after second buy", await ctx.DVM.methods.getBase0().call())
// trader balances // trader balances
assert.equal( assert.equal(
@@ -171,13 +171,13 @@ describe("Trader", () => {
}) })
it.only("revert cases", async () => { it("revert cases", async () => {
var gasPriceLimitContract = getContractWithAddress(EXTERNAL_VALUE_NAME, await ctx.DVM.methods._GAS_PRICE_LIMIT_().call()) var gasPriceLimitContract = getContractWithAddress(EXTERNAL_VALUE_NAME, await ctx.DVM.methods._GAS_PRICE_LIMIT_().call())
await gasPriceLimitContract.methods.set(gweiStr("10")).send(ctx.sendParam(ctx.Deployer)) await gasPriceLimitContract.methods.set(gweiStr("10")).send(ctx.sendParam(ctx.Deployer))
await truffleAssert.reverts( await truffleAssert.reverts(
ctx.DVMProxy.methods.sellQuoteOnDVM(ctx.DVM.options.address, trader, decimalStr("200"), decimalStr("1")).send({ from: trader, gas: 300000, gasPrice: gweiStr("200") }), "GAS_PRICE_EXCEED" ctx.DVM.methods.sellQuote(trader).send({ from: trader, gas: 300000, gasPrice: gweiStr("200") }), "GAS_PRICE_EXCEED"
) )
}) })
}); });

2
test/utils/Converter.ts
View File

@@ -12,4 +12,4 @@ export function gweiStr(gwei: string): string {
export function mweiStr(gwei: string): string { export function mweiStr(gwei: string): string {
return new BigNumber(gwei).multipliedBy(10 ** 6).toFixed(0, BigNumber.ROUND_DOWN) return new BigNumber(gwei).multipliedBy(10 ** 6).toFixed(0, BigNumber.ROUND_DOWN)
}s }

50
test/utils/DVMContext.ts
View File

@@ -49,8 +49,6 @@ export let DefaultDVMContextInitConfig = {
export class DVMContext { export class DVMContext {
EVM: EVM; EVM: EVM;
Web3: Web3; Web3: Web3;
DVMProxy: Contract;
DVMFactory: Contract;
DVM: Contract; DVM: Contract;
BASE: Contract; BASE: Contract;
QUOTE: Contract; QUOTE: Contract;
@@ -63,24 +61,13 @@ export class DVMContext {
async init(config: DVMContextInitConfig) { async init(config: DVMContextInitConfig) {
this.EVM = new EVM(); this.EVM = new EVM();
this.Web3 = getDefaultWeb3(); this.Web3 = getDefaultWeb3();
this.DVMProxy = await contracts.newContract(contracts.DVM_PROXY_NAME)
var cloneFactory = await contracts.newContract( this.DVM = await contracts.newContract(contracts.DVM_NAME)
contracts.CLONE_FACTORY_CONTRACT_NAME var lpFeeRateModel = await contracts.newContract(contracts.CONST_FEE_RATE_MODEL_NAME)
); var mtFeeRateModel = await contracts.newContract(contracts.CONST_FEE_RATE_MODEL_NAME)
var dvmTemplate = await contracts.newContract(contracts.DVM_NAME) var permissionManager = await contracts.newContract(contracts.PERMISSION_MANAGER_NAME)
var feeRateModelTemplate = await contracts.newContract(contracts.CONST_FEE_RATE_MODEL_NAME)
var permissionManagerTemplate = await contracts.newContract(contracts.PERMISSION_MANAGER_NAME)
var gasPriceSource = await contracts.newContract(contracts.EXTERNAL_VALUE_NAME) var gasPriceSource = await contracts.newContract(contracts.EXTERNAL_VALUE_NAME)
this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
[cloneFactory.options.address,
dvmTemplate.options.address,
feeRateModelTemplate.options.address,
permissionManagerTemplate.options.address,
gasPriceSource.options.address,
])
this.BASE = await contracts.newContract( this.BASE = await contracts.newContract(
contracts.MINTABLE_ERC20_CONTRACT_NAME, contracts.MINTABLE_ERC20_CONTRACT_NAME,
["TestBase", "BASE", 18] ["TestBase", "BASE", 18]
@@ -95,21 +82,23 @@ export class DVMContext {
this.Maintainer = allAccounts[1]; this.Maintainer = allAccounts[1];
this.SpareAccounts = allAccounts.slice(2, 10); this.SpareAccounts = allAccounts.slice(2, 10);
await this.DVMFactory.methods.createStandardDODOVendingMachine( await this.DVM.methods.init(
this.Deployer,
this.Maintainer,
this.BASE.options.address, this.BASE.options.address,
this.QUOTE.options.address, this.QUOTE.options.address,
config.lpFeeRate, lpFeeRateModel.options.address,
config.mtFeeRate, mtFeeRateModel.options.address,
permissionManager.options.address,
gasPriceSource.options.address,
config.i, config.i,
config.k config.k
).send(this.sendParam(this.Deployer)) ).send(this.sendParam(this.Deployer))
var vendingMachines = await this.DVMFactory.methods.getVendingMachine(this.BASE.options.address, this.QUOTE.options.address).call()
this.DVM = contracts.getContractWithAddress(contracts.DVM_NAME, vendingMachines[0])
await this.DVM.methods.setMaintainer(this.Maintainer).send(this.sendParam(this.Deployer))
await gasPriceSource.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer)) await gasPriceSource.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer))
await gasPriceSource.methods.set(MAX_UINT256).send(this.sendParam(this.Deployer)) await gasPriceSource.methods.set(MAX_UINT256).send(this.sendParam(this.Deployer))
await lpFeeRateModel.methods.init(this.Deployer, config.lpFeeRate).send(this.sendParam(this.Deployer))
await mtFeeRateModel.methods.init(this.Deployer, config.mtFeeRate).send(this.sendParam(this.Deployer))
console.log(log.blueText("[Init DVM context]")); console.log(log.blueText("[Init DVM context]"));
} }
@@ -130,13 +119,12 @@ export class DVMContext {
.send(this.sendParam(this.Deployer)); .send(this.sendParam(this.Deployer));
} }
async approveProxy(account: string) { async transferBaseToDVM(account: string, amount: string) {
await this.BASE.methods await this.BASE.methods.transfer(this.DVM.options.address, amount).send(this.sendParam(account))
.approve(this.DVMProxy.options.address, MAX_UINT256) }
.send(this.sendParam(account));
await this.QUOTE.methods async transferQuoteToDVM(account: string, amount: string) {
.approve(this.DVMProxy.options.address, MAX_UINT256) await this.QUOTE.methods.transfer(this.DVM.options.address, amount).send(this.sendParam(account))
.send(this.sendParam(account));
} }
} }