add neon-test && remove mixSwap

config/neon-test-config.js

@@ -0,0 +1,68 @@
+module.exports = {
+    NEON_TEST_CONFIG: {
+        //DODOV1
+        DODO: "",
+        DODOZoo: "",
+
+        //TOKEN
+        WETH: "",
+        DODO: "",
+
+        //Helper
+        DODOSellHelper: "",
+        DODOCalleeHelper: "",
+        DODOV1PmmHelper: "",
+        DODOV2RouteHelper: "",
+        ERC20Helper: "",
+        DODOSwapCalcHelper: "",
+        MultiCall: "",
+        CurveSample: "",
+
+        //Template
+        CloneFactory: "",
+        FeeRateModel: "",
+        FeeRateDIP3: "",
+        PermissionManager: "",
+        DVM: "",
+        DPP: "",
+        DSP: "",
+        DPPAdmin: "",
+        CP: "",
+        ERC20MineV2: "",
+        ERC20MineV3: "",
+        ERC20: "",
+        CustomERC20: "",
+
+        //Factory
+        DVMFactory: "",
+        DPPFactory: "",
+        DSPFactory: "",
+        UpCpFactory: "",
+        CrowdPoolingFactory: "",
+        ERC20V2Factory: "",
+        DODOMineV2Factory: "",
+        DODOMineV3Registry: "",
+
+        //Approve
+        DODOApprove: "",
+        DODOApproveProxy: "",
+
+        //Adapter
+        DODOV1Adapter: "",
+        DODOV2Adapter: "",
+        UniAdapter: "",
+        CurveAdapter: "",
+
+
+        //Proxy
+        DODOV2Proxy: "",
+        DSPProxy: "",
+        CpProxy: "",
+        RouteProxy: "",
+        DODOMineV3Proxy: "",
+
+        //Account
+        multiSigAddress: "",
+        defaultMaintainer: ""
+    }
+}

configAdapter.js

@@ -8,6 +8,7 @@ const { MATIC_CONFIG } = require("./config/matic-config");
 const { ARB_CONFIG } = require("./config/arb-config");
 const { RINKEBY_CONFIG } = require("./config/rinkeby-config");
 const { OK_CONFIG } = require("./config/ok-config");
+const { NEON_TEST_CONFIG } = require("./config/neon-test-config");
 
 exports.GetConfig = function (network, accounts) {
     var CONFIG = {}
@@ -41,6 +42,11 @@ exports.GetConfig = function (network, accounts) {
             CONFIG.multiSigAddress = accounts[0]
             CONFIG.defaultMaintainer = accounts[0]
             break;
+        case "neon_test":
+            CONFIG = NEON_TEST_CONFIG
+            CONFIG.multiSigAddress = accounts[0]
+            CONFIG.defaultMaintainer = accounts[0]
+            break;
         case "mbtestnet":
             CONFIG = MBTEST_CONFIG
             CONFIG.multiSigAddress = accounts[0]

contracts/SmartRoute/DODOV2Proxy02.sol

@@ -556,60 +556,6 @@ contract DODOV2Proxy02 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
         emit OrderHistory(_fromToken, _toToken, msg.sender, fromTokenAmount, returnAmount);
     }
 
-
-    // function mixSwap(
-    //     address fromToken,
-    //     address toToken,
-    //     uint256 fromTokenAmount,
-    //     uint256 minReturnAmount,
-    //     address[] memory mixAdapters,
-    //     address[] memory mixPairs,
-    //     address[] memory assetTo,
-    //     uint256 directions,
-    //     bool,
-    //     uint256 deadLine
-    // ) external override payable judgeExpired(deadLine) returns (uint256 returnAmount) {
-    //     require(mixPairs.length > 0, "DODOV2Proxy02: PAIRS_EMPTY");
-    //     require(mixPairs.length == mixAdapters.length, "DODOV2Proxy02: PAIR_ADAPTER_NOT_MATCH");
-    //     require(mixPairs.length == assetTo.length - 1, "DODOV2Proxy02: PAIR_ASSETTO_NOT_MATCH");
-    //     require(minReturnAmount > 0, "DODOV2Proxy02: RETURN_AMOUNT_ZERO");
-
-    //     address _fromToken = fromToken;
-    //     address _toToken = toToken;
-    //     uint256 _fromTokenAmount = fromTokenAmount;
-        
-    //     uint256 toTokenOriginBalance = IERC20(_toToken).universalBalanceOf(msg.sender);
-        
-    //     _deposit(msg.sender, assetTo[0], _fromToken, _fromTokenAmount, _fromToken == _ETH_ADDRESS_);
-
-    //     for (uint256 i = 0; i < mixPairs.length; i++) {
-    //         if (directions & 1 == 0) {
-    //             IDODOAdapter(mixAdapters[i]).sellBase(assetTo[i + 1],mixPairs[i], "");
-    //         } else {
-    //             IDODOAdapter(mixAdapters[i]).sellQuote(assetTo[i + 1],mixPairs[i], "");
-    //         }
-    //         directions = directions >> 1;
-    //     }
-
-    //     if(_toToken == _ETH_ADDRESS_) {
-    //         returnAmount = IWETH(_WETH_).balanceOf(address(this));
-    //         IWETH(_WETH_).withdraw(returnAmount);
-    //         msg.sender.transfer(returnAmount);
-    //     }else {
-    //         returnAmount = IERC20(_toToken).tokenBalanceOf(msg.sender).sub(toTokenOriginBalance);
-    //     }
-
-    //     require(returnAmount >= minReturnAmount, "DODOV2Proxy02: Return amount is not enough");
-
-    //     emit OrderHistory(
-    //         _fromToken,
-    //         _toToken,
-    //         msg.sender,
-    //         _fromTokenAmount,
-    //         returnAmount
-    //     );
-    // }
-
     //============ CrowdPooling Functions (bid) ============
     function bid(
         address cpAddress,

contracts/SmartRoute/intf/IDODOV2Proxy01.sol

@@ -132,17 +132,4 @@ interface IDODOV2Proxy01 {
         uint256 deadLine
     ) external payable returns (uint256 returnAmount);
 
-    function mixSwap(
-        address fromToken,
-        address toToken,
-        uint256 fromTokenAmount,
-        uint256 minReturnAmount,
-        address[] memory mixAdapters,
-        address[] memory mixPairs,
-        address[] memory assetTo,
-        uint256 directions,
-        bool isIncentive,
-        uint256 deadLine
-    ) external payable returns (uint256 returnAmount);
-
 }

truffle-config.js

@@ -180,6 +180,15 @@ module.exports = {
       gasPrice: 0,
     },
 
+    neon_test: {
+      networkCheckTimeout: 100000,
+      provider: () => {
+        return new HDWalletProvider(privKey, 'https://proxy.testnet.neonlabs.org/solana')
+      },
+      network_id: 111,
+      gasPrice: 0,
+    },
+
     arbtest: {
       provider: function () {
         return wrapProvider(