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

support k=0 case and fix test

Browse Source
This commit is contained in:
mingda
2020-12-01 00:02:33 +08:00
parent e5c24453bb
commit 167634cd0c
6 changed files with 149 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/DODOPrivatePool/impl/DPPStorage.sol
View File

@@ -127,7 +127,7 @@ contract DPPStorage is InitializableOwnable, ReentrancyGuard {
function _checkIK() internal view {
uint256 k = _K_.get();
uint256 i = _I_.get();
require(k > 0 && k <= 1e18, "K_OUT_OF_RANGE");
require(k <= 1e18, "K_OUT_OF_RANGE");
require(i > 0 && i <= 1e36, "I_OUT_OF_RANGE");
}
}

4
contracts/DODOVendingMachine/impl/DVM.sol
View File

@@ -38,7 +38,7 @@ contract DVM is DVMTrader, DVMFunding {
require(i > 0 && i <= 10**36);
_I_ = i;
require(k > 0 && k <= 10**18);
require(k <= 10**18);
_K_ = k;
_LP_FEE_RATE_MODEL_ = IFeeRateModel(lpFeeRateModel);
@@ -64,7 +64,7 @@ contract DVM is DVMTrader, DVMFunding {
// keccak256('EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)'),
0x8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f,
keccak256(bytes(name)),
keccak256(bytes('1')),
keccak256(bytes("1")),
chainId,
address(this)
)

2
contracts/DODOVendingMachine/impl/DVMFunding.sol
View File

@@ -75,7 +75,7 @@ contract DVMFunding is DVMVault {
bytes calldata data,
uint256 deadline
) external preventReentrant returns (uint256 baseAmount, uint256 quoteAmount) {
require(deadline >= block.timestamp, "DODOV2 DVMFUNDING: EXPIRED");
require(deadline >= block.timestamp, "TIME_EXPIRED");
require(shareAmount <= _SHARES_[msg.sender], "DLP_NOT_ENOUGH");
uint256 baseBalance = _BASE_TOKEN_.balanceOf(address(this));
uint256 quoteBalance = _QUOTE_TOKEN_.balanceOf(address(this));

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

@@ -55,39 +55,37 @@ describe("AMMLikeCase", () => {
it("basic state", async () => {
console.log(await ctx.DVM.methods.getMidPrice().call())
console.log(await ctx.DVM.methods.getBase0().call())
})
it("buy", async () => {
console.log("BASE0 before buy", await ctx.DVM.methods.getBase0().call())
// buy
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())
// trader balances
assert.equal(
await ctx.BASE.methods.balanceOf(trader).call(),
"11661666666528194443"
"11661666666528194445"
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(trader).call(),
decimalStr("800")
);
// vault balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
"8336666666805277779"
"8336666666805277778"
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
decimalStr("1200")
);
// maintainer balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.Maintainer).call(),
"1666666666527778"
"1666666666527777"
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(),
@@ -97,12 +95,9 @@ describe("AMMLikeCase", () => {
it("sell", async () => {
console.log("BASE0 before sell", await ctx.DVM.methods.getBase0().call())
// sell
await ctx.transferBaseToDVM(trader, decimalStr("1"))
await ctx.DVM.methods.sellBase(trader).send(ctx.sendParam(trader))
console.log("BASE0 after sell", await ctx.DVM.methods.getBase0().call())
// trader balances
assert.equal(
@@ -111,8 +106,9 @@ describe("AMMLikeCase", () => {
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(trader).call(),
"1090636363645427272727"
"1090636363645427272728"
);
// vault balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
@@ -122,6 +118,7 @@ describe("AMMLikeCase", () => {
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
"909272727263654545454"
);
// maintainer balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.Maintainer).call(),
@@ -129,7 +126,7 @@ describe("AMMLikeCase", () => {
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(),
"90909090918181819"
"90909090918181818"
);
});
});

131
test/DVM/ConstPriceCase.test.ts Normal file
View File

@@ -0,0 +1,131 @@
/*
Copyright 2020 DODO ZOO.
SPDX-License-Identifier: Apache-2.0
*/
// import * as assert from 'assert';
import { decimalStr } from '../utils/Converter';
import { DVMContext, getDVMContext } from '../utils/DVMContext';
import { assert } from 'chai';
let lp: string;
let trader: string;
async function init(ctx: DVMContext): Promise<void> {
lp = ctx.SpareAccounts[0];
trader = ctx.SpareAccounts[1];
await ctx.mintTestToken(lp, decimalStr("10"), decimalStr("1000"));
await ctx.mintTestToken(trader, decimalStr("10"), decimalStr("1000"));
await ctx.transferBaseToDVM(lp, decimalStr("10"))
await ctx.transferQuoteToDVM(lp, decimalStr("1000"))
await ctx.DVM.methods.buyShares(lp).send(ctx.sendParam(lp));
}
describe("ConstPriceCase", () => {
let snapshotId: string;
let ctx: DVMContext;
before(async () => {
let AMMLikeDVMContextInitConfig = {
lpFeeRate: decimalStr("0.002"),
mtFeeRate: decimalStr("0.001"),
k: "0",
i: decimalStr("100"),
};
ctx = await getDVMContext(AMMLikeDVMContextInitConfig);
await init(ctx);
});
beforeEach(async () => {
snapshotId = await ctx.EVM.snapshot();
});
afterEach(async () => {
await ctx.EVM.reset(snapshotId);
});
describe("trade", () => {
it("basic state", async () => {
assert.equal(await ctx.DVM.methods.getMidPrice().call(), decimalStr("100"))
})
it("buy", async () => {
// buy
await ctx.transferQuoteToDVM(trader, decimalStr("200"))
await ctx.DVM.methods.sellQuote(trader).send(ctx.sendParam(trader))
// trader balances
assert.equal(
await ctx.BASE.methods.balanceOf(trader).call(),
decimalStr("11.994")
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(trader).call(),
decimalStr("800")
);
// vault balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
decimalStr("8.004")
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
decimalStr("1200")
);
// maintainer balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.Maintainer).call(),
decimalStr("0.002")
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(),
decimalStr("0")
);
});
it("sell", async () => {
// sell
await ctx.transferBaseToDVM(trader, decimalStr("1"))
await ctx.DVM.methods.sellBase(trader).send(ctx.sendParam(trader))
// trader balances
assert.equal(
await ctx.BASE.methods.balanceOf(trader).call(),
decimalStr("9")
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(trader).call(),
decimalStr("1099.7")
);
// vault balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.DVM.options.address).call(),
decimalStr("11")
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.DVM.options.address).call(),
decimalStr("900.2")
);
// maintainer balances
assert.equal(
await ctx.BASE.methods.balanceOf(ctx.Maintainer).call(),
"0"
);
assert.equal(
await ctx.QUOTE.methods.balanceOf(ctx.Maintainer).call(),
decimalStr("0.1")
);
});
});
});

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

@@ -195,6 +195,10 @@ describe("Funding", () => {
ctx.DVM.methods.sellShares(vaultShares, bob, 0, decimalStr("10000"), "0x", MAX_UINT256).send(ctx.sendParam(lp)),
"WITHDRAW_NOT_ENOUGH"
)
await truffleAssert.reverts(
ctx.DVM.methods.sellShares(vaultShares, bob, 0, decimalStr("10000"), "0x", "0").send(ctx.sendParam(lp)),
"TIME_EXPIRED"
)
})
})
});