Main for apex

README.md

@@ -40,17 +40,3 @@ npx hardhat compile
 # Test contracts with hardhat
 npx hardhat test
 ```
-
-## Contract Address
-
-**Mainnet**
-
-`Factory:`
-
-`TWAMM:`
-
-**Ropsten**
-
-`Factory:`
-
-`TWAMM:`

contracts/Factory.sol

@@ -2,7 +2,6 @@
 
 pragma solidity ^0.8.9;
 
-// import "hardhat/console.sol";
 import "./interfaces/IFactory.sol";
 import "./Pair.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
@@ -11,25 +10,25 @@ contract Factory is IFactory, Initializable {
     mapping(address => mapping(address => address)) public override getPair;
     address[] public override allPairs;
 
-    uint32 public override feeArg;
-    address public override feeTo;
-    address public override feeToSetter;
-    address private twammTheOnlyCaller;
-
-    constructor(address _feeToSetter) {
-        feeToSetter = _feeToSetter;
-    }
+    address public override twammAdd;
+    address public override twammInstantSwapAdd;
+    address public override twammTermSwapAdd;
+    address public override twammLiquidityAdd;
 
     function allPairsLength() external view override returns (uint256) {
         return allPairs.length;
     }
 
-    function initialize(address twammAdd) external override initializer {
-        twammTheOnlyCaller = twammAdd;
-    }
-
-    function returnTwammAddress() external view override returns (address) {
-        return twammTheOnlyCaller;
+    function initialize(
+        address _twammAdd,
+        address _twammInstantSwapAdd,
+        address _twammTermSwapAdd,
+        address _twammLiquidityAdd
+    ) external override initializer {
+        twammAdd = _twammAdd;
+        twammInstantSwapAdd = _twammInstantSwapAdd;
+        twammTermSwapAdd = _twammTermSwapAdd;
+        twammLiquidityAdd = _twammLiquidityAdd;
     }
 
     function createPair(address token0, address token1)
@@ -38,13 +37,10 @@ contract Factory is IFactory, Initializable {
         returns (address pair)
     {
         require(
-            msg.sender == twammTheOnlyCaller,
+            msg.sender == twammAdd,
             "Invalid User, Only TWAMM Can Create Pair"
         );
-        require(
-            twammTheOnlyCaller != address(0),
-            "Factory Not Initialized By TWAMM Yet"
-        );
+        require(twammAdd != address(0), "Factory Not Initialized By TWAMM Yet");
 
         require(token0 != token1, "Factory: Identical Addresses");
 
@@ -58,7 +54,14 @@ contract Factory is IFactory, Initializable {
         bytes memory bytecode = type(Pair).creationCode;
         bytes memory bytecodeArg = abi.encodePacked(
             bytecode,
-            abi.encode(tokenA, tokenB, twammTheOnlyCaller)
+            abi.encode(
+                tokenA,
+                tokenB,
+                twammAdd,
+                twammInstantSwapAdd,
+                twammTermSwapAdd,
+                twammLiquidityAdd
+            )
         );
         bytes32 salt = keccak256(abi.encodePacked(tokenA, tokenB));
         assembly {
@@ -70,19 +73,4 @@ contract Factory is IFactory, Initializable {
         allPairs.push(pair);
         emit PairCreated(tokenA, tokenB, pair, allPairs.length);
     }
-
-    function setFeeArg(uint32 _feeArg) external override {
-        require(msg.sender == feeToSetter, "Factory: Forbidden");
-        feeArg = _feeArg;
-    }
-
-    function setFeeTo(address _feeTo) external override {
-        require(msg.sender == feeToSetter, "Factory: Forbidden");
-        feeTo = _feeTo;
-    }
-
-    function setFeeToSetter(address _feeToSetter) external override {
-        require(msg.sender == feeToSetter, "Factory: Forbidden");
-        feeToSetter = _feeToSetter;
-    }
 }