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

fix owner

Browse Source
This commit is contained in:
owen05
2020-11-27 00:00:36 +08:00
parent d4569fe099
commit 5154c86e24
5 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/DODOPrivatePool/impl/DPPStorage.sol
View File

@@ -106,8 +106,4 @@ contract DPPStorage is InitializableOwnable, ReentrancyGuard {
return _MT_FEE_RATE_MODEL_.getFeeRate(trader); return _MT_FEE_RATE_MODEL_.getFeeRate(trader);
} }
function getOwner() external view returns (address) {
return _OWNER_;
}
} }

4
contracts/DODOVendingMachine/impl/DVMStorage.sol
View File

@@ -97,9 +97,5 @@ contract DVMStorage is InitializableOwnable, ReentrancyGuard {
function getMtFeeRate(address trader) external view returns (uint256 feeRate) { function getMtFeeRate(address trader) external view returns (uint256 feeRate) {
return _MT_FEE_RATE_MODEL_.getFeeRate(trader); return _MT_FEE_RATE_MODEL_.getFeeRate(trader);
} }
function getOwner() external view returns (address) {
return _OWNER_;
}
} }

6
contracts/SmartRoute/DODOV2Proxy01.sol
View File

@@ -241,7 +241,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
IDODOV2(smartApprove).claimTokens(IDODOV2(DPPAddress)._BASE_TOKEN_(), msg.sender, DPPAddress, baseInAmount); IDODOV2(smartApprove).claimTokens(IDODOV2(DPPAddress)._BASE_TOKEN_(), msg.sender, DPPAddress, baseInAmount);
if(quoteInAmount > 0) if(quoteInAmount > 0)
IDODOV2(smartApprove).claimTokens(IDODOV2(DPPAddress)._QUOTE_TOKEN_(), msg.sender, DPPAddress, quoteInAmount); IDODOV2(smartApprove).claimTokens(IDODOV2(DPPAddress)._QUOTE_TOKEN_(), msg.sender, DPPAddress, quoteInAmount);
IDODOV2(IDODOV2(DPPAddress).getOwner()).reset( IDODOV2(IDODOV2(DPPAddress)._OWNER_()).reset(
msg.sender, msg.sender,
newLpFeeRate, newLpFeeRate,
newMtFeeRate, newMtFeeRate,
@@ -284,7 +284,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
} }
} }
if( (flag == 3 && baseOutAmount > 0) || (flag == 4 && quoteOutAmount > 0) ) { if( (flag == 3 && baseOutAmount > 0) || (flag == 4 && quoteOutAmount > 0) ) {
IDODOV2(IDODOV2(DPPAddress).getOwner()).resetETH( IDODOV2(IDODOV2(DPPAddress)._OWNER_()).resetETH(
msg.sender, msg.sender,
newLpFeeRate, newLpFeeRate,
newMtFeeRate, newMtFeeRate,
@@ -315,7 +315,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01 {
} }
} }
}else { }else {
IDODOV2(IDODOV2(DPPAddress).getOwner()).reset( IDODOV2(IDODOV2(DPPAddress)._OWNER_()).reset(
msg.sender, msg.sender,
newLpFeeRate, newLpFeeRate,
newMtFeeRate, newMtFeeRate,

4
contracts/intf/IDODOV2.sol
View File

@@ -8,8 +8,6 @@
pragma solidity 0.6.9; pragma solidity 0.6.9;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import {IERC20} from "./IERC20.sol";
interface IDODOV2 { interface IDODOV2 {
//========== Common ================== //========== Common ==================
@@ -24,6 +22,8 @@ interface IDODOV2 {
function _QUOTE_TOKEN_() external returns (address); function _QUOTE_TOKEN_() external returns (address);
function _OWNER_() external returns (address);
function getOwner() external view returns (address); function getOwner() external view returns (address);
//========== DODOVendingMachine ======== //========== DODOVendingMachine ========

2
contracts/intf/IDODOV2Proxy01.sol
View File

@@ -8,8 +8,6 @@
pragma solidity 0.6.9; pragma solidity 0.6.9;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import {IERC20} from "./IERC20.sol";
interface IDODOV2Proxy01 { interface IDODOV2Proxy01 {
function dodoSwapETHToToken( function dodoSwapETHToToken(
address payable assetTo, address payable assetTo,