SwapHelperLib: replace system contract with uniswap router address

contracts/SwapHelperLib.sol

@@ -4,7 +4,6 @@ pragma solidity 0.8.26;
 import "@uniswap/v2-periphery/contracts/interfaces/IUniswapV2Router02.sol";
 import "@uniswap/v2-periphery/contracts/interfaces/IUniswapV2Router01.sol";
 import "./shared/interfaces/IZRC20.sol";
-import "./SystemContract.sol";
 import "./shared/libraries/UniswapV2Library.sol";
 
 library SwapHelperLib {
@@ -112,41 +111,39 @@ library SwapHelperLib {
     }
 
     function swapExactTokensForTokens(
-        SystemContract systemContract,
+        address router,
         address zrc20,
         uint256 amount,
         address targetZRC20,
         uint256 minAmountOut
     ) internal returns (uint256) {
+        address factory = IUniswapV2Router01(router).factory();
+        address wzeta = IUniswapV2Router01(router).WETH();
+
         address[] memory path;
         path = new address[](2);
         path[0] = zrc20;
         path[1] = targetZRC20;
 
         bool isSufficientLiquidity = _isSufficientLiquidity(
-            systemContract.uniswapv2FactoryAddress(),
+            factory,
             amount,
             minAmountOut,
             path
         );
 
-        bool isZETA = targetZRC20 == systemContract.wZetaContractAddress() ||
-            zrc20 == systemContract.wZetaContractAddress();
+        bool isZETA = targetZRC20 == wzeta || zrc20 == wzeta;
 
         if (!isSufficientLiquidity && !isZETA) {
             path = new address[](3);
             path[0] = zrc20;
-            path[1] = systemContract.wZetaContractAddress();
+            path[1] = wzeta;
             path[2] = targetZRC20;
         }
 
-        IZRC20(zrc20).approve(
-            address(systemContract.uniswapv2Router02Address()),
-            amount
-        );
-        uint256[] memory amounts = IUniswapV2Router01(
-            systemContract.uniswapv2Router02Address()
-        ).swapExactTokensForTokens(
+        IZRC20(zrc20).approve(address(router), amount);
+        uint256[] memory amounts = IUniswapV2Router01(router)
+            .swapExactTokensForTokens(
                 amount,
                 minAmountOut,
                 path,
@@ -157,17 +154,16 @@ library SwapHelperLib {
     }
 
     function swapExactTokensForTokensDirectly(
-        SystemContract systemContract,
+        address router,
         address zrc20,
         uint256 amount,
         address targetZRC20,
         uint256 minAmountOut
     ) internal returns (uint256) {
-        bool existsPairPool = _existsPairPool(
-            systemContract.uniswapv2FactoryAddress(),
-            zrc20,
-            targetZRC20
-        );
+        address factory = IUniswapV2Router01(router).factory();
+        address wzeta = IUniswapV2Router01(router).WETH();
+
+        bool existsPairPool = _existsPairPool(factory, zrc20, targetZRC20);
 
         address[] memory path;
         if (existsPairPool) {
@@ -177,17 +173,13 @@ library SwapHelperLib {
         } else {
             path = new address[](3);
             path[0] = zrc20;
-            path[1] = systemContract.wZetaContractAddress();
+            path[1] = wzeta;
             path[2] = targetZRC20;
         }
 
-        IZRC20(zrc20).approve(
-            address(systemContract.uniswapv2Router02Address()),
-            amount
-        );
-        uint256[] memory amounts = IUniswapV2Router01(
-            systemContract.uniswapv2Router02Address()
-        ).swapExactTokensForTokens(
+        IZRC20(zrc20).approve(wzeta, amount);
+        uint256[] memory amounts = IUniswapV2Router01(router)
+            .swapExactTokensForTokens(
                 amount,
                 minAmountOut,
                 path,
@@ -198,17 +190,16 @@ library SwapHelperLib {
     }
 
     function swapTokensForExactTokens(
-        SystemContract systemContract,
+        address router,
         address zrc20,
         uint256 amount,
         address targetZRC20,
         uint256 amountInMax
     ) internal returns (uint256) {
-        bool existsPairPool = _existsPairPool(
-            systemContract.uniswapv2FactoryAddress(),
-            zrc20,
-            targetZRC20
-        );
+        address factory = IUniswapV2Router01(router).factory();
+        address wzeta = IUniswapV2Router01(router).WETH();
+
+        bool existsPairPool = _existsPairPool(factory, zrc20, targetZRC20);
 
         address[] memory path;
         if (existsPairPool) {
@@ -218,17 +209,13 @@ library SwapHelperLib {
         } else {
             path = new address[](3);
             path[0] = zrc20;
-            path[1] = systemContract.wZetaContractAddress();
+            path[1] = wzeta;
             path[2] = targetZRC20;
         }
 
-        IZRC20(zrc20).approve(
-            address(systemContract.uniswapv2Router02Address()),
-            amountInMax
-        );
-        uint256[] memory amounts = IUniswapV2Router01(
-            systemContract.uniswapv2Router02Address()
-        ).swapTokensForExactTokens(
+        IZRC20(zrc20).approve(router, amountInMax);
+        uint256[] memory amounts = IUniswapV2Router01(router)
+            .swapTokensForExactTokens(
                 amount,
                 amountInMax,
                 path,
@@ -239,28 +226,31 @@ library SwapHelperLib {
     }
 
     function getMinOutAmount(
-        SystemContract systemContract,
+        address router,
         address zrc20,
         address target,
         uint256 amountIn
     ) public view returns (uint256 minOutAmount) {
+        address factory = IUniswapV2Router01(router).factory();
+        address wzeta = IUniswapV2Router01(router).WETH();
+
         address[] memory path;
 
         path = new address[](2);
         path[0] = zrc20;
         path[1] = target;
         uint[] memory amounts1 = UniswapV2Library.getAmountsOut(
-            systemContract.uniswapv2FactoryAddress(),
+            factory,
             amountIn,
             path
         );
 
         path = new address[](3);
         path[0] = zrc20;
-        path[1] = systemContract.wZetaContractAddress();
+        path[1] = wzeta;
         path[2] = target;
         uint[] memory amounts2 = UniswapV2Library.getAmountsOut(
-            systemContract.uniswapv2FactoryAddress(),
+            factory,
             amountIn,
             path
         );

typechain-types/@openzeppelin/contracts/index.ts

@@ -1,5 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+import type * as interfaces from "./interfaces";
+export type { interfaces };
 import type * as token from "./token";
 export type { token };

typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.ts

@@ -0,0 +1,55 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { BaseContract, Signer, utils } from "ethers";
+
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "../../../../common";
+
+export interface IERC1155ErrorsInterface extends utils.Interface {
+  functions: {};
+
+  events: {};
+}
+
+export interface IERC1155Errors extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IERC1155ErrorsInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {};
+
+  callStatic: {};
+
+  filters: {};
+
+  estimateGas: {};
+
+  populateTransaction: {};
+}

typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.ts

@@ -0,0 +1,55 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { BaseContract, Signer, utils } from "ethers";
+
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "../../../../common";
+
+export interface IERC20ErrorsInterface extends utils.Interface {
+  functions: {};
+
+  events: {};
+}
+
+export interface IERC20Errors extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IERC20ErrorsInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {};
+
+  callStatic: {};
+
+  filters: {};
+
+  estimateGas: {};
+
+  populateTransaction: {};
+}

typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.ts

@@ -0,0 +1,55 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type { BaseContract, Signer, utils } from "ethers";
+
+import type { Listener, Provider } from "@ethersproject/providers";
+import type {
+  TypedEventFilter,
+  TypedEvent,
+  TypedListener,
+  OnEvent,
+} from "../../../../common";
+
+export interface IERC721ErrorsInterface extends utils.Interface {
+  functions: {};
+
+  events: {};
+}
+
+export interface IERC721Errors extends BaseContract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  interface: IERC721ErrorsInterface;
+
+  queryFilter<TEvent extends TypedEvent>(
+    event: TypedEventFilter<TEvent>,
+    fromBlockOrBlockhash?: string | number | undefined,
+    toBlock?: string | number | undefined
+  ): Promise<Array<TEvent>>;
+
+  listeners<TEvent extends TypedEvent>(
+    eventFilter?: TypedEventFilter<TEvent>
+  ): Array<TypedListener<TEvent>>;
+  listeners(eventName?: string): Array<Listener>;
+  removeAllListeners<TEvent extends TypedEvent>(
+    eventFilter: TypedEventFilter<TEvent>
+  ): this;
+  removeAllListeners(eventName?: string): this;
+  off: OnEvent<this>;
+  on: OnEvent<this>;
+  once: OnEvent<this>;
+  removeListener: OnEvent<this>;
+
+  functions: {};
+
+  callStatic: {};
+
+  filters: {};
+
+  estimateGas: {};
+
+  populateTransaction: {};
+}

typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts

@@ -0,0 +1,6 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export type { IERC1155Errors } from "./IERC1155Errors";
+export type { IERC20Errors } from "./IERC20Errors";
+export type { IERC721Errors } from "./IERC721Errors";

typechain-types/@openzeppelin/contracts/interfaces/index.ts

@@ -0,0 +1,5 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import type * as draftIerc6093Sol from "./draft-IERC6093.sol";
+export type { draftIerc6093Sol };