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

refactor DPP & DVM

Browse Source
This commit is contained in:
mingda
2020-11-18 17:51:50 +08:00
parent 6a7b648753
commit d78de94b44
17 changed files with 627 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
contracts/DODOVendorMachine/impl/DVMFunding.sol
View File

@@ -8,17 +8,17 @@
pragma solidity 0.6.9;
pragma experimental ABIEncoderV2;
import {DVMStorage} from "./DVMStorage.sol";
import {DVMVault} from "./DVMVault.sol";
import {DecimalMath} from "../../lib/DecimalMath.sol";
import {IDODOCallee} from "../../intf/IDODOCallee.sol";
contract DVMFunding is DVMStorage {
contract DVMFunding is DVMVault {
function buyShares(address to) external preventReentrant returns (uint256) {
uint256 baseInput = _VAULT_.getBaseInput();
uint256 quoteInput = _VAULT_.getQuoteInput();
uint256 baseInput = getBaseInput();
uint256 quoteInput = getQuoteInput();
require(baseInput > 0, "NO_BASE_INPUT");
uint256 baseReserve = _VAULT_._BASE_RESERVE_();
uint256 quoteReserve = _VAULT_._QUOTE_RESERVE_();
uint256 baseReserve = _BASE_RESERVE_; // may save gas? 待确认
uint256 quoteReserve = _QUOTE_RESERVE_;
uint256 mintAmount;
// case 1. initial supply
if (baseReserve == 0 && quoteReserve == 0) {
@@ -27,7 +27,7 @@ contract DVMFunding is DVMStorage {
// case 2. supply when quote reserve is 0
if (baseReserve > 0 && quoteReserve == 0) {
uint256 mintRatio = DecimalMath.divFloor(baseInput, baseReserve);
mintAmount = DecimalMath.mulFloor(_VAULT_.totalSupply(), mintRatio);
mintAmount = DecimalMath.mulFloor(totalSupply, mintRatio);
}
// case 3. normal case
if (baseReserve > 0 && quoteReserve > 0) {
@@ -36,15 +36,15 @@ contract DVMFunding is DVMStorage {
uint256 mintRatio = baseInputRatio > quoteInputRatio ? quoteInputRatio : baseInputRatio;
// 在提币的时候向下取整。因此永远不会出现，balance为0但totalsupply不为0的情况
// 但有可能出现，reserve>0但totalSupply=0的场景
uint256 totalShare = _VAULT_.totalSupply();
uint256 totalShare = totalSupply;
if (totalShare > 0) {
mintAmount = DecimalMath.mulFloor(totalShare, mintRatio);
} else {
mintAmount = baseInput;
}
}
_VAULT_.mint(to, mintAmount);
_VAULT_.sync();
_mint(to, mintAmount);
_sync();
}
function sellShares(
@@ -52,26 +52,34 @@ contract DVMFunding is DVMStorage {
uint256 shareAmount,
bytes calldata data
) external preventReentrant returns (uint256) {
require(_VAULT_.balanceOf(msg.sender) >= shareAmount, "SHARES_NOT_ENOUGH");
(uint256 baseBalance, uint256 quoteBalance) = _VAULT_.getVaultBalance();
uint256 totalShares = _VAULT_.totalSupply();
_VAULT_.burn(msg.sender, shareAmount);
require(_SHARES_[msg.sender] >= shareAmount, "SHARES_NOT_ENOUGH");
(uint256 baseBalance, uint256 quoteBalance) = getVaultBalance();
uint256 totalShares = totalSupply;
_burn(msg.sender, shareAmount);
uint256 baseAmount = baseBalance.mul(shareAmount).div(totalShares);
uint256 quoteAmount = quoteBalance.mul(shareAmount).div(totalShares);
_VAULT_.transferBaseOut(to, baseAmount);
_VAULT_.transferQuoteOut(to, quoteAmount);
_VAULT_.sync();
if (data.length > 0) IDODOCallee(msg.sender).DVMSellShareCall(to, shareAmount, baseAmount, quoteAmount, data);
_transferBaseOut(to, baseAmount);
_transferQuoteOut(to, quoteAmount);
_sync();
if (data.length > 0)
IDODOCallee(msg.sender).DVMSellShareCall(
to,
shareAmount,
baseAmount,
quoteAmount,
data
);
}
function retrieve(address to) external preventReentrant {
(uint256 baseBalance, uint256 quoteBalance) = _VAULT_.getVaultBalance();
(uint256 baseReserve, uint256 quoteReserve) = _VAULT_.getVaultReserve();
if (baseBalance.sub(baseReserve) > 0) {
_VAULT_.transferBaseOut(to, baseBalance.sub(baseReserve));
}
if (quoteBalance.sub(quoteReserve) > 0) {
_VAULT_.transferQuoteOut(to, quoteBalance.sub(quoteReserve));
}
}
// 高级功能，需要讨论加不加
// function retrieve(address to) external preventReentrant {
// (uint256 baseBalance, uint256 quoteBalance) = getVaultBalance();
// (uint256 baseReserve, uint256 quoteReserve) = getVaultReserve();
// if (baseBalance.sub(baseReserve) > 0) {
// transferBaseOut(to, baseBalance.sub(baseReserve));
// }
// if (quoteBalance.sub(quoteReserve) > 0) {
// transferQuoteOut(to, quoteBalance.sub(quoteReserve));
// }
// }
}