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

Merge pull request #41 from DODOEX/initial-quote-target-is-zero

Browse Source 
fix-initial-quote-target-is-zero
This commit is contained in:
Skyewwww
2024-02-18 16:50:32 +08:00
committed by GitHub
parent e92394edf3 2aa9336584
commit 3adad6b603
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ contract DVMFunding is DVMVault {
if (totalSupply == 0) { if (totalSupply == 0) {
// case 1. initial supply // case 1. initial supply
shares = baseBalance; // 以免出现balance很大但shares很小的情况 shares = baseBalance; // 以免出现balance很大但shares很小的情况
require(_QUOTE_TARGET_ > 0, "QUOTE_TARGET_IS_ZERO");
require(shares > 2001, "MINT_AMOUNT_NOT_ENOUGH"); require(shares > 2001, "MINT_AMOUNT_NOT_ENOUGH");
_mint(address(0), 1001); _mint(address(0), 1001);
shares -= 1001; shares -= 1001;

23
test/DSP/funding.test.ts
View File

@@ -46,6 +46,12 @@ describe("Funding", () => {
it("revert cases", async () => { it("revert cases", async () => {
await ctx.transferBaseToDSP(lp, decimalStr("10")) await ctx.transferBaseToDSP(lp, decimalStr("10"))
await truffleAssert.reverts(
ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp)),
"ZERO_QUOTE_AMOUNT"
)
await ctx.transferBaseToDSP(lp, "100")
await ctx.transferQuoteToDSP(lp, "100")
await truffleAssert.reverts( await truffleAssert.reverts(
ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp)), ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp)),
"MINT_AMOUNT_NOT_ENOUGH" "MINT_AMOUNT_NOT_ENOUGH"
@@ -56,7 +62,7 @@ describe("Funding", () => {
await ctx.transferBaseToDSP(lp, decimalStr("100")) await ctx.transferBaseToDSP(lp, decimalStr("100"))
await ctx.transferQuoteToDSP(lp, decimalStr("100")) await ctx.transferQuoteToDSP(lp, decimalStr("100"))
await ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp)); await ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp));
assert.equal(await ctx.DSP.methods.balanceOf(lp).call(), decimalStr("100")) assert.equal(await ctx.DSP.methods.balanceOf(lp).call(), "99999999999999998999")
assert.equal(await ctx.DSP.methods.getMidPrice().call(), decimalStr("1")) assert.equal(await ctx.DSP.methods.getMidPrice().call(), decimalStr("1"))
}) })
@@ -129,19 +135,20 @@ describe("Funding", () => {
describe("sell shares", () => { describe("sell shares", () => {
it("not the last one sell shares", async () => { it("not the last one sell shares", async () => {
await ctx.transferBaseToDSP(lp, decimalStr("100"))
await ctx.transferQuoteToDSP(lp, decimalStr("100"))
await ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp))
await ctx.transferBaseToDSP(trader, decimalStr("10")) await ctx.transferBaseToDSP(trader, decimalStr("10"))
await ctx.transferQuoteToDSP(trader, decimalStr("10")) await ctx.transferQuoteToDSP(trader, decimalStr("10"))
await ctx.DSP.methods.buyShares(trader).send(ctx.sendParam(trader)) await ctx.DSP.methods.buyShares(trader).send(ctx.sendParam(trader))
await ctx.transferBaseToDSP(lp, decimalStr("100"))
await ctx.transferQuoteToDSP(lp, decimalStr("100"))
await ctx.DSP.methods.buyShares(lp).send(ctx.sendParam(lp))
var vaultShares = new BigNumber(await ctx.DSP.methods.balanceOf(lp).call()) var vaultShares = new BigNumber(await ctx.DSP.methods.balanceOf(lp).call())
var bob = ctx.SpareAccounts[5] var bob = ctx.SpareAccounts[5]
await ctx.DSP.methods.sellShares(vaultShares.div(2).toFixed(0), bob, 0, 0, "0x", MAX_UINT256).send(ctx.sendParam(lp)) await ctx.DSP.methods.sellShares(vaultShares.div(2).toFixed(0), bob, 0, 0, "0x", MAX_UINT256).send(ctx.sendParam(lp))
assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("50")) assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), "50000000000000000000")
assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), decimalStr("50")) assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), "50000000000000000000")
await ctx.DSP.methods.sellShares(vaultShares.div(2).toFixed(0), bob, 0, 0, "0x", MAX_UINT256).send(ctx.sendParam(lp)) await ctx.DSP.methods.sellShares(vaultShares.div(2).toFixed(0), bob, 0, 0, "0x", MAX_UINT256).send(ctx.sendParam(lp))
assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("100")) assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("100"))
@@ -156,8 +163,8 @@ describe("Funding", () => {
var vaultShares = await ctx.DSP.methods.balanceOf(lp).call() var vaultShares = await ctx.DSP.methods.balanceOf(lp).call()
var bob = ctx.SpareAccounts[5] var bob = ctx.SpareAccounts[5]
await ctx.DSP.methods.sellShares(vaultShares, bob, 0, 0, "0x", MAX_UINT256).send(ctx.sendParam(lp)) await ctx.DSP.methods.sellShares(vaultShares, bob, 0, 0, "0x", MAX_UINT256).send(ctx.sendParam(lp))
assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), decimalStr("100")) assert.equal(await ctx.BASE.methods.balanceOf(bob).call(), "99999999999999998999")
assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), decimalStr("100")) assert.equal(await ctx.QUOTE.methods.balanceOf(bob).call(), "99999999999999998999")
}) })
it("revert cases", async () => { it("revert cases", async () => {