From edec5e57115e578f9b642cd49be2123f32a7e3cf Mon Sep 17 00:00:00 2001 From: mingda Date: Sat, 11 Jul 2020 13:57:07 +0800 Subject: [PATCH] simplify events --- contracts/impl/LiquidityProvider.sol | 44 ++++++++++------------------ contracts/impl/Settlement.sol | 8 ++--- contracts/impl/Trader.sol | 8 ++--- 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/contracts/impl/LiquidityProvider.sol b/contracts/impl/LiquidityProvider.sol index 2e88a4e..596b6f6 100644 --- a/contracts/impl/LiquidityProvider.sol +++ b/contracts/impl/LiquidityProvider.sol @@ -28,37 +28,23 @@ contract LiquidityProvider is Storage, Pricing, Settlement { // ============ Events ============ - event DepositBaseToken( + event Deposit( address indexed payer, address indexed receiver, + bool isBaseToken, uint256 amount, uint256 lpTokenAmount ); - event DepositQuoteToken( + event Withdraw( address indexed payer, address indexed receiver, + bool isBaseToken, uint256 amount, uint256 lpTokenAmount ); - event WithdrawBaseToken( - 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); + event ChargePenalty(address indexed payer, bool isBaseToken, uint256 amount); // ============ Modifiers ============ @@ -120,7 +106,7 @@ contract LiquidityProvider is Storage, Pricing, Settlement { _mintQuoteCapital(to, capital); _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 { @@ -139,7 +125,7 @@ contract LiquidityProvider is Storage, Pricing, Settlement { _mintBaseCapital(to, capital); _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 ============ @@ -166,8 +152,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement { _quoteTokenTransferOut(to, amount.sub(penalty)); _donateQuoteToken(penalty); - emit WithdrawQuoteToken(msg.sender, to, amount.sub(penalty), requireQuoteCapital); - emit ChargeQuotePenalty(msg.sender, penalty); + emit Withdraw(msg.sender, to, false, amount.sub(penalty), requireQuoteCapital); + emit ChargePenalty(msg.sender, false, penalty); return amount.sub(penalty); } @@ -194,8 +180,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement { _baseTokenTransferOut(to, amount.sub(penalty)); _donateBaseToken(penalty); - emit WithdrawBaseToken(msg.sender, to, amount.sub(penalty), requireBaseCapital); - emit ChargeBasePenalty(msg.sender, penalty); + emit Withdraw(msg.sender, to, true, amount.sub(penalty), requireBaseCapital); + emit ChargePenalty(msg.sender, true, penalty); return amount.sub(penalty); } @@ -216,8 +202,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement { _quoteTokenTransferOut(to, withdrawAmount.sub(penalty)); _donateQuoteToken(penalty); - emit WithdrawQuoteToken(msg.sender, to, withdrawAmount, capital); - emit ChargeQuotePenalty(msg.sender, penalty); + emit Withdraw(msg.sender, to, false, withdrawAmount, capital); + emit ChargePenalty(msg.sender, false, penalty); return withdrawAmount.sub(penalty); } @@ -236,8 +222,8 @@ contract LiquidityProvider is Storage, Pricing, Settlement { _baseTokenTransferOut(to, withdrawAmount.sub(penalty)); _donateBaseToken(penalty); - emit WithdrawBaseToken(msg.sender, to, withdrawAmount, capital); - emit ChargeBasePenalty(msg.sender, penalty); + emit Withdraw(msg.sender, to, true, withdrawAmount, capital); + emit ChargePenalty(msg.sender, true, penalty); return withdrawAmount.sub(penalty); } diff --git a/contracts/impl/Settlement.sol b/contracts/impl/Settlement.sol index 016be05..f5ceaff 100644 --- a/contracts/impl/Settlement.sol +++ b/contracts/impl/Settlement.sol @@ -27,9 +27,7 @@ contract Settlement is Storage { // ============ Events ============ - event DonateBaseToken(uint256 amount); - - event DonateQuoteToken(uint256 amount); + event Donate(uint256 amount, bool isBaseToken); event Claim(address indexed user, uint256 baseTokenAmount, uint256 quoteTokenAmount); @@ -67,12 +65,12 @@ contract Settlement is Storage { function _donateBaseToken(uint256 amount) internal { _TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount); - emit DonateBaseToken(amount); + emit Donate(amount, true); } function _donateQuoteToken(uint256 amount) internal { _TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount); - emit DonateQuoteToken(amount); + emit Donate(amount, false); } function donateBaseToken(uint256 amount) external { diff --git a/contracts/impl/Trader.sol b/contracts/impl/Trader.sol index ecb8c1e..ee75ae3 100644 --- a/contracts/impl/Trader.sol +++ b/contracts/impl/Trader.sol @@ -30,9 +30,7 @@ contract Trader is Storage, Pricing, Settlement { event BuyBaseToken(address indexed buyer, uint256 receiveBase, uint256 payQuote); - event ChargeMaintainerFeeBase(address indexed maintainer, uint256 amount); - - event ChargeMaintainerFeeQuote(address indexed maintainer, uint256 amount); + event ChargeMaintainerFee(address indexed maintainer, bool isBaseToken, uint256 amount); // ============ Modifiers ============ @@ -85,7 +83,7 @@ contract Trader is Storage, Pricing, Settlement { _donateQuoteToken(lpFeeQuote); emit SellBaseToken(msg.sender, amount, receiveQuote); if (mtFeeQuote != 0) { - emit ChargeMaintainerFeeQuote(_MAINTAINER_, mtFeeQuote); + emit ChargeMaintainerFee(_MAINTAINER_, false, mtFeeQuote); } return receiveQuote; @@ -128,7 +126,7 @@ contract Trader is Storage, Pricing, Settlement { _donateBaseToken(lpFeeBase); emit BuyBaseToken(msg.sender, amount, payQuote); if (mtFeeBase != 0) { - emit ChargeMaintainerFeeBase(_MAINTAINER_, mtFeeBase); + emit ChargeMaintainerFee(_MAINTAINER_, true, mtFeeBase); } return payQuote;