From 8d092052b2cda5cf1e8ca98fefc521010e1b127a Mon Sep 17 00:00:00 2001 From: seshanthS Date: Fri, 31 Mar 2023 19:27:23 +0530 Subject: [PATCH 1/2] update contracts & script --- contracts/DexForwarderAvalanche.sol | 2 +- contracts/DexForwarderOKC.sol | 2 +- contracts/DexForwarderOptimism.sol | 2 +- contracts/dex.sol | 2 +- scripts/upgrade.js | 18 ++++++++++++++++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/contracts/DexForwarderAvalanche.sol b/contracts/DexForwarderAvalanche.sol index d97f577..4b0211e 100644 --- a/contracts/DexForwarderAvalanche.sol +++ b/contracts/DexForwarderAvalanche.sol @@ -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); } diff --git a/contracts/DexForwarderOKC.sol b/contracts/DexForwarderOKC.sol index 70948db..ea93653 100644 --- a/contracts/DexForwarderOKC.sol +++ b/contracts/DexForwarderOKC.sol @@ -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); } diff --git a/contracts/DexForwarderOptimism.sol b/contracts/DexForwarderOptimism.sol index dc430e4..2ca81e7 100644 --- a/contracts/DexForwarderOptimism.sol +++ b/contracts/DexForwarderOptimism.sol @@ -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); } diff --git a/contracts/dex.sol b/contracts/dex.sol index fa83803..d1032d1 100644 --- a/contracts/dex.sol +++ b/contracts/dex.sol @@ -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); } diff --git a/scripts/upgrade.js b/scripts/upgrade.js index 5b52442..6ec2c9e 100644 --- a/scripts/upgrade.js +++ b/scripts/upgrade.js @@ -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) } @@ -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 @@ -39,7 +53,7 @@ const main = async () => { { call: { fn: "postUpgrade", - + } } ) From c938af2eff38cda589e8f4153dc9aa63feaf54d9 Mon Sep 17 00:00:00 2001 From: seshanthS Date: Fri, 31 Mar 2023 19:30:47 +0530 Subject: [PATCH 2/2] add proxy address --- parameters/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parameters/index.js b/parameters/index.js index d10ddb2..087e6af 100644 --- a/parameters/index.js +++ b/parameters/index.js @@ -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: {