From 0046bb26d85f4a846c3a75526fbce01eaf9f6d8b Mon Sep 17 00:00:00 2001 From: eobbad <35933488+eobbad@users.noreply.github.com> Date: Mon, 8 Aug 2022 12:27:45 -0400 Subject: [PATCH] Update WooFi sampler logicand addresses.json w/ new FQT's --- .../sampler_operations.ts | 18 ++++++++++++++++++ packages/contract-addresses/addresses.json | 8 ++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts index 36e64d2efd..8287377367 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts @@ -30,9 +30,11 @@ import { BANCORV3_NETWORK_INFO_BY_CHAIN_ID, BANCOR_REGISTRY_BY_CHAIN_ID, BEETHOVEN_X_VAULT_ADDRESS_BY_CHAIN, + BSC_TOKENS, COMPOUND_API_URL_BY_CHAIN_ID, DODOV1_CONFIG_BY_CHAIN_ID, DODOV2_FACTORIES_BY_CHAIN_ID, + FANTOM_TOKENS, GMX_READER_BY_CHAIN_ID, GMX_ROUTER_BY_CHAIN_ID, GMX_VAULT_BY_CHAIN_ID, @@ -46,6 +48,7 @@ import { NATIVE_FEE_TOKEN_BY_CHAIN_ID, NULL_ADDRESS, PLATYPUS_ROUTER_BY_CHAIN_ID, + POLYGON_TOKENS, SELL_SOURCE_FILTER_BY_CHAIN_ID, SYNTHETIX_CURRENCY_KEYS_BY_CHAIN_ID, SYNTHETIX_READ_PROXY_BY_CHAIN_ID, @@ -1832,6 +1835,13 @@ export class SamplerOperations { ); } case ERC20BridgeSource.WOOFi: { + const woofiTokens = [BSC_TOKENS.USDT, BSC_TOKENS.WBNB, BSC_TOKENS.WOO, BSC_TOKENS.WETH, BSC_TOKENS.BTCB, + AVALANCHE_TOKENS.nUSDC, AVALANCHE_TOKENS.WAVAX, AVALANCHE_TOKENS.WBTC, AVALANCHE_TOKENS.WETH, AVALANCHE_TOKENS.WOO, + FANTOM_TOKENS.USDC, FANTOM_TOKENS.WFTM, FANTOM_TOKENS.WETH, FANTOM_TOKENS.WBTC, FANTOM_TOKENS.WOO, + POLYGON_TOKENS.USDC, POLYGON_TOKENS.WMATIC, POLYGON_TOKENS.WBTC, POLYGON_TOKENS. WETH, POLYGON_TOKENS.WOO]; + if (!(woofiTokens.includes(takerToken) && woofiTokens.includes(makerToken))) { + return []; + } return this.getWOOFiSellQuotes( WOOFI_POOL_BY_CHAIN_ID[this.chainId], takerToken, @@ -2180,6 +2190,14 @@ export class SamplerOperations { ); } case ERC20BridgeSource.WOOFi: { + const woofiTokens = [BSC_TOKENS.USDT, BSC_TOKENS.WBNB, BSC_TOKENS.WOO, BSC_TOKENS.WETH, BSC_TOKENS.BTCB, + AVALANCHE_TOKENS.nUSDC, AVALANCHE_TOKENS.WAVAX, AVALANCHE_TOKENS.WBTC, AVALANCHE_TOKENS.WETH, AVALANCHE_TOKENS.WOO, + FANTOM_TOKENS.USDC, FANTOM_TOKENS.WFTM, FANTOM_TOKENS.WETH, FANTOM_TOKENS.WBTC, FANTOM_TOKENS.WOO, + POLYGON_TOKENS.USDC, POLYGON_TOKENS.WMATIC, POLYGON_TOKENS.WBTC, POLYGON_TOKENS. WETH, POLYGON_TOKENS.WOO]; + if (!(woofiTokens.includes(takerToken) && woofiTokens.includes(makerToken))) { + return []; + } + return this.getWOOFiBuyQuotes( WOOFI_POOL_BY_CHAIN_ID[this.chainId], takerToken, diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index 4465ea033f..06509750c7 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -247,7 +247,7 @@ "wethTransformer": "0xac3d95668c092e895cd83a9cbafe9c7d9906471f", "payTakerTransformer": "0x4f5e8ca2cadecd4a467ae441e4b03de4278a4574", "affiliateFeeTransformer": "0x1be34ab9b2acb5c4ddd89454bdce637967e65230", - "fillQuoteTransformer": "0x0b72d55485e8d877f73cc8b14ea3e010b3e804fd", + "fillQuoteTransformer": "0xbd7fD6E116Fc8589bb658fBA3A2cC6273050bcF2", "positiveSlippageFeeTransformer": "0x7f5c79ad1788573b1145f4651a248523c54f5d1f" } }, @@ -289,7 +289,7 @@ "wethTransformer": "0x7209185959d7227fb77274e1e88151d7c4c368d3", "payTakerTransformer": "0x3f16ca81691dab9184cb4606c361d73c4fd2510a", "affiliateFeeTransformer": "0x99356167edba8fbdc36959e3f5d0c43d1ba9c6db", - "fillQuoteTransformer": "0x45b3a72221e571017c0f0ec42189e11d149d0ace", + "fillQuoteTransformer": "0x01C082e47C8dC6dedD01e3FCb07bFd3eb72E044D", "positiveSlippageFeeTransformer": "0xdd66c23e07b4d6925b6089b5fe6fc9e62941afe8" } }, @@ -415,7 +415,7 @@ "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c", "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3", "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c", - "fillQuoteTransformer": "0xb6c9c52ce7094fc96d8bd5d3ecd0c6feeafe3457", + "fillQuoteTransformer": "0xceE9118Bc14E1fE740C54c754b901629b322EE4f", "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857" } }, @@ -457,7 +457,7 @@ "wethTransformer": "0x9b6aa8f26a92108e7d1f66373d757bb955112703", "payTakerTransformer": "0x32df54951d33d7460e15fa59b1fcc262183ce4c2", "affiliateFeeTransformer": "0x67efa679a4b56c38713d478e649c88247f4f8e88", - "fillQuoteTransformer": "0x641efe8a57ad39353fe22f77d211ef6b17b0590b", + "fillQuoteTransformer": "0xE40f81Ef6e9C95Ba04C659B8D032EaB73152aaFD", "positiveSlippageFeeTransformer": "0xe87d69b285005cc82b53b844322652c49ed64600" } },