Publish

- @0x/contracts-integrations@2.7.58
 - @0x/asset-swapper@16.21.0

contracts/integrations/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-integrations",
-    "version": "2.7.57",
+    "version": "2.7.58",
     "private": true,
     "engines": {
         "node": ">=6.12"
@@ -93,7 +93,7 @@
         "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/asset-swapper": "^16.20.0",
+        "@0x/asset-swapper": "^16.21.0",
         "@0x/base-contract": "^6.4.0",
         "@0x/contracts-asset-proxy": "^3.7.16",
         "@0x/contracts-erc1155": "^2.1.34",

packages/asset-swapper/CHANGELOG.json

@@ -1,4 +1,14 @@
 [
+    {
+        "version": "16.21.0",
+        "changes": [
+            {
+                "note": "JetSwap",
+                "pr": 280
+            }
+        ],
+        "timestamp": 1625904026
+    },
     {
         "version": "16.20.0",
         "changes": [

packages/asset-swapper/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v16.21.0 - _July 10, 2021_
+
+    * JetSwap (#280)
+
 ## v16.20.0 - _July 6, 2021_
 
     * ShibaSwap (#276)

packages/asset-swapper/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/asset-swapper",
-    "version": "16.20.0",
+    "version": "16.21.0",
     "engines": {
         "node": ">=6.12"
     },

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

@@ -18,6 +18,7 @@ import {
     ELLIPSIS_BSC_INFOS,
     FIREBIRDONESWAP_BSC_INFOS,
     FIREBIRDONESWAP_POLYGON_INFOS,
+    JETSWAP_ROUTER_BY_CHAIN_ID,
     JULSWAP_ROUTER_BY_CHAIN_ID,
     KYBER_BANNED_RESERVES,
     KYBER_BRIDGED_LIQUIDITY_PREFIX,
@@ -401,7 +402,8 @@ export function uniswapV2LikeRouterAddress(
         | ERC20BridgeSource.Dfyn
         | ERC20BridgeSource.WaultSwap
         | ERC20BridgeSource.Polydex
-        | ERC20BridgeSource.ShibaSwap,
+        | ERC20BridgeSource.ShibaSwap
+        | ERC20BridgeSource.JetSwap,
 ): string {
     switch (source) {
         case ERC20BridgeSource.UniswapV2:
@@ -436,6 +438,8 @@ export function uniswapV2LikeRouterAddress(
             return POLYDEX_ROUTER_BY_CHAIN_ID[chainId];
         case ERC20BridgeSource.ShibaSwap:
             return SHIBASWAP_ROUTER_BY_CHAIN_ID[chainId];
+        case ERC20BridgeSource.JetSwap:
+            return JETSWAP_ROUTER_BY_CHAIN_ID[chainId];
         default:
             throw new Error(`Unknown UniswapV2 like source ${source}`);
     }

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

@@ -132,6 +132,7 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.LiquidityProvider,
             ERC20BridgeSource.WaultSwap,
             ERC20BridgeSource.FirebirdOneSwap,
+            ERC20BridgeSource.JetSwap,
         ]),
         [ChainId.Polygon]: new SourceFilters([
             ERC20BridgeSource.SushiSwap,
@@ -151,6 +152,7 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.KyberDmm,
             ERC20BridgeSource.LiquidityProvider,
             ERC20BridgeSource.MultiHop,
+            ERC20BridgeSource.JetSwap,
         ]),
     },
     new SourceFilters([]),
@@ -228,6 +230,7 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.LiquidityProvider,
             ERC20BridgeSource.WaultSwap,
             ERC20BridgeSource.FirebirdOneSwap,
+            ERC20BridgeSource.JetSwap,
         ]),
         [ChainId.Polygon]: new SourceFilters([
             ERC20BridgeSource.SushiSwap,
@@ -247,6 +250,7 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.KyberDmm,
             ERC20BridgeSource.LiquidityProvider,
             ERC20BridgeSource.MultiHop,
+            ERC20BridgeSource.JetSwap,
         ]),
     },
     new SourceFilters([]),
@@ -1432,6 +1436,14 @@ export const POLYDEX_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     NULL_ADDRESS,
 );
 
+export const JETSWAP_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
+    {
+        [ChainId.BSC]: '0xbe65b8f75b9f20f4c522e0067a3887fada714800',
+        [ChainId.Polygon]: '0x5c6ec38fb0e2609672bdf628b1fd605a523e5923',
+    },
+    NULL_ADDRESS,
+);
+
 const uniswapV2CloneGasSchedule = (fillData?: FillData) => {
     // TODO: Different base cost if to/from ETH.
     let gas = 90e3;
@@ -1556,6 +1568,7 @@ export const DEFAULT_GAS_SCHEDULE: Required<FeeSchedule> = {
     [ERC20BridgeSource.ComethSwap]: uniswapV2CloneGasSchedule,
     [ERC20BridgeSource.Dfyn]: uniswapV2CloneGasSchedule,
     [ERC20BridgeSource.Polydex]: uniswapV2CloneGasSchedule,
+    [ERC20BridgeSource.JetSwap]: uniswapV2CloneGasSchedule,
 };
 
 export const DEFAULT_FEE_SCHEDULE: Required<FeeSchedule> = { ...DEFAULT_GAS_SCHEDULE };

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

@@ -174,6 +174,8 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s
             return encodeBridgeSourceId(BridgeProtocol.Lido, 'Lido');
         case ERC20BridgeSource.ShibaSwap:
             return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'ShibaSwap');
+        case ERC20BridgeSource.JetSwap:
+            return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'JetSwap');
         default:
             throw new Error(AggregationError.NoBridgeForSource);
     }
@@ -245,6 +247,7 @@ export function createBridgeDataForBridgeOrder(order: OptimizedMarketBridgeOrder
         case ERC20BridgeSource.WaultSwap:
         case ERC20BridgeSource.Polydex:
         case ERC20BridgeSource.ShibaSwap:
+        case ERC20BridgeSource.JetSwap:
             const uniswapV2FillData = (order as OptimizedMarketBridgeOrder<UniswapV2FillData>).fillData;
             bridgeData = encoder.encode([uniswapV2FillData.router, uniswapV2FillData.tokenAddressPath]);
             break;
@@ -445,6 +448,7 @@ export const BRIDGE_ENCODERS: {
     [ERC20BridgeSource.ComethSwap]: routerAddressPathEncoder,
     [ERC20BridgeSource.Dfyn]: routerAddressPathEncoder,
     [ERC20BridgeSource.Polydex]: routerAddressPathEncoder,
+    [ERC20BridgeSource.JetSwap]: routerAddressPathEncoder,
     // Generic pools
     [ERC20BridgeSource.Shell]: poolEncoder,
     [ERC20BridgeSource.Component]: poolEncoder,

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

@@ -1230,6 +1230,7 @@ export class SamplerOperations {
                     case ERC20BridgeSource.WaultSwap:
                     case ERC20BridgeSource.Polydex:
                     case ERC20BridgeSource.ShibaSwap:
+                    case ERC20BridgeSource.JetSwap:
                         const uniLikeRouter = uniswapV2LikeRouterAddress(this.chainId, source);
                         if (!isValidAddress(uniLikeRouter)) {
                             return [];
@@ -1501,6 +1502,7 @@ export class SamplerOperations {
                     case ERC20BridgeSource.WaultSwap:
                     case ERC20BridgeSource.Polydex:
                     case ERC20BridgeSource.ShibaSwap:
+                    case ERC20BridgeSource.JetSwap:
                         const uniLikeRouter = uniswapV2LikeRouterAddress(this.chainId, source);
                         if (!isValidAddress(uniLikeRouter)) {
                             return [];

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

@@ -87,6 +87,7 @@ export enum ERC20BridgeSource {
     WaultSwap = 'WaultSwap',
     Polydex = 'Polydex',
     FirebirdOneSwap = 'FirebirdOneSwap',
+    JetSwap = 'JetSwap',
 }
 export type SourcesWithPoolsCache = ERC20BridgeSource.Balancer | ERC20BridgeSource.BalancerV2 | ERC20BridgeSource.Cream;
 

packages/asset-swapper/src/utils/quote_requestor.ts

@@ -29,6 +29,7 @@ import { RfqMakerBlacklist } from './rfq_maker_blacklist';
 
 const MAKER_TIMEOUT_STREAK_LENGTH = 10;
 const MAKER_TIMEOUT_BLACKLIST_DURATION_MINUTES = 10;
+const FILL_RATIO_WARNING_LEVEL = 0.99;
 const rfqMakerBlacklist = new RfqMakerBlacklist(MAKER_TIMEOUT_STREAK_LENGTH, MAKER_TIMEOUT_BLACKLIST_DURATION_MINUTES);
 
 interface RfqQuote<T> {
@@ -563,6 +564,22 @@ export class QuoteRequestor {
                 this._warningLogger(order, 'Expiry too soon in RFQ-T firm quote, filtering out');
                 return false;
             } else {
+                const takerAmount = new BigNumber(order.takerAmount);
+                const fillRatio = takerAmount.div(assetFillAmount);
+                if (fillRatio.lt(1) && fillRatio.gte(FILL_RATIO_WARNING_LEVEL)) {
+                    this._warningLogger(
+                        {
+                            makerUri: result.makerUri,
+                            fillRatio,
+                            assetFillAmount,
+                            takerToken,
+                            makerToken,
+                            takerAmount: order.takerAmount,
+                            makerAmount: order.makerAmount,
+                        },
+                        'Fill ratio in warning range',
+                    );
+                }
                 return true;
             }
         });