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

add try-catch in dodoV2RouteHelper

Browse Source
This commit is contained in:
Attens1423
2023-08-24 22:51:55 +08:00
parent 5b293b91fb
commit 97bd322857
3 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contracts/SmartRoute/helper/DODOV2CuttingRouteHelper.sol
View File

@@ -94,17 +94,23 @@ contract DODOV2CuttingRouteHelper is InitializableOwnable {
curRes.quoteToken = token0;
}
(
curRes.i,
curRes.K,
curRes.B,
curRes.Q,
curRes.B0,
curRes.Q0,
curRes.R
) = IDODOV2(cur).getPMMStateForCall();
(curRes.lpFeeRate, curRes.mtFeeRate) = IDODOV2(cur).getUserFeeRate(userAddr);
try IDODOV2(cur).getPMMStateForCall() returns (uint256 _i, uint256 _K, uint256 _B, uint256 _Q, uint256 _B0, uint256 _Q0, uint256 _R){
curRes.i = _i;
curRes.K = _K;
curRes.B = _B;
curRes.Q = _Q;
curRes.B0 = _B0;
curRes.Q0 = _Q0;
curRes.R = _R;
} catch {
continue;
}
try IDODOV2(cur).getUserFeeRate(userAddr) returns (uint256 lpFeeRate, uint256 mtFeeRate) {
(curRes.lpFeeRate, curRes.mtFeeRate) = (lpFeeRate, mtFeeRate);
} catch {
(curRes.lpFeeRate, curRes.mtFeeRate) = (0, 1e18);
}
curRes.curPair = cur;
res[i] = curRes;
}

28
contracts/SmartRoute/helper/DODOV2RouteHelper.sol
View File

@@ -73,17 +73,23 @@ contract DODOV2RouteHelper {
curRes.quoteToken = token0;
}
(
curRes.i,
curRes.K,
curRes.B,
curRes.Q,
curRes.B0,
curRes.Q0,
curRes.R
) = IDODOV2(cur).getPMMStateForCall();
(curRes.lpFeeRate, curRes.mtFeeRate) = IDODOV2(cur).getUserFeeRate(userAddr);
try IDODOV2(cur).getPMMStateForCall() returns (uint256 _i, uint256 _K, uint256 _B, uint256 _Q, uint256 _B0, uint256 _Q0, uint256 _R){
curRes.i = _i;
curRes.K = _K;
curRes.B = _B;
curRes.Q = _Q;
curRes.B0 = _B0;
curRes.Q0 = _Q0;
curRes.R = _R;
} catch {
continue;
}
try IDODOV2(cur).getUserFeeRate(userAddr) returns (uint256 lpFeeRate, uint256 mtFeeRate) {
(curRes.lpFeeRate, curRes.mtFeeRate) = (lpFeeRate, mtFeeRate);
} catch {
(curRes.lpFeeRate, curRes.mtFeeRate) = (0, 1e18);
}
curRes.curPair = cur;
res[i] = curRes;
}

2
migrations/3_deploy_v2.js
View File

@@ -185,7 +185,6 @@ module.exports = async (deployer, network, accounts) => {
logger.log("Init DefaultMtFeeRateAddress Tx:", tx.tx);
}
// todo: 这个需不需要验证
if (UserQuotaAddress == "") {
await deployer.deploy(UserQuota);
UserQuotaAddress = UserQuota.address;
@@ -554,6 +553,7 @@ module.exports = async (deployer, network, accounts) => {
logger.log("Init DODOMineV3Proxy Tx:", tx.tx);
}
// need deploy dodoRouteProxy in dodo-route-contract repo
/*
if (DODORouteProxyAddress == "") {
await deployer.deploy(