Publish

- @0x/contracts-integrations@2.7.52
 - @0x/asset-swapper@6.18.1

contracts/integrations/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@0x/contracts-integrations",
-    "version": "2.7.51",
+    "version": "2.7.52",
     "private": true,
     "engines": {
         "node": ">=6.12"
@@ -93,7 +93,7 @@
         "typescript": "4.2.2"
     },
     "dependencies": {
-        "@0x/asset-swapper": "^6.18.0",
+        "@0x/asset-swapper": "^6.18.1",
         "@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": "6.18.1",
+        "changes": [
+            {
+                "note": "FirebirdOneSwap, ApeSwap. New hop tokens: DFYN, BANANA, WEXPOLY",
+                "pr": 265
+            }
+        ],
+        "timestamp": 1624405040
+    },
     {
         "version": "6.18.0",
         "changes": [

packages/asset-swapper/CHANGELOG.md

@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v6.18.1 - _June 22, 2021_
+
+    * FirebirdOneSwap, ApeSwap. New hop tokens: DFYN, BANANA, WEXPOLY (#265)
+
 ## v6.18.0 - _June 22, 2021_
 
     * Add Lido stETH deposit integration (#260)

packages/asset-swapper/package.json

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

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

@@ -16,6 +16,8 @@ import {
     CURVE_V2_POLYGON_INFOS,
     DFYN_ROUTER_BY_CHAIN_ID,
     ELLIPSIS_BSC_INFOS,
+    FIREBIRDONESWAP_BSC_INFOS,
+    FIREBIRDONESWAP_POLYGON_INFOS,
     JULSWAP_ROUTER_BY_CHAIN_ID,
     KYBER_BANNED_RESERVES,
     KYBER_BRIDGED_LIQUIDITY_PREFIX,
@@ -36,7 +38,7 @@ import {
     SUSHISWAP_ROUTER_BY_CHAIN_ID,
     SWERVE_MAINNET_INFOS,
     UNISWAPV2_ROUTER_BY_CHAIN_ID,
-    WAULT_ROUTER_BY_CHAIN_ID,
+    WAULTSWAP_ROUTER_BY_CHAIN_ID,
     XSIGMA_MAINNET_INFOS,
 } from './constants';
 import { CurveInfo, ERC20BridgeSource } from './types';
@@ -195,6 +197,30 @@ export function getNerveInfosForPair(chainId: ChainId, takerToken: string, maker
     );
 }
 
+export function getFirebirdOneSwapInfosForPair(chainId: ChainId, takerToken: string, makerToken: string): CurveInfo[] {
+    if (chainId === ChainId.BSC) {
+        return Object.values(FIREBIRDONESWAP_BSC_INFOS).filter(c =>
+            [makerToken, takerToken].every(
+                t =>
+                    (c.tokens.includes(t) && c.metaTokens === undefined) ||
+                    (c.tokens.includes(t) &&
+                        [makerToken, takerToken].filter(v => c.metaTokens?.includes(v)).length > 0),
+            ),
+        );
+    } else if (chainId === ChainId.Polygon) {
+        return Object.values(FIREBIRDONESWAP_POLYGON_INFOS).filter(c =>
+            [makerToken, takerToken].every(
+                t =>
+                    (c.tokens.includes(t) && c.metaTokens === undefined) ||
+                    (c.tokens.includes(t) &&
+                        [makerToken, takerToken].filter(v => c.metaTokens?.includes(v)).length > 0),
+            ),
+        );
+    } else {
+        return [];
+    }
+}
+
 export function getBeltInfosForPair(chainId: ChainId, takerToken: string, makerToken: string): CurveInfo[] {
     if (chainId !== ChainId.BSC) {
         return [];
@@ -308,7 +334,8 @@ export function getCurveLikeInfosForPair(
         | ERC20BridgeSource.Ellipsis
         | ERC20BridgeSource.Smoothy
         | ERC20BridgeSource.Saddle
-        | ERC20BridgeSource.XSigma,
+        | ERC20BridgeSource.XSigma
+        | ERC20BridgeSource.FirebirdOneSwap,
 ): CurveDetailedInfo[] {
     let pools: CurveInfo[] = [];
     switch (source) {
@@ -342,6 +369,9 @@ export function getCurveLikeInfosForPair(
         case ERC20BridgeSource.XSigma:
             pools = getXSigmaInfosForPair(chainId, takerToken, makerToken);
             break;
+        case ERC20BridgeSource.FirebirdOneSwap:
+            pools = getFirebirdOneSwapInfosForPair(chainId, takerToken, makerToken);
+            break;
         default:
             throw new Error(`Unknown Curve like source ${source}`);
     }
@@ -399,7 +429,7 @@ export function uniswapV2LikeRouterAddress(
         case ERC20BridgeSource.Dfyn:
             return DFYN_ROUTER_BY_CHAIN_ID[chainId];
         case ERC20BridgeSource.WaultSwap:
-            return WAULT_ROUTER_BY_CHAIN_ID[chainId];
+            return WAULTSWAP_ROUTER_BY_CHAIN_ID[chainId];
         case ERC20BridgeSource.Polydex:
             return POLYDEX_ROUTER_BY_CHAIN_ID[chainId];
         default:

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

@@ -130,6 +130,7 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.JulSwap,
             ERC20BridgeSource.LiquidityProvider,
             ERC20BridgeSource.WaultSwap,
+            ERC20BridgeSource.FirebirdOneSwap,
         ]),
         [ChainId.Polygon]: new SourceFilters([
             ERC20BridgeSource.SushiSwap,
@@ -143,6 +144,8 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.CurveV2,
             ERC20BridgeSource.WaultSwap,
             ERC20BridgeSource.Polydex,
+            ERC20BridgeSource.ApeSwap,
+            ERC20BridgeSource.FirebirdOneSwap,
         ]),
     },
     new SourceFilters([]),
@@ -218,6 +221,7 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.JulSwap,
             ERC20BridgeSource.LiquidityProvider,
             ERC20BridgeSource.WaultSwap,
+            ERC20BridgeSource.FirebirdOneSwap,
         ]),
         [ChainId.Polygon]: new SourceFilters([
             ERC20BridgeSource.SushiSwap,
@@ -231,6 +235,8 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId<SourceFilters>(
             ERC20BridgeSource.CurveV2,
             ERC20BridgeSource.WaultSwap,
             ERC20BridgeSource.Polydex,
+            ERC20BridgeSource.ApeSwap,
+            ERC20BridgeSource.FirebirdOneSwap,
         ]),
     },
     new SourceFilters([]),
@@ -350,12 +356,15 @@ export const MAINNET_TOKENS = {
 };
 
 export const BSC_TOKENS = {
+    WBNB: '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c',
     BUSD: '0xe9e7cea3dedca5984780bafc599bd69add087d56',
     USDT: '0x55d398326f99059ff775485246999027b3197955',
     USDC: '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d',
     DAI: '0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3',
     PAX: '0xb7f8cd00c5a06c0537e2abff0b58033d02e5e094',
     UST: '0x23396cf899ca06c4472205fc903bdb4de249d6fc',
+    WEX: '0xa9c41a46a6b3531d28d5c32f6633dd2ff05dfb90',
+    WETH: '0x2170ed0880ac9a755fd29b2688956bd959f933f8',
 };
 
 export const POLYGON_TOKENS = {
@@ -370,8 +379,9 @@ export const POLYGON_TOKENS = {
     WETH: '0x7ceb23fd6bc0add59e62ac25578270cff1b9f619',
     renBTC: '0xdbf31df14b66535af65aac99c32e9ea844e14501',
     QUICK: '0x831753dd7087cac61ab5644b308642cc1c33dc13',
-    TITAN: '0xaaa5b9e6c589642f98a1cda99b9d024b8407285a',
-    IRON: '0xd86b5923f3ad7b585ed81b448170ae026c65ae9a',
+    DFYN: '0xc168e40227e4ebd8c1cae80f7a55a4f0e6d66c97',
+    BANANA: '0x5d47baba0d66083c52009271faf3f50dcc01023c',
+    WEXPOLY: '0x4c4bf319237d98a30a929a96112effa8da3510eb',
 };
 
 export const CURVE_POOLS = {
@@ -469,6 +479,14 @@ export const XSIGMA_POOLS = {
     stable: '0x3333333ACdEdBbC9Ad7bda0876e60714195681c5',
 };
 
+export const FIREBIRDONESWAP_BSC_POOLS = {
+    oneswap: '0x01c9475dbd36e46d1961572c8de24b74616bae9e',
+};
+
+export const FIREBIRDONESWAP_POLYGON_POOLS = {
+    oneswap: '0x01c9475dbd36e46d1961572c8de24b74616bae9e',
+};
+
 export const DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID = valueByChainId<string[]>(
     {
         [ChainId.Mainnet]: [
@@ -479,12 +497,13 @@ export const DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID = valueByChainId<string[]>(
             MAINNET_TOKENS.WBTC,
         ],
         [ChainId.BSC]: [
-            '0xbb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c', // WBNB
-            '0xe9e7cea3dedca5984780bafc599bd69add087d56', // BUSD
-            '0x1af3f329e8be154074d8769d1ffa4ee058b1dbc3', // DAI
-            '0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d', // USDC
-            '0x2170ed0880ac9a755fd29b2688956bd959f933f8', // ETH
-            '0x55d398326f99059ff775485246999027b3197955', // BUSD-T
+            BSC_TOKENS.WBNB,
+            BSC_TOKENS.BUSD,
+            BSC_TOKENS.DAI,
+            BSC_TOKENS.USDC,
+            BSC_TOKENS.WETH,
+            BSC_TOKENS.USDT,
+            BSC_TOKENS.WEX,
         ],
         [ChainId.Ropsten]: [
             getContractAddressesForChainOrThrow(ChainId.Ropsten).etherToken,
@@ -499,8 +518,9 @@ export const DEFAULT_INTERMEDIATE_TOKENS_BY_CHAIN_ID = valueByChainId<string[]>(
             POLYGON_TOKENS.USDT,
             POLYGON_TOKENS.WBTC,
             POLYGON_TOKENS.QUICK,
-            POLYGON_TOKENS.TITAN,
-            POLYGON_TOKENS.IRON,
+            POLYGON_TOKENS.DFYN,
+            POLYGON_TOKENS.BANANA,
+            POLYGON_TOKENS.WEXPOLY,
         ],
     },
     [],
@@ -886,7 +906,7 @@ export const XSIGMA_MAINNET_INFOS: { [name: string]: CurveInfo } = {
     }),
 };
 
-// Curve pools like using custom selectors
+// Curve-like sources using custom selectors
 export const SADDLE_MAINNET_INFOS: { [name: string]: CurveInfo } = {
     [SADDLE_POOLS.stables]: {
         exchangeFunctionSelector: CurveFunctionSelectors.swap,
@@ -953,6 +973,30 @@ export const NERVE_BSC_INFOS: { [name: string]: CurveInfo } = {
     },
 };
 
+export const FIREBIRDONESWAP_BSC_INFOS: { [name: string]: CurveInfo } = {
+    [FIREBIRDONESWAP_BSC_POOLS.oneswap]: {
+        exchangeFunctionSelector: CurveFunctionSelectors.swap,
+        sellQuoteFunctionSelector: CurveFunctionSelectors.calculateSwap,
+        buyQuoteFunctionSelector: CurveFunctionSelectors.None,
+        poolAddress: FIREBIRDONESWAP_BSC_POOLS.oneswap,
+        tokens: [BSC_TOKENS.BUSD, BSC_TOKENS.USDT, BSC_TOKENS.DAI, BSC_TOKENS.USDC],
+        metaTokens: undefined,
+        gasSchedule: 100e3,
+    },
+};
+
+export const FIREBIRDONESWAP_POLYGON_INFOS: { [name: string]: CurveInfo } = {
+    [FIREBIRDONESWAP_POLYGON_POOLS.oneswap]: {
+        exchangeFunctionSelector: CurveFunctionSelectors.swap,
+        sellQuoteFunctionSelector: CurveFunctionSelectors.calculateSwap,
+        buyQuoteFunctionSelector: CurveFunctionSelectors.None,
+        poolAddress: FIREBIRDONESWAP_POLYGON_POOLS.oneswap,
+        tokens: [POLYGON_TOKENS.DAI, POLYGON_TOKENS.USDC, POLYGON_TOKENS.USDT],
+        metaTokens: undefined,
+        gasSchedule: 100e3,
+    },
+};
+
 /**
  * Kyber reserve prefixes
  * 0xff Fed price reserve
@@ -1302,6 +1346,7 @@ export const BAKERYSWAP_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
 export const APESWAP_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     {
         [ChainId.BSC]: '0xc0788a3ad43d79aa53b09c2eacc313a787d1d607',
+        [ChainId.Polygon]: '0xc0788a3ad43d79aa53b09c2eacc313a787d1d607',
     },
     NULL_ADDRESS,
 );
@@ -1351,7 +1396,7 @@ export const DFYN_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     NULL_ADDRESS,
 );
 
-export const WAULT_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
+export const WAULTSWAP_ROUTER_BY_CHAIN_ID = valueByChainId<string>(
     {
         [ChainId.BSC]: '0xd48745e39bbed146eec15b79cbf964884f9877c2',
         [ChainId.Polygon]: '0x3a1d87f206d12415f5b0a33e786967680aab4f6d',
@@ -1409,6 +1454,7 @@ export const DEFAULT_GAS_SCHEDULE: Required<FeeSchedule> = {
     [ERC20BridgeSource.Smoothy]: fillData => (fillData as CurveFillData).pool.gasSchedule,
     [ERC20BridgeSource.Saddle]: fillData => (fillData as CurveFillData).pool.gasSchedule,
     [ERC20BridgeSource.XSigma]: fillData => (fillData as CurveFillData).pool.gasSchedule,
+    [ERC20BridgeSource.FirebirdOneSwap]: fillData => (fillData as CurveFillData).pool.gasSchedule,
     [ERC20BridgeSource.MultiBridge]: () => 350e3,
     [ERC20BridgeSource.UniswapV2]: uniswapV2CloneGasSchedule,
     [ERC20BridgeSource.SushiSwap]: uniswapV2CloneGasSchedule,

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

@@ -168,6 +168,8 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s
             return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'WaultSwap');
         case ERC20BridgeSource.Polydex:
             return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'Polydex');
+        case ERC20BridgeSource.FirebirdOneSwap:
+            return encodeBridgeSourceId(BridgeProtocol.Nerve, 'FirebirdOneSwap');
         case ERC20BridgeSource.Lido:
             return encodeBridgeSourceId(BridgeProtocol.Lido, 'Lido');
         default:
@@ -201,6 +203,7 @@ export function createBridgeDataForBridgeOrder(order: OptimizedMarketBridgeOrder
         case ERC20BridgeSource.Smoothy:
         case ERC20BridgeSource.Saddle:
         case ERC20BridgeSource.XSigma:
+        case ERC20BridgeSource.FirebirdOneSwap:
             const curveFillData = (order as OptimizedMarketBridgeOrder<CurveFillData>).fillData;
             bridgeData = encoder.encode([
                 curveFillData.pool.poolAddress,
@@ -417,6 +420,7 @@ export const BRIDGE_ENCODERS: {
     [ERC20BridgeSource.Smoothy]: curveEncoder,
     [ERC20BridgeSource.Saddle]: curveEncoder,
     [ERC20BridgeSource.XSigma]: curveEncoder,
+    [ERC20BridgeSource.FirebirdOneSwap]: curveEncoder,
     // UniswapV2 like, (router, address[])
     [ERC20BridgeSource.Bancor]: routerAddressPathEncoder,
     [ERC20BridgeSource.UniswapV2]: routerAddressPathEncoder,

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

@@ -1262,6 +1262,7 @@ export class SamplerOperations {
                     case ERC20BridgeSource.Ellipsis:
                     case ERC20BridgeSource.Saddle:
                     case ERC20BridgeSource.XSigma:
+                    case ERC20BridgeSource.FirebirdOneSwap:
                         return getCurveLikeInfosForPair(this.chainId, takerToken, makerToken, source).map(pool =>
                             this.getCurveSellQuotes(
                                 pool,
@@ -1531,6 +1532,7 @@ export class SamplerOperations {
                     case ERC20BridgeSource.Ellipsis:
                     case ERC20BridgeSource.Saddle:
                     case ERC20BridgeSource.XSigma:
+                    case ERC20BridgeSource.FirebirdOneSwap:
                         return getCurveLikeInfosForPair(this.chainId, takerToken, makerToken, source).map(pool =>
                             this.getCurveBuyQuotes(
                                 pool,

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

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