From 466df9fee794d11b9b422d2757e5874f64f9d043 Mon Sep 17 00:00:00 2001 From: shawnxin89 Date: Fri, 8 Oct 2021 11:30:36 -0700 Subject: [PATCH] add support for ftm --- .../bridge_source_utils.ts | 5 +++++ .../utils/market_operation_utils/constants.ts | 22 +++++++++---------- .../sampler_operations.ts | 6 +++++ packages/contract-addresses/addresses.json | 16 +++++++------- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts b/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts index 590927a3a8..a7aed18811 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts @@ -392,9 +392,14 @@ export function getCurveLikeInfosForPair( | ERC20BridgeSource.ACryptos, ): CurveDetailedInfo[] { let pools: CurveInfo[] = []; + console.log("Inside 2", source); switch (source) { case ERC20BridgeSource.Curve: pools = getCurveInfosForPair(chainId, takerToken, makerToken); + console.log("Inside 2 chainId", chainId); + console.log("Inside 2 pools", pools); + console.log("Inside 2 takerToken", takerToken); + console.log("Inside 2 makerToken", makerToken); break; case ERC20BridgeSource.CurveV2: pools = getCurveV2InfosForPair(chainId, takerToken, makerToken); diff --git a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts index 58a5988807..61c785a6d7 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts @@ -450,12 +450,12 @@ export const AVALANCHE_TOKENS = { export const FANTOM_TOKENS = { WFTM: '0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83', - WETH: '0x74b23882a30290451A17c44f4F05243b6b58C76d', - USDC: '0x04068DA6C83AFCFA0e13ba15A6696662335D5B75', + WETH: '0x74b23882a30290451a17c44f4f05243b6b58c76d', + USDC: '0x04068da6c83afcfa0e13ba15a6696662335d5b75', DAI: '0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e', fUSDT: '0x049d68029688eabf473097a2fc38ef61633a3c7a', - WBTC: '0x321162Cd933E2Be498Cd2267a90534A804051b11', - renBTC: '0xDBf31dF14B66535aF65AaC99C32e9eA844e14501', + WBTC: '0x321162cd933e2be498cd2267a90534a804051b11', + renBTC: '0xdbf31df14b66535af65aac99c32e9ea844e14501', }; export const CURVE_POOLS = { @@ -1002,20 +1002,20 @@ export const CURVE_V2_POLYGON_INFOS: { [name: string]: CurveInfo } = { // TODO: modify gasSchedule export const CURVE_FANTOM_INFOS: { [name: string]: CurveInfo } = { [CURVE_FANTOM_POOLS.ren]: createCurveExchangePool({ - tokens: [FANTOM_TOKENS.renBTC, FANTOM_TOKENS.WBTC], + tokens: [FANTOM_TOKENS.WBTC, FANTOM_TOKENS.renBTC], pool: CURVE_FANTOM_POOLS.ren, gasSchedule: 171e3, }), - [CURVE_FANTOM_POOLS.twoPool]: createCurveExchangeUnderlyingPool({ + [CURVE_FANTOM_POOLS.twoPool]: createCurveExchangePool({ tokens: [FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC], pool: CURVE_FANTOM_POOLS.twoPool, - gasSchedule: 587e3, - }), - [CURVE_FANTOM_POOLS.fUSDT]: createCurveExchangePool({ - tokens: [FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC, FANTOM_TOKENS.fUSDT], - pool: CURVE_FANTOM_POOLS.fUSDT, gasSchedule: 176e3, }), + [CURVE_FANTOM_POOLS.fUSDT]: createCurveExchangeUnderlyingPool({ + tokens: [FANTOM_TOKENS.fUSDT, FANTOM_TOKENS.DAI, FANTOM_TOKENS.USDC], + pool: CURVE_FANTOM_POOLS.fUSDT, + gasSchedule: 587e3, + }), } export const CURVE_V2_FANTOM_INFOS: { [name: string]: CurveInfo } = { 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 3903d53ee4..9cea083322 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 @@ -1084,6 +1084,7 @@ export class SamplerOperations { return this._createBatch( subOps, (samples: BigNumber[][]) => { + console.log("Median", samples); if (samples.length === 0) { return ZERO_AMOUNT; } @@ -1108,9 +1109,13 @@ export class SamplerOperations { takerFillAmounts: BigNumber[], ): BatchedOperation { const subOps = this._getSellQuoteOperations(sources, makerToken, takerToken, takerFillAmounts); + console.log(sources); + console.log(takerFillAmounts); + console.log("subOps", subOps); return this._createBatch( subOps, (samples: BigNumber[][]) => { + console.log("Sell", samples); return subOps.map((op, i) => { return samples[i].map((output, j) => ({ source: op.source, @@ -1166,6 +1171,7 @@ export class SamplerOperations { if (isBadTokenForSource(makerToken, source) || isBadTokenForSource(takerToken, source)) { return []; } + console.log("Inside", source); switch (source) { case ERC20BridgeSource.Eth2Dai: return []; diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index d6e379af1d..09cdca17e3 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -406,17 +406,17 @@ "maximumGasPrice": "0x0000000000000000000000000000000000000000", "dexForwarderBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0xca7bab1b2d1ec7d81710b7f9e2ab4e6788930588", - "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff", - "exchangeProxyTransformerDeployer": "0xa60b57833dce6260f4f2411c811755dd980bc0a7", + "exchangeProxy": "0xDEf1520C89538d9e43Aa273b7803a16F871d21e3", + "exchangeProxyTransformerDeployer": "0x47F01db18a38261E4cB153bAe6db7d3743AcB33c", "exchangeProxyFlashWallet": "0xdb6f1920a889355780af7570773609bd8cb1f498", - "exchangeProxyLiquidityProviderSandbox": "0x8953c63d0858d286cc407cd6f8e26b9cbd02a511", + "exchangeProxyLiquidityProviderSandbox": "0xcA64D4225804F2Ae069760CB5fF2F1D8BaC1C2f9", "zrxTreasury": "0x0000000000000000000000000000000000000000", "transformers": { - "wethTransformer": "0x9b8b52391071d71cd4ad1e61d7f273268fa34c6c", - "payTakerTransformer": "0x898c6fde239d646c73f0a57e3570b6f86a3d62a3", - "affiliateFeeTransformer": "0x34617b855411e52fbc05899435f44cbd0503022c", - "fillQuoteTransformer": "0x8a5417dd7ffde61ec61e11b45797e16686e1d6b9", - "positiveSlippageFeeTransformer": "0x470ba89da18a6db6e8a0567b3c9214b960861857" + "wethTransformer": "0x9b6aA8f26A92108e7d1F66373d757Bb955112703", + "payTakerTransformer": "0x32dF54951D33D7460e15Fa59B1fCc262183ce4C2", + "affiliateFeeTransformer": "0x67EfA679a4b56C38713d478e649C88247F4F8E88", + "fillQuoteTransformer": "0xa21ab090bE8BDE78dAB8FA47988aBbEDF361327A", + "positiveSlippageFeeTransformer": "0xe87D69b285005CC82b53B844322652C49ED64600" } } }