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

第二遍走查 snapshot2

Browse Source
This commit is contained in:
mingda
2020-11-29 23:51:58 +08:00
parent d90e031a30
commit 271bd7b907
4 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/DODOVendingMachine/impl/DVMTrader.sol
View File

@@ -20,7 +20,7 @@ contract DVMTrader is DVMVault {
// ============ Events ============
event DVMSwap(
event DODOSwap(
address indexed fromToken,
address indexed toToken,
uint256 fromAmount,
@@ -60,10 +60,12 @@ contract DVMTrader is DVMVault {
uint256 baseInput = getBaseInput();
uint256 mtFee;
(receiveQuoteAmount, mtFee) = querySellBase(tx.origin, baseInput);
_transferQuoteOut(to, receiveQuoteAmount);
_transferQuoteOut(_MAINTAINER_, mtFee);
_sync();
emit DVMSwap(
emit DODOSwap(
address(_BASE_TOKEN_),
address(_QUOTE_TOKEN_),
baseInput,
@@ -82,10 +84,12 @@ contract DVMTrader is DVMVault {
uint256 quoteInput = getQuoteInput();
uint256 mtFee;
(receiveBaseAmount, mtFee) = querySellQuote(tx.origin, quoteInput);
_transferBaseOut(to, receiveBaseAmount);
_transferBaseOut(_MAINTAINER_, mtFee);
_sync();
emit DVMSwap(
emit DODOSwap(
address(_QUOTE_TOKEN_),
address(_BASE_TOKEN_),
quoteInput,
@@ -120,8 +124,9 @@ contract DVMTrader is DVMVault {
uint256 quoteInput = quoteBalance.sub(_QUOTE_RESERVE_);
(uint256 receiveBaseAmount, uint256 mtFee) = querySellQuote(tx.origin, quoteInput);
require(_BASE_RESERVE_.sub(baseBalance) <= receiveBaseAmount, "FLASH_LOAN_FAILED");
_transferBaseOut(_MAINTAINER_, mtFee);
emit DVMSwap(
emit DODOSwap(
address(_QUOTE_TOKEN_),
address(_BASE_TOKEN_),
quoteInput,
@@ -135,8 +140,9 @@ contract DVMTrader is DVMVault {
uint256 baseInput = baseBalance.sub(_BASE_RESERVE_);
(uint256 receiveQuoteAmount, uint256 mtFee) = querySellBase(tx.origin, baseInput);
require(_QUOTE_RESERVE_.sub(quoteBalance) <= receiveQuoteAmount, "FLASH_LOAN_FAILED");
_transferQuoteOut(_MAINTAINER_, mtFee);
emit DVMSwap(
emit DODOSwap(
address(_BASE_TOKEN_),
address(_QUOTE_TOKEN_),
baseInput,