WIP: fix outputAmountPerEth isZero

contracts/erc20/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1658950329,
-        "version": "3.3.33",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1655244958,
         "version": "3.3.32",

contracts/erc20/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v3.3.33 - _July 27, 2022_
-
-    * Dependencies updated
-
 ## v3.3.32 - _June 14, 2022_
 
     * Dependencies updated

contracts/erc20/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-erc20",
-    "version": "3.3.33",
+    "version": "3.3.32",
     "engines": {
         "node": ">=6.12"
     },
@@ -53,8 +53,8 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.0",
         "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.24",
-        "@0x/contracts-utils": "^4.8.14",
+        "@0x/contracts-test-utils": "^5.4.23",
+        "@0x/contracts-utils": "^4.8.13",
         "@0x/dev-utils": "^4.2.14",
         "@0x/sol-compiler": "^4.8.1",
         "@0x/ts-doc-gen": "^0.0.28",

contracts/test-utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1658950329,
-        "version": "5.4.24",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1655244958,
         "version": "5.4.23",

contracts/test-utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v5.4.24 - _July 27, 2022_
-
-    * Dependencies updated
-
 ## v5.4.23 - _June 14, 2022_
 
     * Dependencies updated

contracts/test-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-test-utils",
-    "version": "5.4.24",
+    "version": "5.4.23",
     "engines": {
         "node": ">=6.12"
     },
@@ -44,7 +44,7 @@
     "dependencies": {
         "@0x/assert": "^3.0.34",
         "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.17.0",
+        "@0x/contract-addresses": "^6.16.0",
         "@0x/dev-utils": "^4.2.14",
         "@0x/json-schemas": "^6.4.4",
         "@0x/order-utils": "^10.4.28",

contracts/treasury/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1658950329,
-        "version": "1.4.16",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1655244958,
         "version": "1.4.15",

contracts/treasury/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.4.16 - _July 27, 2022_
-
-    * Dependencies updated
-
 ## v1.4.15 - _June 14, 2022_
 
     * Dependencies updated

contracts/treasury/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-treasury",
-    "version": "1.4.16",
+    "version": "1.4.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -47,12 +47,12 @@
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/treasury",
     "devDependencies": {
         "@0x/abi-gen": "^5.8.0",
-        "@0x/contract-addresses": "^6.17.0",
+        "@0x/contract-addresses": "^6.16.0",
         "@0x/contracts-asset-proxy": "^3.7.19",
-        "@0x/contracts-erc20": "^3.3.33",
+        "@0x/contracts-erc20": "^3.3.32",
         "@0x/contracts-gen": "^2.0.46",
         "@0x/contracts-staking": "^2.0.45",
-        "@0x/contracts-test-utils": "^5.4.24",
+        "@0x/contracts-test-utils": "^5.4.23",
         "@0x/sol-compiler": "^4.8.1",
         "@0x/ts-doc-gen": "^0.0.28",
         "@0x/tslint-config": "^4.1.4",
@@ -73,7 +73,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^6.5.0",
-        "@0x/protocol-utils": "^11.16.0",
+        "@0x/protocol-utils": "^11.15.0",
         "@0x/subproviders": "^6.6.5",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/utils/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1658950329,
-        "version": "4.8.14",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1655244958,
         "version": "4.8.13",

contracts/utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v4.8.14 - _July 27, 2022_
-
-    * Dependencies updated
-
 ## v4.8.13 - _June 14, 2022_
 
     * Dependencies updated

contracts/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-utils",
-    "version": "4.8.14",
+    "version": "4.8.13",
     "engines": {
         "node": ">=6.12"
     },
@@ -52,7 +52,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.0",
         "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.24",
+        "@0x/contracts-test-utils": "^5.4.23",
         "@0x/dev-utils": "^4.2.14",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.1",

contracts/zero-ex/CHANGELOG.json

@@ -1,14 +1,4 @@
 [
-    {
-        "version": "0.36.0",
-        "changes": [
-            {
-                "note": "Add Synthetix support in Ethereum and Optimism bridge adapters",
-                "pr": 518
-            }
-        ],
-        "timestamp": 1658950329
-    },
     {
         "version": "0.35.0",
         "changes": [

contracts/zero-ex/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v0.36.0 - _July 27, 2022_
-
-    * Add Synthetix support in Ethereum and Optimism bridge adapters (#518)
-
 ## v0.35.0 - _June 14, 2022_
 
     * Adds support for Velodrome OptimismBridgeAdapter (#494)

contracts/zero-ex/contracts/src/transformers/bridges/BridgeProtocols.sol

@@ -57,5 +57,4 @@ library BridgeProtocols {
     uint128 internal constant PLATYPUS        = 27;
     uint128 internal constant BANCORV3        = 28;
     uint128 internal constant VELODROME       = 29;
-    uint128 internal constant SYNTHETIX       = 30;
 }

contracts/zero-ex/contracts/src/transformers/bridges/EthereumBridgeAdapter.sol

@@ -37,10 +37,10 @@ import "./mixins/MixinDodoV2.sol";
 import "./mixins/MixinKyberDmm.sol";
 import "./mixins/MixinLido.sol";
 import "./mixins/MixinMakerPSM.sol";
+import "./mixins/MixinMooniswap.sol";
 import "./mixins/MixinMStable.sol";
 import "./mixins/MixinNerve.sol";
 import "./mixins/MixinShell.sol";
-import "./mixins/MixinSynthetix.sol";
 import "./mixins/MixinUniswap.sol";
 import "./mixins/MixinUniswapV2.sol";
 import "./mixins/MixinUniswapV3.sol";
@@ -63,10 +63,10 @@ contract EthereumBridgeAdapter is
     MixinKyberDmm,
     MixinLido,
     MixinMakerPSM,
+    MixinMooniswap,
     MixinMStable,
     MixinNerve,
     MixinShell,
-    MixinSynthetix,
     MixinUniswap,
     MixinUniswapV2,
     MixinUniswapV3,
@@ -79,6 +79,7 @@ contract EthereumBridgeAdapter is
         MixinCompound(weth)
         MixinCurve(weth)
         MixinLido(weth)
+        MixinMooniswap(weth)
         MixinUniswap(weth)
     {}
 
@@ -162,6 +163,14 @@ contract EthereumBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
+        } else if (protocolId == BridgeProtocols.MOONISWAP) {
+            if (dryRun) { return (0, true); }
+            boughtAmount = _tradeMooniswap(
+                sellToken,
+                buyToken,
+                sellAmount,
+                order.bridgeData
+            );
         } else if (protocolId == BridgeProtocols.MSTABLE) {
             if (dryRun) { return (0, true); }
             boughtAmount = _tradeMStable(
@@ -251,12 +260,6 @@ contract EthereumBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
-        } else if (protocolId == BridgeProtocols.SYNTHETIX) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeSynthetix(
-                sellAmount,
-                order.bridgeData
-            );
         } else if (protocolId == BridgeProtocols.UNKNOWN) {
             if (dryRun) { return (0, true); }
             boughtAmount = _tradeZeroExBridge(

contracts/zero-ex/contracts/src/transformers/bridges/OptimismBridgeAdapter.sol

@@ -25,7 +25,6 @@ import "./BridgeProtocols.sol";
 import "./mixins/MixinCurve.sol";
 import "./mixins/MixinCurveV2.sol";
 import "./mixins/MixinNerve.sol";
-import "./mixins/MixinSynthetix.sol";
 import "./mixins/MixinUniswapV3.sol";
 import "./mixins/MixinVelodrome.sol";
 import "./mixins/MixinZeroExBridge.sol";
@@ -35,7 +34,6 @@ contract OptimismBridgeAdapter is
     MixinCurve,
     MixinCurveV2,
     MixinNerve,
-    MixinSynthetix,
     MixinUniswapV3,
     MixinVelodrome,
     MixinZeroExBridge
@@ -95,12 +93,6 @@ contract OptimismBridgeAdapter is
                 sellAmount,
                 order.bridgeData
             );
-        } else if (protocolId == BridgeProtocols.SYNTHETIX) {
-            if (dryRun) { return (0, true); }
-            boughtAmount = _tradeSynthetix(
-                sellAmount,
-                order.bridgeData
-            );
         } else if (protocolId == BridgeProtocols.UNKNOWN) {
             if (dryRun) { return (0, true); }            
             boughtAmount = _tradeZeroExBridge(

contracts/zero-ex/contracts/src/transformers/bridges/mixins/MixinSynthetix.sol

@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2022 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6.5;
-pragma experimental ABIEncoderV2;
-
-interface ISynthetix {
-    // Ethereum Mainnet
-    function exchangeAtomically(
-        bytes32 sourceCurrencyKey,
-        uint256 sourceAmount,
-        bytes32 destinationCurrencyKey,
-        bytes32 trackingCode,
-        uint256 minAmount
-    ) external returns (uint256 amountReceived);
-
-    // Optimism
-    function exchangeWithTracking(
-        bytes32 sourceCurrencyKey,
-        uint256 sourceAmount,
-        bytes32 destinationCurrencyKey,
-        address rewardAddress,
-        bytes32 trackingCode
-    ) external returns (uint256 amountReceived);
-}
-
-contract MixinSynthetix {
-    address private constant rewardAddress =
-        0x5C80239D97E1eB216b5c3D8fBa5DE5Be5d38e4C9;
-    bytes32 constant trackingCode =
-        0x3058000000000000000000000000000000000000000000000000000000000000;
-
-    function _tradeSynthetix(uint256 sellAmount, bytes memory bridgeData)
-        public
-        returns (uint256 boughtAmount)
-    {
-        (
-            ISynthetix synthetix,
-            bytes32 sourceCurrencyKey,
-            bytes32 destinationCurrencyKey
-        ) = abi.decode(
-                bridgeData,
-                (ISynthetix, bytes32, bytes32)
-            );
-
-        boughtAmount = exchange(
-            synthetix,
-            sourceCurrencyKey,
-            destinationCurrencyKey,
-            sellAmount
-        );
-    }
-
-    function exchange(
-        ISynthetix synthetix,
-        bytes32 sourceCurrencyKey,
-        bytes32 destinationCurrencyKey,
-        uint256 sellAmount
-    ) internal returns (uint256 boughtAmount) {
-        uint256 chainId;
-        assembly {
-            chainId := chainid()
-        }
-
-        if (chainId == 1) {
-            boughtAmount = synthetix.exchangeAtomically(
-                sourceCurrencyKey,
-                sellAmount,
-                destinationCurrencyKey,
-                trackingCode,
-                0
-            );
-        } else {
-            boughtAmount = synthetix.exchangeWithTracking(
-                sourceCurrencyKey,
-                sellAmount,
-                destinationCurrencyKey,
-                rewardAddress,
-                trackingCode
-            );
-        }
-    }
-}

contracts/zero-ex/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-zero-ex",
-    "version": "0.36.0",
+    "version": "0.35.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -43,7 +43,7 @@
     "config": {
         "publicInterfaceContracts": "IZeroEx,ZeroEx,FullMigration,InitialMigration,IFlashWallet,IERC20Transformer,IOwnableFeature,ISimpleFunctionRegistryFeature,ITransformERC20Feature,FillQuoteTransformer,PayTakerTransformer,PositiveSlippageFeeTransformer,WethTransformer,OwnableFeature,SimpleFunctionRegistryFeature,TransformERC20Feature,AffiliateFeeTransformer,MetaTransactionsFeature,LogMetadataTransformer,LiquidityProviderFeature,ILiquidityProviderFeature,NativeOrdersFeature,INativeOrdersFeature,FeeCollectorController,FeeCollector,CurveLiquidityProvider,BatchFillNativeOrdersFeature,IBatchFillNativeOrdersFeature,MultiplexFeature,IMultiplexFeature,OtcOrdersFeature,IOtcOrdersFeature,AvalancheBridgeAdapter,BSCBridgeAdapter,CeloBridgeAdapter,EthereumBridgeAdapter,FantomBridgeAdapter,OptimismBridgeAdapter,PolygonBridgeAdapter",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MixinAaveV2|MixinBalancer|MixinBalancerV2|MixinBalancerV2Batch|MixinBancor|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinShell|MixinSynthetix|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinVelodrome|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
+        "abis": "./test/generated-artifacts/@(AbstractBridgeAdapter|AffiliateFeeTransformer|AvalancheBridgeAdapter|BSCBridgeAdapter|BatchFillNativeOrdersFeature|BootstrapFeature|BridgeProtocols|CeloBridgeAdapter|CurveLiquidityProvider|ERC1155OrdersFeature|ERC165Feature|ERC721OrdersFeature|EthereumBridgeAdapter|FantomBridgeAdapter|FeeCollector|FeeCollectorController|FillQuoteTransformer|FixinCommon|FixinEIP712|FixinERC1155Spender|FixinERC721Spender|FixinProtocolFees|FixinReentrancyGuard|FixinTokenSpender|FlashWallet|FullMigration|FundRecoveryFeature|IBatchFillNativeOrdersFeature|IBootstrapFeature|IBridgeAdapter|IERC1155OrdersFeature|IERC1155Token|IERC165Feature|IERC20Bridge|IERC20Transformer|IERC721OrdersFeature|IERC721Token|IFeature|IFeeRecipient|IFlashWallet|IFundRecoveryFeature|ILiquidityProvider|ILiquidityProviderFeature|ILiquidityProviderSandbox|IMetaTransactionsFeature|IMooniswapPool|IMultiplexFeature|INativeOrdersEvents|INativeOrdersFeature|IOtcOrdersFeature|IOwnableFeature|IPancakeSwapFeature|IPropertyValidator|ISimpleFunctionRegistryFeature|IStaking|ITakerCallback|ITestSimpleFunctionRegistryFeature|ITokenSpenderFeature|ITransformERC20Feature|IUniswapFeature|IUniswapV2Pair|IUniswapV3Feature|IUniswapV3Pool|IZeroEx|InitialMigration|LibBootstrap|LibCommonRichErrors|LibERC1155OrdersStorage|LibERC20Transformer|LibERC721OrdersStorage|LibFeeCollector|LibLiquidityProviderRichErrors|LibMetaTransactionsRichErrors|LibMetaTransactionsStorage|LibMigrate|LibNFTOrder|LibNFTOrdersRichErrors|LibNativeOrder|LibNativeOrdersRichErrors|LibNativeOrdersStorage|LibOtcOrdersStorage|LibOwnableRichErrors|LibOwnableStorage|LibProxyRichErrors|LibProxyStorage|LibReentrancyGuardStorage|LibSignature|LibSignatureRichErrors|LibSimpleFunctionRegistryRichErrors|LibSimpleFunctionRegistryStorage|LibStorage|LibTransformERC20RichErrors|LibTransformERC20Storage|LibWalletRichErrors|LiquidityProviderFeature|LiquidityProviderSandbox|LogMetadataTransformer|MetaTransactionsFeature|MixinAaveV2|MixinBalancer|MixinBalancerV2|MixinBalancerV2Batch|MixinBancor|MixinBancorV3|MixinCompound|MixinCryptoCom|MixinCurve|MixinCurveV2|MixinDodo|MixinDodoV2|MixinGMX|MixinKyberDmm|MixinLido|MixinMStable|MixinMakerPSM|MixinMooniswap|MixinNerve|MixinPlatypus|MixinShell|MixinUniswap|MixinUniswapV2|MixinUniswapV3|MixinVelodrome|MixinZeroExBridge|MooniswapLiquidityProvider|MultiplexFeature|MultiplexLiquidityProvider|MultiplexOtc|MultiplexRfq|MultiplexTransformERC20|MultiplexUniswapV2|MultiplexUniswapV3|NFTOrders|NativeOrdersCancellation|NativeOrdersFeature|NativeOrdersInfo|NativeOrdersProtocolFees|NativeOrdersSettlement|OptimismBridgeAdapter|OtcOrdersFeature|OwnableFeature|PancakeSwapFeature|PayTakerTransformer|PermissionlessTransformerDeployer|PolygonBridgeAdapter|PositiveSlippageFeeTransformer|SimpleFunctionRegistryFeature|TestBridge|TestCallTarget|TestCurve|TestDelegateCaller|TestFeeCollectorController|TestFeeRecipient|TestFillQuoteTransformerBridge|TestFillQuoteTransformerExchange|TestFillQuoteTransformerHost|TestFixinProtocolFees|TestFixinTokenSpender|TestFullMigration|TestInitialMigration|TestLibNativeOrder|TestLibSignature|TestLiquidityProvider|TestMetaTransactionsNativeOrdersFeature|TestMetaTransactionsTransformERC20Feature|TestMigrator|TestMintTokenERC20Transformer|TestMintableERC1155Token|TestMintableERC20Token|TestMintableERC721Token|TestMooniswap|TestNFTOrderPresigner|TestNativeOrdersFeature|TestNoEthRecipient|TestOrderSignerRegistryWithContractWallet|TestPermissionlessTransformerDeployerSuicidal|TestPermissionlessTransformerDeployerTransformer|TestPropertyValidator|TestRfqOriginRegistration|TestSimpleFunctionRegistryFeatureImpl1|TestSimpleFunctionRegistryFeatureImpl2|TestStaking|TestTokenSpenderERC20Token|TestTransformERC20|TestTransformerBase|TestTransformerDeployerTransformer|TestTransformerHost|TestUniswapV2Factory|TestUniswapV2Pool|TestUniswapV3Factory|TestUniswapV3Feature|TestUniswapV3Pool|TestWeth|TestWethTransformerHost|TestZeroExFeature|TransformERC20Feature|Transformer|TransformerDeployer|UniswapFeature|UniswapV3Feature|WethTransformer|ZeroEx|ZeroExOptimized).json"
     },
     "repository": {
         "type": "git",
@@ -56,10 +56,10 @@
     "homepage": "https://github.com/0xProject/protocol/tree/main/contracts/zero-ex",
     "devDependencies": {
         "@0x/abi-gen": "^5.8.0",
-        "@0x/contract-addresses": "^6.17.0",
-        "@0x/contracts-erc20": "^3.3.33",
+        "@0x/contract-addresses": "^6.16.0",
+        "@0x/contracts-erc20": "^3.3.32",
         "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.24",
+        "@0x/contracts-test-utils": "^5.4.23",
         "@0x/dev-utils": "^4.2.14",
         "@0x/order-utils": "^10.4.28",
         "@0x/sol-compiler": "^4.8.1",
@@ -83,7 +83,7 @@
     },
     "dependencies": {
         "@0x/base-contract": "^6.5.0",
-        "@0x/protocol-utils": "^11.16.0",
+        "@0x/protocol-utils": "^11.15.0",
         "@0x/subproviders": "^6.6.5",
         "@0x/types": "^3.3.6",
         "@0x/typescript-typings": "^5.3.1",

contracts/zero-ex/test/artifacts.ts

@@ -124,7 +124,6 @@ import * as MixinMStable from '../test/generated-artifacts/MixinMStable.json';
 import * as MixinNerve from '../test/generated-artifacts/MixinNerve.json';
 import * as MixinPlatypus from '../test/generated-artifacts/MixinPlatypus.json';
 import * as MixinShell from '../test/generated-artifacts/MixinShell.json';
-import * as MixinSynthetix from '../test/generated-artifacts/MixinSynthetix.json';
 import * as MixinUniswap from '../test/generated-artifacts/MixinUniswap.json';
 import * as MixinUniswapV2 from '../test/generated-artifacts/MixinUniswapV2.json';
 import * as MixinUniswapV3 from '../test/generated-artifacts/MixinUniswapV3.json';
@@ -348,7 +347,6 @@ export const artifacts = {
     MixinNerve: MixinNerve as ContractArtifact,
     MixinPlatypus: MixinPlatypus as ContractArtifact,
     MixinShell: MixinShell as ContractArtifact,
-    MixinSynthetix: MixinSynthetix as ContractArtifact,
     MixinUniswap: MixinUniswap as ContractArtifact,
     MixinUniswapV2: MixinUniswapV2 as ContractArtifact,
     MixinUniswapV3: MixinUniswapV3 as ContractArtifact,

contracts/zero-ex/test/wrappers.ts

@@ -122,7 +122,6 @@ export * from '../test/generated-wrappers/mixin_mooniswap';
 export * from '../test/generated-wrappers/mixin_nerve';
 export * from '../test/generated-wrappers/mixin_platypus';
 export * from '../test/generated-wrappers/mixin_shell';
-export * from '../test/generated-wrappers/mixin_synthetix';
 export * from '../test/generated-wrappers/mixin_uniswap';
 export * from '../test/generated-wrappers/mixin_uniswap_v2';
 export * from '../test/generated-wrappers/mixin_uniswap_v3';

contracts/zero-ex/tsconfig.json

@@ -161,7 +161,6 @@
         "test/generated-artifacts/MixinNerve.json",
         "test/generated-artifacts/MixinPlatypus.json",
         "test/generated-artifacts/MixinShell.json",
-        "test/generated-artifacts/MixinSynthetix.json",
         "test/generated-artifacts/MixinUniswap.json",
         "test/generated-artifacts/MixinUniswapV2.json",
         "test/generated-artifacts/MixinUniswapV3.json",

packages/asset-swapper/CHANGELOG.json

@@ -5,21 +5,8 @@
             {
                 "note": "Refactor `TokenAdjacency` and `TokenAdjacencyBuilder`",
                 "pr": 517
-            },
-            {
-                "note": "Add Synthetix support`",
-                "pr": 518
-            },
-            {
-                "note": "Replace Beethoven X subgraph URL",
-                "pr": 519
-            },
-            {
-                "note": "Remove Mooniswap on Ethereum mainnet",
-                "pr": 529
             }
-        ],
-        "timestamp": 1658950329
+        ]
     },
     {
         "version": "16.63.1",

packages/asset-swapper/CHANGELOG.md

@@ -5,13 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v16.64.0 - _July 27, 2022_
-
-    * Refactor `TokenAdjacency` and `TokenAdjacencyBuilder` (#517)
-    * Add Synthetix support` (#518)
-    * Replace Beethoven X subgraph URL (#519)
-    * Remove Mooniswap on Ethereum mainnet (#529)
-
 ## v16.63.1 - _July 12, 2022_
 
     * Better error handling for balancer cache (#515)

packages/asset-swapper/contracts/src/ERC20BridgeSampler.sol

@@ -39,7 +39,6 @@ import "./MooniswapSampler.sol";
 import "./NativeOrderSampler.sol";
 import "./PlatypusSampler.sol";
 import "./ShellSampler.sol";
-import "./SynthetixSampler.sol";
 import "./TwoHopSampler.sol";
 import "./UniswapSampler.sol";
 import "./UniswapV2Sampler.sol";
@@ -68,7 +67,6 @@ contract ERC20BridgeSampler is
     NativeOrderSampler,
     PlatypusSampler,
     ShellSampler,
-    SynthetixSampler,
     TwoHopSampler,
     UniswapSampler,
     UniswapV2Sampler,

packages/asset-swapper/contracts/src/SynthetixSampler.sol

@@ -1,173 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-
-  Copyright 2022 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.6;
-pragma experimental ABIEncoderV2;
-
-interface IReadProxyAddressResolver {
-    function target() external view returns (address);
-}
-
-interface IAddressResolver {
-    function getAddress(bytes32 name) external view returns (address);
-}
-
-interface IExchanger {
-    // Ethereum Mainnet
-    function getAmountsForAtomicExchange(
-        uint256 sourceAmount,
-        bytes32 sourceCurrencyKey,
-        bytes32 destinationCurrencyKey
-    )
-        external
-        view
-        returns (
-            uint256 amountReceived,
-            uint256 fee,
-            uint256 exchangeFeeRate
-        );
-
-    // Optimism
-    function getAmountsForExchange(
-        uint256 sourceAmount,
-        bytes32 sourceCurrencyKey,
-        bytes32 destinationCurrencyKey
-    )
-        external
-        view
-        returns (
-            uint256 amountReceived,
-            uint256 fee,
-            uint256 exchangeFeeRate
-        );
-}
-
-contract SynthetixSampler {
-
-    /// @dev Sample sell quotes from Synthetix Atomic Swap.
-    /// @param takerTokenSymbol Symbol (currency key) of the taker token (what to sell).
-    /// @param makerTokenSymbol Symbol (currency key) of the maker token (what to buy).
-    /// @param takerTokenAmounts Taker token sell amount for each sample (sorted in ascending order).
-    /// @return synthetix Synthetix address.
-    /// @return makerTokenAmounts Maker amounts bought at each taker token amount.
-    function sampleSellsFromSynthetix(
-        IReadProxyAddressResolver readProxy,
-        bytes32 takerTokenSymbol,
-        bytes32 makerTokenSymbol,
-        uint256[] memory takerTokenAmounts
-    ) public view returns (address synthetix, uint256[] memory makerTokenAmounts) {
-        synthetix = getSynthetixAddress(readProxy);
-        uint256 numSamples = takerTokenAmounts.length;
-        makerTokenAmounts = new uint256[](numSamples);
-        if (numSamples == 0) {
-            return (synthetix, makerTokenAmounts);
-        }
-
-        makerTokenAmounts[0] = exchange(
-            readProxy,
-            takerTokenAmounts[0],
-            takerTokenSymbol,
-            makerTokenSymbol
-        );
-
-        // Synthetix atomic swap has a fixed rate. Calculate the rest based on the first value (and save gas).
-        for (uint256 i = 1; i < numSamples; i++) {
-            makerTokenAmounts[i] =
-                (makerTokenAmounts[0] * takerTokenAmounts[i]) /
-                takerTokenAmounts[0];
-        }
-    }
-
-    /// @dev Sample buy quotes from Synthetix Atomic Swap.
-    /// @param takerTokenSymbol Symbol (currency key) of the taker token (what to sell).
-    /// @param makerTokenSymbol Symbol (currency key) of the maker token (what to buy).
-    /// @param makerTokenAmounts Maker token buy amount for each sample (sorted in ascending order).
-    /// @return synthetix Synthetix address.
-    /// @return takerTokenAmounts Taker amounts sold at each maker token amount.
-    function sampleBuysFromSynthetix(
-        IReadProxyAddressResolver readProxy,
-        bytes32 takerTokenSymbol,
-        bytes32 makerTokenSymbol,
-        uint256[] memory makerTokenAmounts
-    ) public view returns (address synthetix, uint256[] memory takerTokenAmounts) {
-        synthetix = getSynthetixAddress(readProxy);
-        // Since Synthetix atomic have a fixed rate, we can pick any reasonablely size takerTokenAmount (fixed to 1 ether here) and calculate the rest.
-        uint256 amountReceivedForEther = exchange(
-            readProxy,
-            1 ether,
-            takerTokenSymbol,
-            makerTokenSymbol
-        );
-
-        uint256 numSamples = makerTokenAmounts.length;
-        takerTokenAmounts = new uint256[](numSamples);
-
-        for (uint256 i = 0; i < numSamples; i++) {
-            takerTokenAmounts[i] =
-                (1 ether * makerTokenAmounts[i]) /
-                amountReceivedForEther;
-        }
-    }
-
-    function exchange(
-        IReadProxyAddressResolver readProxy,
-        uint256 sourceAmount,
-        bytes32 sourceCurrencyKey,
-        bytes32 destinationCurrencyKey
-    ) private view returns (uint256 amountReceived) {
-        IExchanger exchanger = getExchanger(readProxy);
-        uint256 chainId;
-        assembly {
-            chainId := chainid()
-        }
-
-        if (chainId == 1) {
-            (amountReceived, , ) = exchanger.getAmountsForAtomicExchange(
-                sourceAmount,
-                sourceCurrencyKey,
-                destinationCurrencyKey
-            );
-        } else {
-            (amountReceived, , ) = exchanger.getAmountsForExchange(
-                sourceAmount,
-                sourceCurrencyKey,
-                destinationCurrencyKey
-            );
-        }
-    }
-
-    function getSynthetixAddress(IReadProxyAddressResolver readProxy)
-        private
-        view
-        returns (address)
-    {
-        return IAddressResolver(readProxy.target()).getAddress("Synthetix");
-    }
-
-    function getExchanger(IReadProxyAddressResolver readProxy)
-        private
-        view
-        returns (IExchanger)
-    {
-        return
-            IExchanger(
-                IAddressResolver(readProxy.target()).getAddress("Exchanger")
-            );
-    }
-}

packages/asset-swapper/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/asset-swapper",
-    "version": "16.64.0",
+    "version": "16.63.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -40,7 +40,7 @@
     "config": {
         "publicInterfaceContracts": "ERC20BridgeSampler,BalanceChecker,FakeTaker",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(ApproximateBuys|BalanceChecker|BalancerSampler|BalancerV2BatchSampler|BalancerV2Common|BalancerV2Sampler|BancorSampler|BancorV3Sampler|CompoundSampler|CurveSampler|DODOSampler|DODOV2Sampler|ERC20BridgeSampler|FakeTaker|GMXSampler|IBalancer|IBalancerV2Vault|IBancor|IBancorV3|ICurve|IGMX|IMStable|IMooniswap|IMultiBridge|IPlatypus|IShell|IUniswapExchangeQuotes|IUniswapV2Router01|KyberDmmSampler|LidoSampler|LiquidityProviderSampler|MStableSampler|MakerPSMSampler|MooniswapSampler|NativeOrderSampler|PlatypusSampler|SamplerUtils|ShellSampler|SynthetixSampler|TestNativeOrderSampler|TwoHopSampler|UniswapSampler|UniswapV2Sampler|UniswapV3Sampler|UtilitySampler|VelodromeSampler).json",
+        "abis": "./test/generated-artifacts/@(ApproximateBuys|BalanceChecker|BalancerSampler|BalancerV2BatchSampler|BalancerV2Common|BalancerV2Sampler|BancorSampler|BancorV3Sampler|CompoundSampler|CurveSampler|DODOSampler|DODOV2Sampler|ERC20BridgeSampler|FakeTaker|GMXSampler|IBalancer|IBalancerV2Vault|IBancor|IBancorV3|ICurve|IGMX|IMStable|IMooniswap|IMultiBridge|IPlatypus|IShell|IUniswapExchangeQuotes|IUniswapV2Router01|KyberDmmSampler|LidoSampler|LiquidityProviderSampler|MStableSampler|MakerPSMSampler|MooniswapSampler|NativeOrderSampler|PlatypusSampler|SamplerUtils|ShellSampler|TestNativeOrderSampler|TwoHopSampler|UniswapSampler|UniswapV2Sampler|UniswapV3Sampler|UtilitySampler|VelodromeSampler).json",
         "postpublish": {
             "assets": []
         }
@@ -61,14 +61,14 @@
     "dependencies": {
         "@0x/assert": "^3.0.34",
         "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.17.0",
-        "@0x/contract-wrappers": "^13.20.5",
-        "@0x/contracts-erc20": "^3.3.33",
-        "@0x/contracts-zero-ex": "^0.36.0",
+        "@0x/contract-addresses": "^6.16.0",
+        "@0x/contract-wrappers": "^13.20.4",
+        "@0x/contracts-erc20": "^3.3.32",
+        "@0x/contracts-zero-ex": "^0.35.0",
         "@0x/dev-utils": "^4.2.14",
         "@0x/json-schemas": "^6.4.4",
         "@0x/neon-router": "^0.3.5",
-        "@0x/protocol-utils": "^11.16.0",
+        "@0x/protocol-utils": "^11.15.0",
         "@0x/quote-server": "^6.0.6",
         "@0x/types": "^3.3.6",
         "@0x/utils": "^6.5.3",
@@ -94,7 +94,7 @@
     "devDependencies": {
         "@0x/abi-gen": "^5.8.0",
         "@0x/contracts-gen": "^2.0.46",
-        "@0x/contracts-test-utils": "^5.4.24",
+        "@0x/contracts-test-utils": "^5.4.23",
         "@0x/sol-compiler": "^4.8.1",
         "@0x/subproviders": "^6.6.5",
         "@0x/ts-doc-gen": "^0.0.28",

packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts

@@ -32,13 +32,16 @@ import {
 import { assert } from '../utils/assert';
 import {
     CURVE_LIQUIDITY_PROVIDER_BY_CHAIN_ID,
+    MOONISWAP_LIQUIDITY_PROVIDER_BY_CHAIN_ID,
     NATIVE_FEE_TOKEN_BY_CHAIN_ID,
 } from '../utils/market_operation_utils/constants';
+import { poolEncoder } from '../utils/market_operation_utils/orders';
 import {
     CurveFillData,
     ERC20BridgeSource,
     FinalUniswapV3FillData,
     LiquidityProviderFillData,
+    MooniswapFillData,
     NativeRfqOrderFillData,
     OptimizedMarketBridgeOrder,
     OptimizedMarketOrder,
@@ -304,6 +307,30 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase {
             };
         }
 
+        if (
+            this.chainId === ChainId.Mainnet &&
+            isDirectSwapCompatible(quote, optsWithDefaults, [ERC20BridgeSource.Mooniswap])
+        ) {
+            const fillData = slippedOrders[0].fillData as MooniswapFillData;
+            return {
+                calldataHexString: this._exchangeProxy
+                    .sellToLiquidityProvider(
+                        isFromETH ? ETH_TOKEN_ADDRESS : sellToken,
+                        isToETH ? ETH_TOKEN_ADDRESS : buyToken,
+                        MOONISWAP_LIQUIDITY_PROVIDER_BY_CHAIN_ID[this.chainId],
+                        NULL_ADDRESS,
+                        sellAmount,
+                        minBuyAmount,
+                        poolEncoder.encode([fillData.poolAddress]),
+                    )
+                    .getABIEncodedTransactionData(),
+                ethAmount: isFromETH ? sellAmount : ZERO_AMOUNT,
+                toAddress: this._exchangeProxy.address,
+                allowanceTarget: this.contractAddresses.exchangeProxy,
+                gasOverhead: ZERO_AMOUNT,
+            };
+        }
+
         // RFQT VIP
         if (
             [ChainId.Mainnet, ChainId.Polygon].includes(this.chainId) &&

packages/asset-swapper/src/utils/market_operation_utils/constants.ts

@@ -1,7 +1,7 @@
 import { ChainId, getContractAddressesForChainOrThrow } from '@0x/contract-addresses';
 import { FillQuoteTransformerOrderType } from '@0x/protocol-utils';
 import { BigNumber } from '@0x/utils';
-import { formatBytes32String, parseBytes32String } from '@ethersproject/strings';
+import { formatBytes32String } from '@ethersproject/strings';
 
 import { TokenAdjacencyGraph, TokenAdjacencyGraphBuilder } from '../token_adjacency_graph';
 
@@ -32,7 +32,6 @@ import {
     MultiHopFillData,
     PlatypusInfo,
     PsmInfo,
-    SynthetixFillData,
     UniswapV2FillData,
     UniswapV3FillData,
 } from './types';
@@ -60,7 +59,6 @@ function valueByChainId<T>(rest: Partial<{ [key in ChainId]: T }>, defaultValue:
         [ChainId.Mainnet]: defaultValue,
         [ChainId.Ropsten]: defaultValue,
         [ChainId.Rinkeby]: defaultValue,
-        [ChainId.Goerli]: defaultValue,
         [ChainId.Kovan]: defaultValue,
         [ChainId.Ganache]: defaultValue,
         [ChainId.BSC]: defaultValue,
@@ -89,6 +87,7 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.Bancor,
             ERC20BridgeSource.BancorV3,
             ERC20BridgeSource.MStable,
+            ERC20BridgeSource.Mooniswap,
             ERC20BridgeSource.SushiSwap,
             ERC20BridgeSource.Shell,
             ERC20BridgeSource.MultiHop,
@@ -107,7 +106,6 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.CurveV2,
             ERC20BridgeSource.ShibaSwap,
             ERC20BridgeSource.Synapse,
-            ERC20BridgeSource.Synthetix,
             // TODO: enable after FQT has been redeployed on Ethereum mainnet
             // ERC20BridgeSource.AaveV2,
             // ERC20BridgeSource.Compound,
@@ -119,17 +117,10 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.UniswapV2,
             ERC20BridgeSource.UniswapV3,
             ERC20BridgeSource.Curve,
+            ERC20BridgeSource.Mooniswap,
         ]),
         [ChainId.Rinkeby]: new SourceFilters([ERC20BridgeSource.Native]),
         [ChainId.Kovan]: new SourceFilters([ERC20BridgeSource.Native]),
-        [ChainId.Goerli]: new SourceFilters([
-            ERC20BridgeSource.Native,
-            ERC20BridgeSource.SushiSwap,
-            ERC20BridgeSource.Uniswap,
-            ERC20BridgeSource.UniswapV2,
-            ERC20BridgeSource.UniswapV3,
-        ]),
-        [ChainId.PolygonMumbai]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
         [ChainId.Ganache]: new SourceFilters([ERC20BridgeSource.Native]),
         [ChainId.BSC]: new SourceFilters([
             ERC20BridgeSource.BakerySwap,
@@ -216,7 +207,6 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.CurveV2,
             ERC20BridgeSource.MultiHop,
             ERC20BridgeSource.Velodrome,
-            ERC20BridgeSource.Synthetix,
         ]),
     },
     new SourceFilters([]),
@@ -237,6 +227,7 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             // ERC20BridgeSource.Bancor, // FIXME: Bancor Buys not implemented in Sampler
             ERC20BridgeSource.BancorV3,
             ERC20BridgeSource.MStable,
+            ERC20BridgeSource.Mooniswap,
             ERC20BridgeSource.Shell,
             ERC20BridgeSource.SushiSwap,
             ERC20BridgeSource.MultiHop,
@@ -255,7 +246,6 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.CurveV2,
             ERC20BridgeSource.ShibaSwap,
             ERC20BridgeSource.Synapse,
-            ERC20BridgeSource.Synthetix,
             // TODO: enable after FQT has been redeployed on Ethereum mainnet
             // ERC20BridgeSource.AaveV2,
             // ERC20BridgeSource.Compound,
@@ -267,15 +257,8 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.UniswapV2,
             ERC20BridgeSource.UniswapV3,
             ERC20BridgeSource.Curve,
+            ERC20BridgeSource.Mooniswap,
         ]),
-        [ChainId.Goerli]: new SourceFilters([
-            ERC20BridgeSource.Native,
-            ERC20BridgeSource.SushiSwap,
-            ERC20BridgeSource.Uniswap,
-            ERC20BridgeSource.UniswapV2,
-            ERC20BridgeSource.UniswapV3,
-        ]),
-        [ChainId.PolygonMumbai]: new SourceFilters([ERC20BridgeSource.Native, ERC20BridgeSource.UniswapV3]),
         [ChainId.Rinkeby]: new SourceFilters([ERC20BridgeSource.Native]),
         [ChainId.Kovan]: new SourceFilters([ERC20BridgeSource.Native]),
         [ChainId.Ganache]: new SourceFilters([ERC20BridgeSource.Native]),
@@ -364,7 +347,6 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.CurveV2,
             ERC20BridgeSource.MultiHop,
             ERC20BridgeSource.Velodrome,
-            ERC20BridgeSource.Synthetix,
         ]),
     },
     new SourceFilters([]),
@@ -383,8 +365,6 @@ export const FEE_QUOTE_SOURCES_BY_CHAIN_ID = valueByChainId<ERC20BridgeSource[]>
         [ChainId.Mainnet]: [ERC20BridgeSource.UniswapV2, ERC20BridgeSource.SushiSwap, ERC20BridgeSource.UniswapV3],
         [ChainId.BSC]: [ERC20BridgeSource.PancakeSwap, ERC20BridgeSource.Mooniswap, ERC20BridgeSource.SushiSwap],
         [ChainId.Ropsten]: [ERC20BridgeSource.UniswapV2, ERC20BridgeSource.SushiSwap],
-        [ChainId.Goerli]: [ERC20BridgeSource.UniswapV2, ERC20BridgeSource.SushiSwap],
-        [ChainId.PolygonMumbai]: [ERC20BridgeSource.UniswapV3],
         [ChainId.Polygon]: [ERC20BridgeSource.QuickSwap, ERC20BridgeSource.SushiSwap, ERC20BridgeSource.UniswapV3],
         [ChainId.Avalanche]: [ERC20BridgeSource.Pangolin, ERC20BridgeSource.TraderJoe, ERC20BridgeSource.SushiSwap],
         [ChainId.Fantom]: [ERC20BridgeSource.SpiritSwap, ERC20BridgeSource.SpookySwap, ERC20BridgeSource.SushiSwap],
@@ -461,11 +441,6 @@ export const MAINNET_TOKENS = {
     EURS: '0xdb25f211ab05b1c97d595516f45794528a807ad8',
     sEUR: '0xd71ecff9342a5ced620049e616c5035f1db98620',
     sETH: '0x5e74c9036fb86bd7ecdcb084a0673efc32ea31cb',
-    sJPY: '0xf6b1c627e95bfc3c1b4c9b825a032ff0fbf3e07d',
-    sGBP: '0x97fe22e7341a0cd8db6f6c021a24dc8f4dad855f',
-    sAUD: '0xf48e200eaf9906362bb1442fca31e0835773b8b4',
-    sKRW: '0x269895a3df4d73b077fc823dd6da1b95f72aaf9b',
-    sCHF: '0x0f83287ff768d1c1e17a42f44d644d7f22e8ee1d',
     stETH: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
     wstETH: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
     LINK: '0x514910771af9ca656af840dff83e8264ecf986ca',
@@ -648,6 +623,10 @@ export const FANTOM_TOKENS = {
     gMIM: '0xc664fc7b8487a3e10824cda768c1d239f2403bbe',
 };
 
+export const GEIST_FANTOM_POOLS = {
+    lendingPool: '0x9fad24f572045c7869117160a571b2e50b10d068',
+};
+
 export const OPTIMISM_TOKENS = {
     WETH: '0x4200000000000000000000000000000000000006',
     USDC: '0x7f5c764cbc14f9669b88837ca1490cca17c31607',
@@ -656,21 +635,6 @@ export const OPTIMISM_TOKENS = {
     WBTC: '0x68f180fcce6836688e9084f035309e29bf0a2095',
     nETH: '0x809dc529f07651bd43a172e8db6f4a7a0d771036',
     sWETH: '0x121ab82b49b2bc4c7901ca46b8277962b4350204',
-    // Synthetix synths:
-    sAAVE: '0x00b8d5a5e1ac97cb4341c4bc4367443c8776e8d9',
-    sAVAX: '0xb2b42b231c68cbb0b4bf2ffebf57782fd97d3da4',
-    sBTC: '0x298b9b95708152ff6968aafd889c6586e9169f1d',
-    sETH: '0xe405de8f52ba7559f9df3c368500b6e6ae6cee49',
-    sEUR: '0xfbc4198702e81ae77c06d58f81b629bdf36f0a71',
-    sLINK: '0xc5db22719a06418028a40a9b5e9a7c02959d0d08',
-    sMATIC: '0x81ddfac111913d3d5218dea999216323b7cd6356',
-    sSOL: '0x8b2f7ae8ca8ee8428b6d76de88326bb413db2766',
-    sUNI: '0xf5a6115aa582fd1beea22bc93b7dc7a785f60d03',
-    sUSD: '0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9',
-};
-
-export const GEIST_FANTOM_POOLS = {
-    lendingPool: '0x9fad24f572045c7869117160a571b2e50b10d068',
 };
 
 export const CURVE_POOLS = {
@@ -887,15 +851,6 @@ export const DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID = valueByChainId<string[]>(
             '0xad6d458402f60fd3bd25163575031acdce07538d', // DAI
             '0x07865c6e87b9f70255377e024ace6630c1eaa37f', // USDC
         ],
-        [ChainId.Goerli]: [
-            getContractAddressesForChainOrThrow(ChainId.Goerli).etherToken,
-            '0x11fE4B6AE13d2a6055C8D9cF65c55bac32B5d844', // DAI
-            '0x07865c6E87B9F70255377e024ace6630C1Eaa37F', // USDC
-        ],
-        [ChainId.PolygonMumbai]: [
-            getContractAddressesForChainOrThrow(ChainId.PolygonMumbai).etherToken,
-            '0xe6b8a5CF854791412c1f6EFC7CAf629f5Df1c747', // USDC
-        ],
         [ChainId.Polygon]: [
             POLYGON_TOKENS.WMATIC,
             POLYGON_TOKENS.WETH,
@@ -964,19 +919,8 @@ export const DEFAULT_TOKEN_ADJACENCY_GRAPH_BY_CHAIN_ID = valueByChainId<TokenAdj
                 builder.addBidirectional(MAINNET_TOKENS.OHMV2, MAINNET_TOKENS.BTRFLY);
                 // Lido
                 builder.addBidirectional(MAINNET_TOKENS.stETH, MAINNET_TOKENS.wstETH);
-                // Synthetix Atomic Swap
-                builder.addCompleteSubgraph([
-                    MAINNET_TOKENS.sBTC,
-                    MAINNET_TOKENS.sETH,
-                    MAINNET_TOKENS.sUSD,
-                    MAINNET_TOKENS.sEUR,
-                    MAINNET_TOKENS.sJPY,
-                    MAINNET_TOKENS.sGBP,
-                    MAINNET_TOKENS.sAUD,
-                    MAINNET_TOKENS.sKRW,
-                    MAINNET_TOKENS.sCHF,
-                ]);
             })
+            // Build
             .build(),
         [ChainId.BSC]: new TokenAdjacencyGraphBuilder(DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.BSC]).build(),
         [ChainId.Polygon]: new TokenAdjacencyGraphBuilder(DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.Polygon])
@@ -996,23 +940,9 @@ export const DEFAULT_TOKEN_ADJACENCY_GRAPH_BY_CHAIN_ID = valueByChainId<TokenAdj
             DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.Fantom],
         ).build(),
         [ChainId.Celo]: new TokenAdjacencyGraphBuilder(DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.Celo]).build(),
-        [ChainId.Optimism]: new TokenAdjacencyGraphBuilder(DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.Optimism])
-            .tap(builder => {
-                // Synthetix Atomic Swap
-                builder.addCompleteSubgraph([
-                    OPTIMISM_TOKENS.sAAVE,
-                    OPTIMISM_TOKENS.sAVAX,
-                    OPTIMISM_TOKENS.sBTC,
-                    OPTIMISM_TOKENS.sETH,
-                    OPTIMISM_TOKENS.sEUR,
-                    OPTIMISM_TOKENS.sLINK,
-                    OPTIMISM_TOKENS.sMATIC,
-                    OPTIMISM_TOKENS.sSOL,
-                    OPTIMISM_TOKENS.sUNI,
-                    OPTIMISM_TOKENS.sUSD,
-                ]);
-            })
-            .build(),
+        [ChainId.Optimism]: new TokenAdjacencyGraphBuilder(
+            DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID[ChainId.Optimism],
+        ).build(),
     },
     TokenAdjacencyGraph.getEmptyGraph(),
 );
@@ -1023,8 +953,6 @@ export const NATIVE_FEE_TOKEN_BY_CHAIN_ID = valueByChainId<string>(
         [ChainId.BSC]: getContractAddressesForChainOrThrow(ChainId.BSC).etherToken,
         [ChainId.Ganache]: getContractAddressesForChainOrThrow(ChainId.Ganache).etherToken,
         [ChainId.Ropsten]: getContractAddressesForChainOrThrow(ChainId.Ropsten).etherToken,
-        [ChainId.Goerli]: getContractAddressesForChainOrThrow(ChainId.Goerli).etherToken,
-        [ChainId.PolygonMumbai]: getContractAddressesForChainOrThrow(ChainId.PolygonMumbai).etherToken,
         [ChainId.Rinkeby]: getContractAddressesForChainOrThrow(ChainId.Rinkeby).etherToken,
         [ChainId.Kovan]: getContractAddressesForChainOrThrow(ChainId.Kovan).etherToken,
         [ChainId.Polygon]: getContractAddressesForChainOrThrow(ChainId.Polygon).etherToken,
@@ -1888,7 +1816,6 @@ export const UNISWAPV1_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     {
         [ChainId.Mainnet]: '0xc0a47dfe034b400b47bdad5fecda2621de6c4d95',
         [ChainId.Ropsten]: '0x9c83dce8ca20e9aaf9d3efc003b2ea62abc08351',
-        [ChainId.Goerli]: '0x6Ce570d02D73d4c384b46135E87f8C592A8c86dA',
     },
     NULL_ADDRESS,
 );
@@ -1897,7 +1824,6 @@ export const UNISWAPV2_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     {
         [ChainId.Mainnet]: '0xf164fc0ec4e93095b804a4795bbe1e041497b92a',
         [ChainId.Ropsten]: '0xf164fc0ec4e93095b804a4795bbe1e041497b92a',
-        [ChainId.Goerli]: '0xf164fc0ec4e93095b804a4795bbe1e041497b92a',
     },
     NULL_ADDRESS,
 );
@@ -1907,7 +1833,6 @@ export const SUSHISWAP_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
         [ChainId.Mainnet]: '0xd9e1ce17f2641f24ae83637ab66a2cca9c378b9f',
         [ChainId.BSC]: '0x1b02da8cb0d097eb8d57a175b88c7d8b47997506',
         [ChainId.Ropsten]: '0x1b02da8cb0d097eb8d57a175b88c7d8b47997506',
-        [ChainId.Goerli]: '0x1b02da8cb0d097eb8d57a175b88c7d8b47997506',
         [ChainId.Polygon]: '0x1b02da8cb0d097eb8d57a175b88c7d8b47997506',
         [ChainId.Avalanche]: '0x1b02da8cb0d097eb8d57a175b88c7d8b47997506',
         [ChainId.Fantom]: '0x1b02da8cb0d097eb8d57a175b88c7d8b47997506',
@@ -1999,6 +1924,7 @@ export const KNIGHTSWAP_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
 
 export const MOONISWAP_REGISTRIES_BY_CHAIN_ID = valueByChainId(
     {
+        [ChainId.Mainnet]: ['0xbaf9a5d4b0052359326a6cdab54babaa3a3a9643'],
         [ChainId.BSC]: ['0xd41b24bba51fac0e4827b6f94c0d6ddeb183cd64'],
     },
     [] as string[],
@@ -2068,6 +1994,14 @@ export const MAKER_PSM_INFO_BY_CHAIN_ID = valueByChainId<PsmInfo>(
     },
 );
 
+export const MOONISWAP_LIQUIDITY_PROVIDER_BY_CHAIN_ID = valueByChainId<string>(
+    {
+        [ChainId.Mainnet]: '0xa2033d6ba88756ce6a87584d69dc87bda9a4f889',
+        [ChainId.Ropsten]: '0x87e0393aee0fb8c10b8653c6507c182264fe5a34',
+    },
+    NULL_ADDRESS,
+);
+
 export const BANCOR_REGISTRY_BY_CHAIN_ID = valueByChainId<string>(
     {
         [ChainId.Mainnet]: '0x52Ae12ABe5D8BD778BD5397F99cA900624CfADD4',
@@ -2188,6 +2122,13 @@ export const BALANCER_V2_SUBGRAPH_URL_BY_CHAIN = valueByChainId(
     null,
 );
 
+export const BEETHOVEN_X_SUBGRAPH_URL_BY_CHAIN = valueByChainId<string>(
+    {
+        [ChainId.Fantom]: 'https://graph-node.beets-ftm-node.com/subgraphs/name/beethovenx',
+    },
+    'https://graph-node.beets-ftm-node.com/subgraphs/name/beethovenx',
+);
+
 export const UNISWAPV3_CONFIG_BY_CHAIN_ID = valueByChainId(
     {
         [ChainId.Mainnet]: {
@@ -2198,14 +2139,6 @@ export const UNISWAPV3_CONFIG_BY_CHAIN_ID = valueByChainId(
             quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
             router: '0xe592427a0aece92de3edee1f18e0157c05861564',
         },
-        [ChainId.Goerli]: {
-            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
-            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
-        },
-        [ChainId.PolygonMumbai]: {
-            quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
-            router: '0xe592427a0aece92de3edee1f18e0157c05861564',
-        },
         [ChainId.Polygon]: {
             quoter: '0x61ffe014ba17989e743c5f6cb21bf9697530b21e',
             router: '0xe592427a0aece92de3edee1f18e0157c05861564',
@@ -2391,47 +2324,6 @@ export const VELODROME_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     NULL_ADDRESS,
 );
 
-export const SYNTHETIX_READ_PROXY_BY_CHAIN_ID = valueByChainId<string>(
-    {
-        [ChainId.Mainnet]: '0x4e3b31eb0e5cb73641ee1e65e7dcefe520ba3ef2',
-        [ChainId.Optimism]: '0x1cb059b7e74fd21665968c908806143e744d5f30',
-    },
-    NULL_ADDRESS,
-);
-
-export const SYNTHETIX_CURRENCY_KEYS_BY_CHAIN_ID = valueByChainId<Map<string, string>>(
-    {
-        // There is no easy way to find out what synths are supported on mainnet.
-        // The below list is based on https://sips.synthetix.io/sccp/sccp-190.
-        [ChainId.Mainnet]: new Map([
-            [MAINNET_TOKENS.sAUD, 'sAUD'],
-            [MAINNET_TOKENS.sBTC, 'sBTC'],
-            [MAINNET_TOKENS.sCHF, 'sCHF'],
-            [MAINNET_TOKENS.sETH, 'sETH'],
-            [MAINNET_TOKENS.sEUR, 'sEUR'],
-            [MAINNET_TOKENS.sGBP, 'sGBP'],
-            [MAINNET_TOKENS.sJPY, 'sJPY'],
-            [MAINNET_TOKENS.sKRW, 'sKRW'],
-            [MAINNET_TOKENS.sUSD, 'sUSD'],
-        ]),
-        // Supported assets can be find through SynthUtil::synthsRates.
-        // Low liquidity tokens can be excluded.
-        [ChainId.Optimism]: new Map([
-            [OPTIMISM_TOKENS.sAAVE, 'sAAVE'],
-            [OPTIMISM_TOKENS.sAVAX, 'sAVAX'],
-            [OPTIMISM_TOKENS.sBTC, 'sBTC'],
-            [OPTIMISM_TOKENS.sETH, 'sETH'],
-            [OPTIMISM_TOKENS.sEUR, 'sEUR'],
-            [OPTIMISM_TOKENS.sLINK, 'sLINK'],
-            [OPTIMISM_TOKENS.sMATIC, 'sMATIC'],
-            [OPTIMISM_TOKENS.sSOL, 'sSOL'],
-            [OPTIMISM_TOKENS.sUNI, 'sUNI'],
-            [OPTIMISM_TOKENS.sUSD, 'sUSD'],
-        ]),
-    },
-    new Map(),
-);
-
 export const VIP_ERC20_BRIDGE_SOURCES_BY_CHAIN_ID = valueByChainId<ERC20BridgeSource[]>(
     {
         [ChainId.Mainnet]: [
@@ -2615,28 +2507,7 @@ export const DEFAULT_GAS_SCHEDULE: Required<GasSchedule> = {
             return compoundFillData.takerToken === wethAddress ? 210e3 : 250e3;
         }
     },
-    [ERC20BridgeSource.Synthetix]: (fillData?: FillData) => {
-        const { chainId, makerTokenSymbolBytes32, takerTokenSymbolBytes32 } = fillData as SynthetixFillData;
-        const makerTokenSymbol = parseBytes32String(makerTokenSymbolBytes32);
-        const takerTokenSymbol = parseBytes32String(takerTokenSymbolBytes32);
 
-        // Gas cost widely varies by token on mainnet.
-        if (chainId === ChainId.Mainnet) {
-            if (takerTokenSymbol === 'sBTC' || makerTokenSymbol === 'sBTC') {
-                return 800e3;
-            }
-            if (takerTokenSymbol === 'sETH' || makerTokenSymbol === 'sETH') {
-                return 700e3;
-            }
-            return 580e3;
-        }
-
-        // Optimism
-        if (takerTokenSymbol === 'sUSD' || makerTokenSymbol === 'sUSD') {
-            return 480e3;
-        }
-        return 580e3;
-    },
     //
     // BSC
     //

packages/asset-swapper/src/utils/market_operation_utils/fills.ts

@@ -29,7 +29,7 @@ export function ethToOutputAmount({
 }): BigNumber {
     return !outputAmountPerEth.isZero()
         ? outputAmountPerEth.times(ethAmount).integerValue()
-        : inputAmountPerEth.times(ethAmount).times(output.dividedToIntegerBy(input));
+        : inputAmountPerEth.times(ethAmount).times(output.dividedBy(input));
 }
 
 export function nativeOrderToFill(

packages/asset-swapper/src/utils/market_operation_utils/multihop_utils.ts

@@ -23,7 +23,8 @@ export function getBestTwoHopQuote(
     exchangeProxyOverhead?: ExchangeProxyOverhead,
     fillAdjustor?: FillAdjustor,
 ): { quote: DexSample<MultiHopFillData> | undefined; adjustedRate: BigNumber } {
-    const { side, inputAmount, outputAmountPerEth, quotes } = marketSideLiquidity;
+    const { side, inputAmount, outputAmountPerEth, quotes, inputAmountPerEth } = marketSideLiquidity;
+    console.log({ outputAmountPerEth });
     const { twoHopQuotes } = quotes;
     // Ensure the expected data we require exists. In the case where all hops reverted
     // or there were no sources included that allowed for multi hop,
@@ -46,6 +47,7 @@ export function getBestTwoHopQuote(
                 quote,
                 inputAmount,
                 outputAmountPerEth,
+                inputAmountPerEth,
                 feeSchedule,
                 exchangeProxyOverhead,
                 fillAdjustor,
@@ -60,6 +62,7 @@ export function getBestTwoHopQuote(
                     filteredQuotes[0],
                     inputAmount,
                     outputAmountPerEth,
+                    inputAmountPerEth,
                     feeSchedule,
                     exchangeProxyOverhead,
                     fillAdjustor,

packages/asset-swapper/src/utils/market_operation_utils/orders.ts

@@ -38,7 +38,6 @@ import {
     OrderDomain,
     PlatypusFillData,
     ShellFillData,
-    SynthetixFillData,
     UniswapV2FillData,
     UniswapV3FillData,
     UniswapV3PathAmount,
@@ -211,8 +210,6 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s
             return encodeBridgeSourceId(BridgeProtocol.BancorV3, 'BancorV3');
         case ERC20BridgeSource.Velodrome:
             return encodeBridgeSourceId(BridgeProtocol.Velodrome, 'Velodrome');
-        case ERC20BridgeSource.Synthetix:
-            return encodeBridgeSourceId(BridgeProtocol.Synthetix, 'Synthetix');
         default:
             throw new Error(AggregationError.NoBridgeForSource);
     }
@@ -394,14 +391,6 @@ export function createBridgeDataForBridgeOrder(order: OptimizedMarketBridgeOrder
             const velodromeFillData = (order as OptimizedMarketBridgeOrder<VelodromeFillData>).fillData;
             bridgeData = encoder.encode([velodromeFillData.router, velodromeFillData.stable]);
             break;
-        case ERC20BridgeSource.Synthetix:
-            const fillData = (order as OptimizedMarketBridgeOrder<SynthetixFillData>).fillData;
-            bridgeData = encoder.encode([
-                fillData.synthetix,
-                fillData.takerTokenSymbolBytes32,
-                fillData.makerTokenSymbolBytes32,
-            ]);
-            break;
         default:
             throw new Error(AggregationError.NoBridgeForSource);
     }
@@ -528,7 +517,6 @@ export const BRIDGE_ENCODERS: {
     [ERC20BridgeSource.Compound]: AbiEncoder.create('(address)'),
     [ERC20BridgeSource.Geist]: AbiEncoder.create('(address,address)'),
     [ERC20BridgeSource.Velodrome]: AbiEncoder.create('(address,bool)'),
-    [ERC20BridgeSource.Synthetix]: AbiEncoder.create('(address,bytes32,bytes32)'),
 };
 
 function getFillTokenAmounts(fill: Fill, side: MarketOperation): [BigNumber, BigNumber] {

packages/asset-swapper/src/utils/market_operation_utils/pools_cache/balancer_v2_utils.ts

@@ -6,15 +6,15 @@ import { gql, request } from 'graphql-request';
 
 import { DEFAULT_WARNING_LOGGER } from '../../../constants';
 import { LogFunction } from '../../../types';
-import { BALANCER_MAX_POOLS_FETCHED, BALANCER_TOP_POOLS_FETCHED } from '../constants';
+import {
+    BALANCER_MAX_POOLS_FETCHED,
+    BALANCER_TOP_POOLS_FETCHED,
+    BALANCER_V2_SUBGRAPH_URL_BY_CHAIN,
+} from '../constants';
 
 import { parsePoolData } from './balancer_sor_v2';
 import { CacheValue, PoolsCache } from './pools_cache';
 
-const BEETHOVEN_X_SUBGRAPH_URL_BY_CHAIN = new Map<ChainId, string>([
-    [ChainId.Fantom, 'https://api.thegraph.com/subgraphs/name/beethovenxfi/beethovenx'],
-]);
-
 // tslint:disable-next-line:custom-no-magic-numbers
 const ONE_DAY_MS = 24 * 60 * 60 * 1000;
 
@@ -29,15 +29,6 @@ interface BalancerPoolResponse {
 }
 
 export class BalancerV2PoolsCache extends PoolsCache {
-    public static createBeethovenXPoolCache(chainId: ChainId): BalancerV2PoolsCache | undefined {
-        const subgraphUrl = BEETHOVEN_X_SUBGRAPH_URL_BY_CHAIN.get(chainId);
-        if (subgraphUrl === undefined) {
-            return undefined;
-        }
-
-        return new BalancerV2PoolsCache(subgraphUrl);
-    }
-
     private static _parseSubgraphPoolData(pool: any, takerToken: string, makerToken: string): Pool {
         const tToken = pool.tokens.find((t: any) => t.address === takerToken);
         const mToken = pool.tokens.find((t: any) => t.address === makerToken);
@@ -59,7 +50,8 @@ export class BalancerV2PoolsCache extends PoolsCache {
     }
 
     constructor(
-        private readonly subgraphUrl: string,
+        chainId: ChainId,
+        private readonly subgraphUrl: string = BALANCER_V2_SUBGRAPH_URL_BY_CHAIN[chainId]!,
         private readonly maxPoolsFetched: number = BALANCER_MAX_POOLS_FETCHED,
         private readonly _topPoolsFetched: number = BALANCER_TOP_POOLS_FETCHED,
         private readonly _warningLogger: LogFunction = DEFAULT_WARNING_LOGGER,
@@ -71,6 +63,19 @@ export class BalancerV2PoolsCache extends PoolsCache {
         setInterval(async () => void this._loadTopPoolsAsync(), ONE_DAY_MS / 2);
     }
 
+    // protected async _fetchPoolsForPairAsync(takerToken: string, makerToken: string): Promise<Pool[]> {
+    //     try {
+    //         const poolData = (await getPoolsWithTokens(takerToken, makerToken)).pools;
+    //         // Sort by maker token balance (descending)
+    //         const pools = parsePoolData(poolData, takerToken, makerToken).sort((a, b) =>
+    //             b.balanceOut.minus(a.balanceOut).toNumber(),
+    //         );
+    //         return pools.length > this.maxPoolsFetched ? pools.slice(0, this.maxPoolsFetched) : pools;
+    //     } catch (err) {
+    //         return [];
+    //     }
+    // }
+
     protected async _fetchTopPoolsAsync(): Promise<BalancerPoolResponse[]> {
         const query = gql`
             query fetchTopPools($topPoolsFetched: Int!) {

packages/asset-swapper/src/utils/market_operation_utils/rate_utils.ts

@@ -4,7 +4,7 @@ import { BigNumber } from '@0x/utils';
 import { MarketOperation } from '../../types';
 
 import { SOURCE_FLAGS, ZERO_AMOUNT } from './constants';
-import { adjustOutput } from './fills';
+import { adjustOutput, ethToOutputAmount } from './fills';
 import { IdentityFillAdjustor } from './identity_fill_adjustor';
 import {
     DexSample,
@@ -27,6 +27,7 @@ export function getTwoHopAdjustedRate(
     twoHopQuote: DexSample<MultiHopFillData>,
     targetInput: BigNumber,
     outputAmountPerEth: BigNumber,
+    inputAmountPerEth: BigNumber,
     fees: FeeSchedule = {},
     exchangeProxyOverhead: ExchangeProxyOverhead = () => ZERO_AMOUNT,
     fillAdjustor: FillAdjustor = new IdentityFillAdjustor(),
@@ -43,7 +44,32 @@ export function getTwoHopAdjustedRate(
         SOURCE_FLAGS[fillData.secondHopSource.source];
 
     // Penalty of going to those sources in terms of output
-    const sourcePenalty = outputAmountPerEth.times(fees[ERC20BridgeSource.MultiHop]!(fillData).fee).integerValue();
+    // const outputPerEthRate = outputAmountPerEth.eq(ZERO_AMOUNT)
+    console.log({
+        targetInput,
+        output: twoHopQuote.output,
+        price: twoHopQuote.output.dividedBy(targetInput),
+        outputAmountPerEth,
+        inputAmountPerEth,
+        guess: ethToOutputAmount({
+            input: targetInput,
+            output: twoHopQuote.output,
+            inputAmountPerEth,
+            outputAmountPerEth: ZERO_AMOUNT,
+            ethAmount: 1,
+        }),
+    });
+
+    const outputEthRate = outputAmountPerEth.isZero()
+        ? ethToOutputAmount({
+              input: targetInput,
+              output: twoHopQuote.output,
+              inputAmountPerEth,
+              outputAmountPerEth: ZERO_AMOUNT,
+              ethAmount: 1,
+          })
+        : outputAmountPerEth;
+    const sourcePenalty = outputEthRate.times(fees[ERC20BridgeSource.MultiHop]!(fillData).fee).integerValue();
 
     // Create a Fill so it can be adjusted by the `FillAdjustor`
     const fill: Fill = {
@@ -74,7 +100,7 @@ export function getTwoHopAdjustedRate(
             ? BigNumber.min(adjustedOutputLeft, adjustedOutputRight)
             : BigNumber.max(adjustedOutputLeft, adjustedOutputRight);
 
-    const pathPenalty = outputAmountPerEth.times(exchangeProxyOverhead(flags)).integerValue();
+    const pathPenalty = outputEthRate.times(exchangeProxyOverhead(flags)).integerValue();
     const pathAdjustedOutput = adjustOutput(side, fillAdjustedOutput, pathPenalty);
 
     return getRate(side, input, pathAdjustedOutput);

packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts

@@ -1,7 +1,6 @@
 import { ChainId } from '@0x/contract-addresses';
 import { LimitOrderFields } from '@0x/protocol-utils';
 import { BigNumber, logUtils } from '@0x/utils';
-import { formatBytes32String } from '@ethersproject/strings';
 import * as _ from 'lodash';
 
 import { AaveV2Sampler } from '../../noop_samplers/AaveV2Sampler';
@@ -29,6 +28,7 @@ import {
     BANCOR_REGISTRY_BY_CHAIN_ID,
     BANCORV3_NETWORK_BY_CHAIN_ID,
     BANCORV3_NETWORK_INFO_BY_CHAIN_ID,
+    BEETHOVEN_X_SUBGRAPH_URL_BY_CHAIN,
     BEETHOVEN_X_VAULT_ADDRESS_BY_CHAIN,
     COMPOUND_API_URL_BY_CHAIN_ID,
     DODOV1_CONFIG_BY_CHAIN_ID,
@@ -47,8 +47,6 @@ import {
     NULL_ADDRESS,
     PLATYPUS_ROUTER_BY_CHAIN_ID,
     SELL_SOURCE_FILTER_BY_CHAIN_ID,
-    SYNTHETIX_CURRENCY_KEYS_BY_CHAIN_ID,
-    SYNTHETIX_READ_PROXY_BY_CHAIN_ID,
     UNISWAPV1_ROUTER_BY_CHAIN_ID,
     UNISWAPV3_CONFIG_BY_CHAIN_ID,
     VELODROME_ROUTER_BY_CHAIN_ID,
@@ -56,7 +54,7 @@ import {
 } from './constants';
 import { getGeistInfoForPair } from './geist_utils';
 import { getLiquidityProvidersForPair } from './liquidity_provider_utils';
-import { BalancerPoolsCache, BalancerV2PoolsCache, CreamPoolsCache } from './pools_cache';
+import { BalancerPoolsCache, BalancerV2PoolsCache, CreamPoolsCache, PoolsCache } from './pools_cache';
 import { BalancerV2SwapInfoCache } from './pools_cache/balancer_v2_utils_new';
 import { SamplerContractOperation } from './sampler_contract_operation';
 import { SamplerNoOperation } from './sampler_no_operation';
@@ -95,7 +93,7 @@ import {
     PsmInfo,
     ShellFillData,
     SourceQuoteOperation,
-    SynthetixFillData,
+    SourcesWithPoolsCache,
     UniswapV2FillData,
     UniswapV3FillData,
     VelodromeFillData,
@@ -113,12 +111,9 @@ export const TWO_HOP_SOURCE_FILTERS = SourceFilters.all().exclude([
  */
 export const BATCH_SOURCE_FILTERS = SourceFilters.all().exclude([ERC20BridgeSource.MultiHop, ERC20BridgeSource.Native]);
 
-export interface PoolsCacheMap {
-    [ERC20BridgeSource.Balancer]: BalancerPoolsCache;
+export type PoolsCacheMap = { [key in Exclude<SourcesWithPoolsCache, ERC20BridgeSource.BalancerV2>]: PoolsCache } & {
     [ERC20BridgeSource.BalancerV2]: BalancerV2SwapInfoCache | undefined;
-    [ERC20BridgeSource.Beethovenx]: BalancerV2PoolsCache | undefined;
-    [ERC20BridgeSource.Cream]: CreamPoolsCache;
-}
+};
 
 // tslint:disable:no-inferred-empty-object-type no-unbound-method
 
@@ -155,7 +150,10 @@ export class SamplerOperations {
         this.poolsCaches = poolsCaches
             ? poolsCaches
             : {
-                  [ERC20BridgeSource.Beethovenx]: BalancerV2PoolsCache.createBeethovenXPoolCache(chainId),
+                  [ERC20BridgeSource.Beethovenx]: new BalancerV2PoolsCache(
+                      chainId,
+                      BEETHOVEN_X_SUBGRAPH_URL_BY_CHAIN[chainId],
+                  ),
                   [ERC20BridgeSource.Balancer]: new BalancerPoolsCache(),
                   [ERC20BridgeSource.Cream]: new CreamPoolsCache(),
                   [ERC20BridgeSource.BalancerV2]:
@@ -1311,60 +1309,6 @@ export class SamplerOperations {
         });
     }
 
-    public getSynthetixSellQuotes(
-        readProxy: string,
-        takerTokenSymbol: string,
-        makerTokenSymbol: string,
-        takerFillAmounts: BigNumber[],
-    ): SourceQuoteOperation<SynthetixFillData> {
-        const takerTokenSymbolBytes32 = formatBytes32String(takerTokenSymbol);
-        const makerTokenSymbolBytes32 = formatBytes32String(makerTokenSymbol);
-        return new SamplerContractOperation({
-            source: ERC20BridgeSource.Synthetix,
-            contract: this._samplerContract,
-            function: this._samplerContract.sampleSellsFromSynthetix,
-            params: [readProxy, takerTokenSymbolBytes32, makerTokenSymbolBytes32, takerFillAmounts],
-            callback: (callResults: string, fillData: SynthetixFillData): BigNumber[] => {
-                const [synthetix, samples] = this._samplerContract.getABIDecodedReturnData<[string, BigNumber[]]>(
-                    'sampleSellsFromSynthetix',
-                    callResults,
-                );
-                fillData.synthetix = synthetix;
-                fillData.takerTokenSymbolBytes32 = takerTokenSymbolBytes32;
-                fillData.makerTokenSymbolBytes32 = makerTokenSymbolBytes32;
-                fillData.chainId = this.chainId;
-                return samples;
-            },
-        });
-    }
-
-    public getSynthetixBuyQuotes(
-        readProxy: string,
-        takerTokenSymbol: string,
-        makerTokenSymbol: string,
-        makerFillAmounts: BigNumber[],
-    ): SourceQuoteOperation<SynthetixFillData> {
-        const takerTokenSymbolBytes32 = formatBytes32String(takerTokenSymbol);
-        const makerTokenSymbolBytes32 = formatBytes32String(makerTokenSymbol);
-        return new SamplerContractOperation({
-            source: ERC20BridgeSource.Synthetix,
-            contract: this._samplerContract,
-            function: this._samplerContract.sampleBuysFromSynthetix,
-            params: [readProxy, takerTokenSymbolBytes32, makerTokenSymbolBytes32, makerFillAmounts],
-            callback: (callResults: string, fillData: SynthetixFillData): BigNumber[] => {
-                const [synthetix, samples] = this._samplerContract.getABIDecodedReturnData<[string, BigNumber[]]>(
-                    'sampleBuysFromSynthetix',
-                    callResults,
-                );
-                fillData.synthetix = synthetix;
-                fillData.takerTokenSymbolBytes32 = takerTokenSymbolBytes32;
-                fillData.makerTokenSymbolBytes32 = makerTokenSymbolBytes32;
-                fillData.chainId = this.chainId;
-                return samples;
-            },
-        });
-    }
-
     /**
      * Returns the best price for the native token
      * Best is calculated according to the fee schedule, so the price of the
@@ -1623,11 +1567,8 @@ export class SamplerOperations {
                         );
                     }
                     case ERC20BridgeSource.Beethovenx: {
-                        const cache = this.poolsCaches[source];
-                        if (cache === undefined) {
-                            return [];
-                        }
-                        const poolIds = cache.getCachedPoolAddressesForPair(takerToken, makerToken) || [];
+                        const poolIds =
+                            this.poolsCaches[source].getCachedPoolAddressesForPair(takerToken, makerToken) || [];
 
                         const vault = BEETHOVEN_X_VAULT_ADDRESS_BY_CHAIN[this.chainId];
                         if (vault === NULL_ADDRESS) {
@@ -1795,21 +1736,6 @@ export class SamplerOperations {
                             takerFillAmounts,
                         );
                     }
-                    case ERC20BridgeSource.Synthetix: {
-                        const readProxy = SYNTHETIX_READ_PROXY_BY_CHAIN_ID[this.chainId];
-                        const currencyKeyMap = SYNTHETIX_CURRENCY_KEYS_BY_CHAIN_ID[this.chainId];
-                        const takerTokenSymbol = currencyKeyMap.get(takerToken.toLowerCase());
-                        const makerTokenSymbol = currencyKeyMap.get(makerToken.toLowerCase());
-                        if (takerTokenSymbol === undefined || makerTokenSymbol === undefined) {
-                            return [];
-                        }
-                        return this.getSynthetixSellQuotes(
-                            readProxy,
-                            takerTokenSymbol,
-                            makerTokenSymbol,
-                            takerFillAmounts,
-                        );
-                    }
                     default:
                         throw new Error(`Unsupported sell sample source: ${source}`);
                 }
@@ -1985,11 +1911,8 @@ export class SamplerOperations {
                         );
                     }
                     case ERC20BridgeSource.Beethovenx: {
-                        const cache = this.poolsCaches[source];
-                        if (cache === undefined) {
-                            return [];
-                        }
-                        const poolIds = cache.getCachedPoolAddressesForPair(takerToken, makerToken) || [];
+                        const poolIds =
+                            this.poolsCaches[source].getCachedPoolAddressesForPair(takerToken, makerToken) || [];
 
                         const vault = BEETHOVEN_X_VAULT_ADDRESS_BY_CHAIN[this.chainId];
                         if (vault === NULL_ADDRESS) {
@@ -2145,21 +2068,6 @@ export class SamplerOperations {
                             makerFillAmounts,
                         );
                     }
-                    case ERC20BridgeSource.Synthetix: {
-                        const readProxy = SYNTHETIX_READ_PROXY_BY_CHAIN_ID[this.chainId];
-                        const currencyKeyMap = SYNTHETIX_CURRENCY_KEYS_BY_CHAIN_ID[this.chainId];
-                        const takerTokenSymbol = currencyKeyMap.get(takerToken.toLowerCase());
-                        const makerTokenSymbol = currencyKeyMap.get(makerToken.toLowerCase());
-                        if (takerTokenSymbol === undefined || makerTokenSymbol === undefined) {
-                            return [];
-                        }
-                        return this.getSynthetixBuyQuotes(
-                            readProxy,
-                            takerTokenSymbol,
-                            makerTokenSymbol,
-                            makerFillAmounts,
-                        );
-                    }
                     default:
                         throw new Error(`Unsupported buy sample source: ${source}`);
                 }

packages/asset-swapper/src/utils/market_operation_utils/types.ts

@@ -1,4 +1,3 @@
-import { ChainId } from '@0x/contract-addresses';
 import {
     FillQuoteTransformerLimitOrderInfo,
     FillQuoteTransformerOrderType,
@@ -68,7 +67,6 @@ export enum ERC20BridgeSource {
     Compound = 'Compound',
     Synapse = 'Synapse',
     BancorV3 = 'BancorV3',
-    Synthetix = 'Synthetix',
     // BSC only
     PancakeSwap = 'PancakeSwap',
     PancakeSwapV2 = 'PancakeSwap_V2',
@@ -108,6 +106,11 @@ export enum ERC20BridgeSource {
     // Optimism
     Velodrome = 'Velodrome',
 }
+export type SourcesWithPoolsCache =
+    | ERC20BridgeSource.Balancer
+    | ERC20BridgeSource.BalancerV2
+    | ERC20BridgeSource.Beethovenx
+    | ERC20BridgeSource.Cream;
 
 // tslint:disable: enum-naming
 /**
@@ -378,14 +381,6 @@ export interface VelodromeFillData extends FillData {
     stable: boolean;
 }
 
-export interface SynthetixFillData extends FillData {
-    synthetix: string;
-    takerTokenSymbolBytes32: string;
-    makerTokenSymbolBytes32: string;
-    // Only needed for gas estimation.
-    chainId: ChainId;
-}
-
 /**
  * Represents a node on a fill path.
  */

packages/asset-swapper/test/artifacts.ts

@@ -43,7 +43,6 @@ import * as NativeOrderSampler from '../test/generated-artifacts/NativeOrderSamp
 import * as PlatypusSampler from '../test/generated-artifacts/PlatypusSampler.json';
 import * as SamplerUtils from '../test/generated-artifacts/SamplerUtils.json';
 import * as ShellSampler from '../test/generated-artifacts/ShellSampler.json';
-import * as SynthetixSampler from '../test/generated-artifacts/SynthetixSampler.json';
 import * as TestNativeOrderSampler from '../test/generated-artifacts/TestNativeOrderSampler.json';
 import * as TwoHopSampler from '../test/generated-artifacts/TwoHopSampler.json';
 import * as UniswapSampler from '../test/generated-artifacts/UniswapSampler.json';
@@ -77,7 +76,6 @@ export const artifacts = {
     PlatypusSampler: PlatypusSampler as ContractArtifact,
     SamplerUtils: SamplerUtils as ContractArtifact,
     ShellSampler: ShellSampler as ContractArtifact,
-    SynthetixSampler: SynthetixSampler as ContractArtifact,
     TwoHopSampler: TwoHopSampler as ContractArtifact,
     UniswapSampler: UniswapSampler as ContractArtifact,
     UniswapV2Sampler: UniswapV2Sampler as ContractArtifact,

packages/asset-swapper/test/pools_cache_test.ts

@@ -17,6 +17,8 @@ const expect = chai.expect;
 const usdcAddress = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
 const daiAddress = '0x6b175474e89094c44da98b954eedeac495271d0f';
 const wethAddress = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
+const wbtcAddress = '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599';
+const balAddress = '0xba100000625a3754423978a60c9317c58a424e3d';
 const creamAddress = '0x2ba592f78db6436527729929aaf6c908497cb200';
 
 const timeoutMs = 5000;
@@ -41,26 +43,22 @@ describe('Pools Caches for Balancer-based sampling', () => {
                 [daiAddress, wethAddress],
             ];
             await Promise.all(
-                pairs.map(async ([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache, takerToken, makerToken)),
+                // tslint:disable-next-line:promise-function-async
+                pairs.map(([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache, takerToken, makerToken)),
             );
         });
     });
 
     describe('BalancerV2PoolsCache', () => {
-        it('fetches pools (Beethoven X - Fantom)', async () => {
-            const cache = BalancerV2PoolsCache.createBeethovenXPoolCache(ChainId.Fantom);
-            const wftmAddress = '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83';
-            const beetsAddress = '0xf24bcf4d1e507740041c9cfd2dddb29585adce1e';
-            const fantomWethAddress = '0x74b23882a30290451a17c44f4f05243b6b58c76d';
-
+        const cache = new BalancerV2PoolsCache(ChainId.Mainnet);
+        it('fetches pools', async () => {
             const pairs = [
-                [wftmAddress, beetsAddress],
-                [wftmAddress, fantomWethAddress],
+                [wethAddress, wbtcAddress],
+                [wethAddress, balAddress],
             ];
-
-            expect(cache).not.null();
             await Promise.all(
-                pairs.map(async ([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache!, takerToken, makerToken)),
+                // tslint:disable-next-line:promise-function-async
+                pairs.map(([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache, takerToken, makerToken)),
             );
         });
     });
@@ -73,7 +71,8 @@ describe('Pools Caches for Balancer-based sampling', () => {
                 [creamAddress, wethAddress],
             ];
             await Promise.all(
-                pairs.map(async ([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache, takerToken, makerToken)),
+                // tslint:disable-next-line:promise-function-async
+                pairs.map(([takerToken, makerToken]) => fetchAndAssertPoolsAsync(cache, takerToken, makerToken)),
             );
         });
     });

packages/asset-swapper/test/wrappers.ts

@@ -41,7 +41,6 @@ export * from '../test/generated-wrappers/native_order_sampler';
 export * from '../test/generated-wrappers/platypus_sampler';
 export * from '../test/generated-wrappers/sampler_utils';
 export * from '../test/generated-wrappers/shell_sampler';
-export * from '../test/generated-wrappers/synthetix_sampler';
 export * from '../test/generated-wrappers/test_native_order_sampler';
 export * from '../test/generated-wrappers/two_hop_sampler';
 export * from '../test/generated-wrappers/uniswap_sampler';

packages/asset-swapper/tsconfig.json

@@ -44,7 +44,6 @@
         "test/generated-artifacts/PlatypusSampler.json",
         "test/generated-artifacts/SamplerUtils.json",
         "test/generated-artifacts/ShellSampler.json",
-        "test/generated-artifacts/SynthetixSampler.json",
         "test/generated-artifacts/TestNativeOrderSampler.json",
         "test/generated-artifacts/TwoHopSampler.json",
         "test/generated-artifacts/UniswapSampler.json",

packages/contract-addresses/CHANGELOG.json

@@ -1,17 +1,4 @@
 [
-    {
-        "version": "6.17.0",
-        "changes": [
-            {
-                "note": "Goerli and Mumbai"
-            },
-            {
-                "note": "Redeploy FQT on Mainnet and Optimism",
-                "pr": 530
-            }
-        ],
-        "timestamp": 1658950329
-    },
     {
         "version": "6.16.0",
         "changes": [

packages/contract-addresses/CHANGELOG.md

@@ -5,11 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v6.17.0 - _July 27, 2022_
-
-    * Goerli and Mumbai
-    * Redeploy FQT on Mainnet and Optimism (#530)
-
 ## v6.16.0 - _June 14, 2022_
 
     * Redeploy FQT on Mainnet and Optimism

packages/contract-addresses/addresses.json

@@ -37,7 +37,7 @@
             "wethTransformer": "0xb2bc06a4efb20fc6553a69dbfa49b7be938034a7",
             "payTakerTransformer": "0x4638a7ebe75b911b995d0ec73a81e4f85f41f24e",
             "affiliateFeeTransformer": "0xda6d9fc5998f550a094585cf9171f0e8ee3ac59f",
-            "fillQuoteTransformer": "0xd75a9019a2a1782ea670e4f4a55f04b43514ed53",
+            "fillQuoteTransformer": "0x26b2d9ea76f24206805d17565a5e0efcf787e0ae",
             "positiveSlippageFeeTransformer": "0xa9416ce1dbde8d331210c07b5c253d94ee4cc3fd"
         }
     },
@@ -125,48 +125,6 @@
             "positiveSlippageFeeTransformer": "0x0000000000000000000000000000000000000000"
         }
     },
-    "5": {
-        "erc20Proxy": "0x0000000000000000000000000000000000000000",
-        "erc721Proxy": "0x0000000000000000000000000000000000000000",
-        "zrxToken": "0x0000000000000000000000000000000000000000",
-        "etherToken": "0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6",
-        "exchangeV2": "0x0000000000000000000000000000000000000000",
-        "exchange": "0x0000000000000000000000000000000000000000",
-        "assetProxyOwner": "0x0000000000000000000000000000000000000000",
-        "zeroExGovernor": "0x0000000000000000000000000000000000000000",
-        "forwarder": "0x0000000000000000000000000000000000000000",
-        "coordinatorRegistry": "0x0000000000000000000000000000000000000000",
-        "coordinator": "0x0000000000000000000000000000000000000000",
-        "multiAssetProxy": "0x0000000000000000000000000000000000000000",
-        "staticCallProxy": "0x0000000000000000000000000000000000000000",
-        "erc1155Proxy": "0x0000000000000000000000000000000000000000",
-        "devUtils": "0x0000000000000000000000000000000000000000",
-        "zrxVault": "0x0000000000000000000000000000000000000000",
-        "staking": "0x0000000000000000000000000000000000000000",
-        "stakingProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeProxy": "0x0000000000000000000000000000000000000000",
-        "erc20BridgeSampler": "0x0000000000000000000000000000000000000000",
-        "chaiBridge": "0x0000000000000000000000000000000000000000",
-        "dydxBridge": "0x0000000000000000000000000000000000000000",
-        "godsUnchainedValidator": "0x0000000000000000000000000000000000000000",
-        "broker": "0x0000000000000000000000000000000000000000",
-        "chainlinkStopLimit": "0x0000000000000000000000000000000000000000",
-        "maximumGasPrice": "0x0000000000000000000000000000000000000000",
-        "dexForwarderBridge": "0x0000000000000000000000000000000000000000",
-        "exchangeProxyGovernor": "0x7cee06249e371a1ecf8107e912294432f7f70832",
-        "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
-        "exchangeProxyTransformerDeployer": "0x2bef57ffde3098eeed9fa4f9166a81d7377533dc",
-        "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498",
-        "exchangeProxyLiquidityProviderSandbox": "0x0000000000000000000000000000000000000000",
-        "zrxTreasury": "0x0000000000000000000000000000000000000000",
-        "transformers": {
-            "wethTransformer": "0xad550dbef7b93a42e335062e808d66a70eca5a0a",
-            "payTakerTransformer": "0xbd3fec19e4d91a79b329b6b4a6f210c66a40a97f",
-            "affiliateFeeTransformer": "0x59e7371b613a6f3879694bf9db2fe3117c92a927",
-            "fillQuoteTransformer": "0x3edbf102250d59230ff6d3fc648f97c094f3cb27",
-            "positiveSlippageFeeTransformer": "0x48997b11bbc15c2fa2f141c9e93a0a2ab789a761"
-        }
-    },
     "42": {
         "erc20Proxy": "0xaa460127562482faa5df42f2c39a025cd4a1cc0a",
         "erc721Proxy": "0x7b70a148e20b348c320208df84fdd642aab49fd0",
@@ -541,7 +499,7 @@
             "wethTransformer": "0x02ce7af6520e2862f961f5d7eda746642865179c",
             "payTakerTransformer": "0x085d10a34f14f6a631ea8ff7d016782ee3ffaa11",
             "affiliateFeeTransformer": "0x55cf1d7535250db75bf0190493f55781ee583553",
-            "fillQuoteTransformer": "0x96499c097efc56ba5cf6b2a474392db17790ce96",
+            "fillQuoteTransformer": "0xfae0ce3841afbf5625a15f0c73e03ba6660e575f",
             "positiveSlippageFeeTransformer": "0xb11e14565dfbeb702dea9bc0cb47f1a8b32f4783"
         }
     }

packages/contract-addresses/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-addresses",
-    "version": "6.17.0",
+    "version": "6.16.0",
     "engines": {
         "node": ">=6.12"
     },

packages/contract-addresses/src/index.ts

@@ -47,7 +47,6 @@ export enum ChainId {
     Mainnet = 1,
     Ropsten = 3,
     Rinkeby = 4,
-    Goerli = 5,
     Kovan = 42,
     Ganache = 1337,
     BSC = 56,
@@ -56,7 +55,6 @@ export enum ChainId {
     Avalanche = 43114,
     Fantom = 250,
     Celo = 42220,
-    // Arbitrum = 42161,
     Optimism = 10,
 }
 

packages/contract-wrappers/CHANGELOG.json

@@ -1,13 +1,4 @@
 [
-    {
-        "timestamp": 1658950329,
-        "version": "13.20.5",
-        "changes": [
-            {
-                "note": "Dependencies updated"
-            }
-        ]
-    },
     {
         "timestamp": 1655244958,
         "version": "13.20.4",

packages/contract-wrappers/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v13.20.5 - _July 27, 2022_
-
-    * Dependencies updated
-
 ## v13.20.4 - _June 14, 2022_
 
     * Dependencies updated

packages/contract-wrappers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contract-wrappers",
-    "version": "13.20.5",
+    "version": "13.20.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -57,7 +57,7 @@
     "dependencies": {
         "@0x/assert": "^3.0.34",
         "@0x/base-contract": "^6.5.0",
-        "@0x/contract-addresses": "^6.17.0",
+        "@0x/contract-addresses": "^6.16.0",
         "@0x/json-schemas": "^6.4.4",
         "@0x/types": "^3.3.6",
         "@0x/utils": "^6.5.3",

packages/protocol-utils/CHANGELOG.json

@@ -1,14 +1,4 @@
 [
-    {
-        "version": "11.16.0",
-        "changes": [
-            {
-                "note": "Add Synthetix support`",
-                "pr": 518
-            }
-        ],
-        "timestamp": 1658950329
-    },
     {
         "version": "11.15.0",
         "changes": [

packages/protocol-utils/CHANGELOG.md

@@ -5,10 +5,6 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v11.16.0 - _July 27, 2022_
-
-    * Add Synthetix support` (#518)
-
 ## v11.15.0 - _June 14, 2022_
 
     * Add Velodrome support (#494)

packages/protocol-utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/protocol-utils",
-    "version": "11.16.0",
+    "version": "11.15.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -63,8 +63,8 @@
     },
     "dependencies": {
         "@0x/assert": "^3.0.34",
-        "@0x/contract-addresses": "^6.17.0",
-        "@0x/contract-wrappers": "^13.20.5",
+        "@0x/contract-addresses": "^6.16.0",
+        "@0x/contract-wrappers": "^13.20.4",
         "@0x/json-schemas": "^6.4.4",
         "@0x/subproviders": "^6.6.5",
         "@0x/utils": "^6.5.3",

packages/protocol-utils/src/transformer_utils.ts

@@ -140,7 +140,6 @@ export enum BridgeProtocol {
     Platypus,
     BancorV3,
     Velodrome,
-    Synthetix,
 }
 // tslint:enable: enum-naming