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

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));