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

fix proxy

Browse Source
This commit is contained in:
owen05
2021-01-21 17:10:14 +08:00
parent a9d71eb410
commit 6ecf34e1e1
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/SmartRoute/DODOIncentive.sol
View File

@@ -110,18 +110,18 @@ contract DODOIncentive is InitializableOwnable {
}
function _updateTotalReward() internal {
totalReward = uint112(_getTotalReward());
lastRewardBlock = uint32(block.number);
uint256 _totalReward = _getTotalReward();
require(_totalReward < uint112(-1), "OVERFLOW");
totalReward = uint112(_totalReward);
lastRewardBlock = uint32(block.timestamp % 2**32);
}
function _update(uint256 _totalReward, uint256 _totalDistribution) internal {
require(
_totalReward < uint112(-1) &&
_totalDistribution < uint112(-1) &&
block.number < uint32(-1),
_totalReward < uint112(-1) && _totalDistribution < uint112(-1),
"OVERFLOW"
);
lastRewardBlock = uint32(block.number);
lastRewardBlock = uint32(block.timestamp % 2**32);
totalReward = uint112(_totalReward);
totalDistribution = uint112(_totalDistribution);
}

33
contracts/SmartRoute/DODOV2Proxy01.sol
View File

@@ -621,15 +621,18 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
require(mixPairs.length == mixAdapters.length, "DODOV2Proxy01: PAIR_ADAPTER_NOT_MATCH");
require(mixPairs.length == assetTo.length - 1, "DODOV2Proxy01: PAIR_ASSETTO_NOT_MATCH");
require(minReturnAmount > 0, "DODOV2Proxy01: RETURN_AMOUNT_ZERO");
require(fromToken != _CHI_TOKEN_, "DODOV2Proxy01: NOT_SUPPORT_SELL_CHI");
require(toToken != _CHI_TOKEN_, "DODOV2Proxy01: NOT_SUPPORT_BUY_CHI");
uint256 toTokenOriginBalance = IERC20(toToken).universalBalanceOf(msg.sender);
{
address _fromToken = fromToken;
_deposit(msg.sender, assetTo[0], _fromToken, fromTokenAmount, _fromToken == _ETH_ADDRESS_);
}
address _toToken = toToken;
uint256 _fromTokenAmount = fromTokenAmount;
require(_fromToken != _CHI_TOKEN_, "DODOV2Proxy01: NOT_SUPPORT_SELL_CHI");
require(_toToken != _CHI_TOKEN_, "DODOV2Proxy01: NOT_SUPPORT_BUY_CHI");
uint256 originGas = gasleft();
uint256 toTokenOriginBalance = IERC20(_toToken).universalBalanceOf(msg.sender);
_deposit(msg.sender, assetTo[0], _fromToken, _fromTokenAmount, _fromToken == _ETH_ADDRESS_);
for (uint256 i = 0; i < mixPairs.length; i++) {
if (directions & 1 == 0) {
@@ -640,25 +643,25 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
directions = directions >> 1;
}
if(toToken == _ETH_ADDRESS_) {
if(_toToken == _ETH_ADDRESS_) {
returnAmount = IWETH(_WETH_).balanceOf(address(this));
IWETH(_WETH_).withdraw(returnAmount);
msg.sender.transfer(returnAmount);
}else {
returnAmount = IERC20(toToken).tokenBalanceOf(msg.sender).sub(toTokenOriginBalance);
returnAmount = IERC20(_toToken).tokenBalanceOf(msg.sender).sub(toTokenOriginBalance);
}
require(returnAmount >= minReturnAmount, "DODOV2Proxy01: Return amount is not enough");
_externalGasReturn();
_dodoGasReturn(originGas);
_execIncentive(isIncentive, fromToken, toToken);
_execIncentive(isIncentive, _fromToken, _toToken);
emit OrderHistory(
fromToken,
toToken,
_fromToken,
_toToken,
msg.sender,
fromTokenAmount,
_fromTokenAmount,
returnAmount
);
}

2
test/V2Proxy/proxy.incentive.test.ts
View File

@@ -172,7 +172,7 @@ describe("DODOProxyV2.0", () => {
assert(totalReward, decimalStr("140"));
});
it.only("tigger - incentive", async () => {
it("tigger - incentive", async () => {
await ctx.mintTestToken(trader, ctx.DODO, decimalStr("2000"));
var b_DODO = await ctx.DODO.methods.balanceOf(trader).call()
var b_USDT = await ctx.USDT.methods.balanceOf(trader).call()