Skip to content

Fix/allowance #5

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/allowance #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d09205
update contracts & script
seshanthS Mar 31, 2023
c938af2
add proxy address
seshanthS Mar 31, 2023
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
2 changes: 1 addition & 1 deletion contracts/DexForwarderAvalanche.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ contract DexForwarderAvalanche is Initializable, OwnableUpgradeable {
IERC20Upgradeable lpToken = IERC20Upgradeable(factory.getPair(address(tokenA), address(tokenB)));
lpToken.safeTransferFrom(_msgSender(), address(this), lpAmount);

if(lpToken.allowance(address(this), address(router)) > lpAmount) {
if(lpToken.allowance(address(this), address(router)) < lpAmount) {
lpToken.safeApprove(address(router), type(uint256).max);
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/DexForwarderOKC.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ contract DexForwarderOKC is Initializable, OwnableUpgradeable {
IERC20Upgradeable lpToken = IERC20Upgradeable(factory.getPair(address(tokenA), address(tokenB)));
lpToken.safeTransferFrom(_msgSender(), address(this), lpAmount);

if(lpToken.allowance(address(this), address(router)) > lpAmount) {
if(lpToken.allowance(address(this), address(router)) < lpAmount) {
lpToken.safeApprove(address(router), type(uint256).max);
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/DexForwarderOptimism.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ contract DexForwarderOptimism is Initializable, OwnableUpgradeable {
IERC20Upgradeable lpToken = IERC20Upgradeable(factory.getPair(address(tokenA), address(tokenB), stable));
lpToken.safeTransferFrom(_msgSender(), address(this), lpAmount);

if(lpToken.allowance(address(this), address(router)) > lpAmount) {
if(lpToken.allowance(address(this), address(router)) < lpAmount) {
lpToken.safeApprove(address(router), type(uint256).max);
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/dex.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ contract DexForwarder is Initializable, OwnableUpgradeable {
IERC20Upgradeable lpToken = IERC20Upgradeable(factory.getPair(address(tokenA), address(tokenB)));
lpToken.safeTransferFrom(_msgSender(), address(this), lpAmount);

if(lpToken.allowance(address(this), address(router)) > lpAmount) {
if(lpToken.allowance(address(this), address(router)) < lpAmount) {
lpToken.safeApprove(address(router), type(uint256).max);
}

Expand Down
4 changes: 2 additions & 2 deletions parameters/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ module.exports = {
cronosMainnet: {
routerAddr: "0x145863Eb42Cf62847A6Ca784e6416C1682b1b2Ae",
trustedForwarder: "0x0000000000000000000000000000000000000000",
Proxy: "",
Proxy: "0x981aE6155F8CF24F67e30CA8d90ab6FaEB472aE5",
nativeTokenAddress: "0x5c7f8a570d578ed84e63fdfa7b1ee72deae1ae23",
},
okc: {
routerAddr: "0xc97b81B8a38b9146010Df85f1Ac714aFE1554343",
trustedForwarder: "0x0000000000000000000000000000000000000000",
proxy: "",
proxy: "0x981aE6155F8CF24F67e30CA8d90ab6FaEB472aE5",
nativeToken: "0x8f8526dbfd6e38e3d8307702ca8469bae6c56c15"
},
okcTestnet: {
Expand Down
18 changes: 16 additions & 2 deletions scripts/upgrade.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ const main = async () => {
DexForwarder = await ethers.getContractFactory("DexForwarderOptimism", deployer)
} else if (net.chainId == 43113 || net.chainId == 43114) {
DexForwarder = await ethers.getContractFactory("DexForwarderAvalanche", deployer)
}else {
} else if (net.chainId == 65 || net.chainId == 66) {
DexForwarder = await ethers.getContractFactory("DexForwarderOKC", deployer)
} else {
DexForwarder = await ethers.getContractFactory("DexForwarder", deployer)
}

Expand All @@ -21,6 +23,18 @@ const main = async () => {
proxyAddr = params.fuji.Proxy
} else if (net.chainId === 43114) {
proxyAddr = params.avalanche.Proxy
} else if(net.chainId == 65) {
proxyAddr = params.okcTestnet.Proxy
}else if(net.chainId == 66) {
proxyAddr = params.okc.Proxy
} else if (net.chainId == 322) {
proxyAddr = params["kcc-testnet"].Proxy
} else if (net.chainId == 321) {
proxyAddr = params.kcc.Proxy
} else if (net.chainId == 338) {
proxyAddr = params.cronosTestnet.Proxy
} else if (net.chainId == 25) {
proxyAddr = params.cronosMainnet.Proxy
} else {
let networkName = net.name == "homestead" ? "ethereum" : net.name
proxyAddr = params[networkName].Proxy
Expand All @@ -39,7 +53,7 @@ const main = async () => {
{
call: {
fn: "postUpgrade",

}
}
)
Expand Down