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

return capital change in deposit

Browse Source
This commit is contained in:
mingda
2020-07-30 01:23:49 +08:00
parent 5a5558608c
commit 73866b9d3a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contracts/impl/LiquidityProvider.sol
View File

@@ -64,16 +64,16 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
return withdrawBaseTo(msg.sender, amount); return withdrawBaseTo(msg.sender, amount);
} }
function depositBase(uint256 amount) external { function depositBase(uint256 amount) external returns (uint256) {
depositBaseTo(msg.sender, amount); return depositBaseTo(msg.sender, amount);
} }
function withdrawQuote(uint256 amount) external returns (uint256) { function withdrawQuote(uint256 amount) external returns (uint256) {
return withdrawQuoteTo(msg.sender, amount); return withdrawQuoteTo(msg.sender, amount);
} }
function depositQuote(uint256 amount) external { function depositQuote(uint256 amount) external returns (uint256) {
depositQuoteTo(msg.sender, amount); return depositQuoteTo(msg.sender, amount);
} }
function withdrawAllBase() external returns (uint256) { function withdrawAllBase() external returns (uint256) {
@@ -90,6 +90,7 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
public public
preventReentrant preventReentrant
depositQuoteAllowed depositQuoteAllowed
returns (uint256)
{ {
(, uint256 quoteTarget) = getExpectedTarget(); (, uint256 quoteTarget) = getExpectedTarget();
uint256 totalQuoteCapital = getTotalQuoteCapital(); uint256 totalQuoteCapital = getTotalQuoteCapital();
@@ -107,9 +108,15 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount); _TARGET_QUOTE_TOKEN_AMOUNT_ = _TARGET_QUOTE_TOKEN_AMOUNT_.add(amount);
emit Deposit(msg.sender, to, false, amount, capital); emit Deposit(msg.sender, to, false, amount, capital);
return capital;
} }
function depositBaseTo(address to, uint256 amount) public preventReentrant depositBaseAllowed { function depositBaseTo(address to, uint256 amount)
public
preventReentrant
depositBaseAllowed
returns (uint256)
{
(uint256 baseTarget, ) = getExpectedTarget(); (uint256 baseTarget, ) = getExpectedTarget();
uint256 totalBaseCapital = getTotalBaseCapital(); uint256 totalBaseCapital = getTotalBaseCapital();
uint256 capital = amount; uint256 capital = amount;
@@ -126,6 +133,7 @@ contract LiquidityProvider is Storage, Pricing, Settlement {
_TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount); _TARGET_BASE_TOKEN_AMOUNT_ = _TARGET_BASE_TOKEN_AMOUNT_.add(amount);
emit Deposit(msg.sender, to, true, amount, capital); emit Deposit(msg.sender, to, true, amount, capital);
return capital;
} }
// ============ Withdraw Functions ============ // ============ Withdraw Functions ============