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

simplify events

Browse Source
This commit is contained in:
mingda
2020-07-11 13:57:07 +08:00
parent 8a71324b35
commit 8e64b5e370
3 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
contracts/impl/LiquidityProvider.sol
View File

@@ -28,37 +28,23 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
// ============ Events ============ // ============ Events ============
event DepositBaseToken( event Deposit(
address indexed payer, address indexed payer,
address indexed receiver, address indexed receiver,
bool isBaseToken,
uint256 amount, uint256 amount,
uint256 lpTokenAmount uint256 lpTokenAmount
); );
event DepositQuoteToken( event Withdraw(
address indexed payer, address indexed payer,
address indexed receiver, address indexed receiver,
bool isBaseToken,
uint256 amount, uint256 amount,
uint256 lpTokenAmount uint256 lpTokenAmount
); );
event WithdrawBaseToken( event ChargePenalty(address indexed payer, bool isBaseToken, uint256 amount);
address indexed payer,
address indexed receiver,
uint256 amount,
uint256 lpTokenAmount
);
event WithdrawQuoteToken(
address indexed payer,
address indexed receiver,
uint256 amount,
uint256 lpTokenAmount
);
event ChargeBasePenalty(address indexed payer, uint256 amount);
event ChargeQuotePenalty(address indexed payer, uint256 amount);
// ============ Modifiers ============ // ============ Modifiers ============
@@ -120,7 +106,7 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_mintQuoteCapital(to, capital); _mintQuoteCapital(to, capital);
_TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount); _TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount);
emit DepositQuoteToken(msg.sender, to, amount, capital); emit Deposit(msg.sender, to, false, amount, capital);
} }
function depositBaseTo(address to, uint256 amount) public preventReentrant depositBaseAllowed { function depositBaseTo(address to, uint256 amount) public preventReentrant depositBaseAllowed {
@@ -139,7 +125,7 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_mintBaseCapital(to, capital); _mintBaseCapital(to, capital);
_TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount); _TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount);
emit DepositBaseToken(msg.sender, to, amount, capital); emit Deposit(msg.sender, to, true, amount, capital);
} }
// ============ Withdraw Functions ============ // ============ Withdraw Functions ============
@@ -166,8 +152,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_quoteTokenTransferOut(to, amount.sub(penalty)); _quoteTokenTransferOut(to, amount.sub(penalty));
_donateQuoteToken(penalty); _donateQuoteToken(penalty);
emit WithdrawQuoteToken(msg.sender, to, amount.sub(penalty), requireQuoteCapital); emit Withdraw(msg.sender, to, false, amount.sub(penalty), requireQuoteCapital);
emit ChargeQuotePenalty(msg.sender, penalty); emit ChargePenalty(msg.sender, false, penalty);
return amount.sub(penalty); return amount.sub(penalty);
} }
@@ -194,8 +180,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_baseTokenTransferOut(to, amount.sub(penalty)); _baseTokenTransferOut(to, amount.sub(penalty));
_donateBaseToken(penalty); _donateBaseToken(penalty);
emit WithdrawBaseToken(msg.sender, to, amount.sub(penalty), requireBaseCapital); emit Withdraw(msg.sender, to, true, amount.sub(penalty), requireBaseCapital);
emit ChargeBasePenalty(msg.sender, penalty); emit ChargePenalty(msg.sender, true, penalty);
return amount.sub(penalty); return amount.sub(penalty);
} }
@@ -216,8 +202,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_quoteTokenTransferOut(to, withdrawAmount.sub(penalty)); _quoteTokenTransferOut(to, withdrawAmount.sub(penalty));
_donateQuoteToken(penalty); _donateQuoteToken(penalty);
emit WithdrawQuoteToken(msg.sender, to, withdrawAmount, capital); emit Withdraw(msg.sender, to, false, withdrawAmount, capital);
emit ChargeQuotePenalty(msg.sender, penalty); emit ChargePenalty(msg.sender, false, penalty);
return withdrawAmount.sub(penalty); return withdrawAmount.sub(penalty);
} }
@@ -236,8 +222,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_baseTokenTransferOut(to, withdrawAmount.sub(penalty)); _baseTokenTransferOut(to, withdrawAmount.sub(penalty));
_donateBaseToken(penalty); _donateBaseToken(penalty);
emit WithdrawBaseToken(msg.sender, to, withdrawAmount, capital); emit Withdraw(msg.sender, to, true, withdrawAmount, capital);
emit ChargeBasePenalty(msg.sender, penalty); emit ChargePenalty(msg.sender, true, penalty);
return withdrawAmount.sub(penalty); return withdrawAmount.sub(penalty);
} }

8
contracts/impl/Settlement.sol
View File

@@ -27,9 +27,7 @@ contract Settlement is Storage {
// ============ Events ============ // ============ Events ============
event DonateBaseToken(uint256 amount); event Donate(uint256 amount, bool isBaseToken);
event DonateQuoteToken(uint256 amount);
event Claim(address indexed user, uint256 baseTokenAmount, uint256 quoteTokenAmount); event Claim(address indexed user, uint256 baseTokenAmount, uint256 quoteTokenAmount);
@@ -67,12 +65,12 @@ contract Settlement is Storage {
function _donateBaseToken(uint256 amount) internal { function _donateBaseToken(uint256 amount) internal {
_TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount); _TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount);
emit DonateBaseToken(amount); emit Donate(amount, true);
} }
function _donateQuoteToken(uint256 amount) internal { function _donateQuoteToken(uint256 amount) internal {
_TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount); _TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount);
emit DonateQuoteToken(amount); emit Donate(amount, false);
} }
function donateBaseToken(uint256 amount) external { function donateBaseToken(uint256 amount) external {

8
contracts/impl/Trader.sol
View File

@@ -30,9 +30,7 @@ contract Trader is Storage, Pricing, Settlement {
event BuyBaseToken(address indexed buyer, uint256 receiveBase, uint256 payQuote); event BuyBaseToken(address indexed buyer, uint256 receiveBase, uint256 payQuote);
event ChargeMaintainerFeeBase(address indexed maintainer, uint256 amount); event ChargeMaintainerFee(address indexed maintainer, bool isBaseToken, uint256 amount);
event ChargeMaintainerFeeQuote(address indexed maintainer, uint256 amount);
// ============ Modifiers ============ // ============ Modifiers ============
@@ -85,7 +83,7 @@ contract Trader is Storage, Pricing, Settlement {
_donateQuoteToken(lpFeeQuote); _donateQuoteToken(lpFeeQuote);
emit SellBaseToken(msg.sender, amount, receiveQuote); emit SellBaseToken(msg.sender, amount, receiveQuote);
if (mtFeeQuote != 0) { if (mtFeeQuote != 0) {
emit ChargeMaintainerFeeQuote(_MAINTAINER_, mtFeeQuote); emit ChargeMaintainerFee(_MAINTAINER_, false, mtFeeQuote);
} }
return receiveQuote; return receiveQuote;
@@ -128,7 +126,7 @@ contract Trader is Storage, Pricing, Settlement {
_donateBaseToken(lpFeeBase); _donateBaseToken(lpFeeBase);
emit BuyBaseToken(msg.sender, amount, payQuote); emit BuyBaseToken(msg.sender, amount, payQuote);
if (mtFeeBase != 0) { if (mtFeeBase != 0) {
emit ChargeMaintainerFeeBase(_MAINTAINER_, mtFeeBase); emit ChargeMaintainerFee(_MAINTAINER_, true, mtFeeBase);
} }
return payQuote; return payQuote;