Skip to content

Changed swap functionality to always use WETH as an intermediary for token to token transfers #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mwaddip wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed swap functionality to always use WETH as an intermediary for token to token transfers #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a5a64f
Changed swap functionality to always use WETH as an intermediary for …
mwaddip Oct 8, 2020
152412b
Changed swap functionality to always use WETH as an intermediary for …
mwaddip Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions assets/scripts/uniswapOps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,21 +399,30 @@ ${fixedInflation.swapCouples.map((it, i) => ` stateHolder.setAddress("fix
from.approve(address(uniswapV2Router), 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff);
}
}
address[] memory path = new address[](2);
path[0] = fromAddress;
path[1] = stateHolder.getAddress(string(abi.encodePacked("fixedInflation.swapCouples[", iString, "].to")));
if(path[1] == address(0)) {
address toAddress = stateHolder.getAddress(string(abi.encodePacked("fixedInflation.swapCouples[", iString, "].to")));
if(toAddress == address(0)) {
return;
}
if(path[0] == wethAddress) {
if(fromAddress == wethAddress) {
address[] memory path = new address[](2);
path[0] = fromAddress;
path[1] = toAddress;
uniswapV2Router.swapExactETHForTokens{value: amount}(uniswapV2Router.getAmountsOut(amount, path)[1], path, dfoWalletAddress, block.timestamp + 1000);
return;
}
if(path[1] == wethAddress) {
address[] memory path = new address[](2);
path[0] = fromAddress;
path[1] = toAddress;
uniswapV2Router.swapExactTokensForETH(amount, uniswapV2Router.getAmountsOut(amount, path)[1], path, dfoWalletAddress, block.timestamp + 1000);
return;
}
uniswapV2Router.swapExactTokensForTokens(amount, uniswapV2Router.getAmountsOut(amount, path)[1], path, dfoWalletAddress, block.timestamp + 1000);
// force swap to go through WETH
address[] memory path = new address[](3);
path[0] = fromAddress;
path[1] = wethAddress;
path[2] = toAddress;
uniswapV2Router.swapExactTokensForTokens(amount, uniswapV2Router.getAmountsOut(amount, path)[2], path, dfoWalletAddress, block.timestamp + 1000);
}

function _toUint256(bytes memory bs) private pure returns(uint256 x) {
Expand Down Expand Up @@ -747,4 +756,4 @@ interface IStateHolder {
functionalityReplace: '',
functionalityOutputParameters: '[]',
}, window.context.oneTimeProposalTemplate, lines, descriptions, undefined, undefined, postFixedLines);
};
};