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

code review modifyupdate

Browse Source
This commit is contained in:
牛涛涛
2021-01-07 21:36:27 +08:00
parent aba6b84683
commit 784c443834
3 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/CrowdPooling/impl/CPFunding.sol
View File

@@ -88,18 +88,18 @@ contract CPFunding is CPStorage {
_poolBaseToken = address(_BASE_TOKEN_);
_poolQuoteToken = address(_QUOTE_TOKEN_);
_poolI = _I_;
} else if (poolQuote.mul(_UNUSED_BASE_) == poolQuote.mul(poolBase)) {
} else if (_UNUSED_BASE_== poolBase) {
// standard bonding curve
_poolBaseToken = address(_BASE_TOKEN_);
_poolQuoteToken = address(_QUOTE_TOKEN_);
_poolI = 1;
} else if (poolQuote.mul(_UNUSED_BASE_) < poolQuote.mul(poolBase)) {
} else if (_UNUSED_BASE_ < poolBase) {
// poolI up round
_poolBaseToken = address(_BASE_TOKEN_);
_poolQuoteToken = address(_QUOTE_TOKEN_);
uint256 ratio = DecimalMath.ONE.sub(DecimalMath.divFloor(poolQuote, baseDepth));
_poolI = avgPrice.mul(ratio).mul(ratio).divCeil(DecimalMath.ONE2);
} else if (poolQuote.mul(_UNUSED_BASE_) > poolQuote.mul(poolBase)) {
} else if (_UNUSED_BASE_ > poolBase) {
// poolI down round
_poolBaseToken = address(_QUOTE_TOKEN_);
_poolQuoteToken = address(_BASE_TOKEN_);
@@ -129,7 +129,6 @@ contract CPFunding is CPStorage {
require(block.timestamp >= _PHASE_CALM_ENDTIME_.add(_SETTLEMENT_EXPIRE_), "NOT_EMERGENCY");
_settle();
_UNUSED_QUOTE_ = _QUOTE_TOKEN_.balanceOf(address(this));
_UNUSED_BASE_ = _BASE_TOKEN_.balanceOf(address(this));
}
function _settle() internal {

22
contracts/DODOPrivatePool/impl/DPPVault.sol
View File

@@ -83,22 +83,9 @@ contract DPPVault is DPPStorage {
_QUOTE_RESERVE_ = uint128(quoteBalance);
_BASE_TARGET_ = uint120(baseBalance);
_QUOTE_TARGET_ = uint120(quoteBalance);
_setRState();
_RState_ = uint16(PMMPricing.RState.ONE);
}
function _setRState() internal {
if (_BASE_RESERVE_ == _BASE_TARGET_ && _QUOTE_RESERVE_ == _QUOTE_TARGET_) {
_RState_ = uint16(PMMPricing.RState.ONE);
} else if (_BASE_RESERVE_ > _BASE_TARGET_ && _QUOTE_RESERVE_ < _QUOTE_TARGET_) {
_RState_ = uint16(PMMPricing.RState.BELOW_ONE);
} else if (_BASE_RESERVE_ < _BASE_TARGET_ && _QUOTE_RESERVE_ > _QUOTE_TARGET_) {
_RState_ = uint16(PMMPricing.RState.ABOVE_ONE);
} else {
require(false, "R_STATE_WRONG");
}
}
function ratioSync() external preventReentrant onlyOwner {
uint256 baseBalance = _BASE_TOKEN_.balanceOf(address(this));
uint256 quoteBalance = _QUOTE_TOKEN_.balanceOf(address(this));
@@ -115,13 +102,6 @@ contract DPPVault is DPPStorage {
}
}
function setTarget(uint256 baseTarget, uint256 quoteTarget) public preventReentrant onlyOwner {
require(baseTarget <= uint120(-1) && quoteTarget <= uint120(-1), "OVERFLOW");
_BASE_TARGET_ = uint120(baseTarget);
_QUOTE_TARGET_ = uint120(quoteTarget);
_setRState();
}
function reset(
address assetTo,
uint256 newLpFeeRate,

1
test/utils/EVM.ts
View File

@@ -13,6 +13,7 @@ import Web3 from 'web3';
export function getDefaultWeb3() {
return new Web3(process.env.RPC_NODE_URI)
}
process.env.RPC_NODE_URI="http://127.0.0.1:8545";
export class EVM {
private provider = new Web3.providers.HttpProvider(process.env.RPC_NODE_URI);