From fe3496a665819901fb6c39cc6ed314e9bc5767da Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Sat, 2 Jul 2022 10:33:43 +1000 Subject: [PATCH 1/5] chore: remove dead code --- .../src/service/AssetServiceTestData.ts | 265 ------------------ packages/investor-foxy/src/api/foxy-types.ts | 12 - packages/investor-foxy/src/constants/enums.ts | 4 - .../src/coingecko/coingecko-types.ts | 2 - .../market-service/src/yearn/yearn-types.ts | 55 ---- packages/swapper/src/api.ts | 5 - packages/types/src/market.ts | 1 - 7 files changed, 344 deletions(-) delete mode 100644 packages/asset-service/src/service/AssetServiceTestData.ts diff --git a/packages/asset-service/src/service/AssetServiceTestData.ts b/packages/asset-service/src/service/AssetServiceTestData.ts deleted file mode 100644 index e282aad7a..000000000 --- a/packages/asset-service/src/service/AssetServiceTestData.ts +++ /dev/null @@ -1,265 +0,0 @@ -import { Asset } from '@shapeshiftoss/types' - -import { AssetsById } from './AssetService' - -export const ETHMockedAsset: Asset = { - assetId: 'eip155:1/slip44:60', - chainId: 'eip155:1', - symbol: 'ETH', - name: 'Ethereum', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/eth@2x.png', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - // tokens: [ - // { - // assetId: 'eip155:1/erc20:0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9', - // chainId: 'eip155:1', - // name: 'Aave', - // precision: 18, - // color: '#FFFFFF', - // secondaryColor: '#FFFFFF', - // icon: 'https://assets.coingecko.com/coins/images/12645/thumb/AAVE.png?1601374110', - // symbol: 'AAVE' - // }, - // { - // assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d', - // chainId: 'eip155:1', - // name: 'Fox', - // precision: 18, - // color: '#FFFFFF', - // secondaryColor: '#FFFFFF', - // icon: 'https://assets.coincap.io/assets/icons/fox@2x.png', - // symbol: 'FOX' - // } - // ] -} - -export const BTCMockedAsset: Asset = { - assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0', - chainId: 'bip122:000000000019d6689c085ae165831e93', - symbol: 'BTC', - name: 'Bitcoin', - precision: 8, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/btc@2x.png', - explorer: 'https://live.blockcypher.com', - explorerTxLink: 'https://live.blockcypher.com/btc/tx/', - explorerAddressLink: 'https://live.blockcypher.com/btc/address/' -} - -export const mockBaseAssets: Asset[] = [ - ETHMockedAsset, - { - assetId: 'eip155:3/slip44:60', - chainId: 'eip155:3', - symbol: 'ETH', - name: 'Ethereum', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/eth@2x.png', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - // tokens: [ - // { - // assetId: 'eip155:3/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d', - // chainId: 'eip155:3', - // name: 'Fox', - // precision: 18, - // color: '#FFFFFF', - // icon: 'https://assets.coincap.io/assets/icons/fox@2x.png', - // symbol: 'FOX' - // } - // ] - }, - BTCMockedAsset, - { - assetId: 'bip122:000000000933ea01ad0ee984209779ba/slip44:0', - chainId: 'bip122:000000000933ea01ad0ee984209779ba', - symbol: 'BTC', - name: 'Bitcoin', - precision: 8, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/btc@2x.png', - explorer: 'https://live.blockcypher.com/btc-testnet/', - explorerTxLink: 'https://live.blockcypher.com/btc-testnet/tx/', - explorerAddressLink: 'https://live.blockcypher.com/btc-testnet/address/' - } -] - -export const mockAssets: Asset[] = [ - { - assetId: 'eip155:1/slip44:60', - chainId: 'eip155:1', - symbol: 'ETH', - name: 'Ethereum', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/eth@2x.png', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - { - assetId: 'eip155:1/erc20:0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9', - chainId: 'eip155:1', - name: 'Aave', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coingecko.com/coins/images/12645/thumb/AAVE.png?1601374110', - symbol: 'AAVE', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - { - assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d', - chainId: 'eip155:1', - name: 'Fox', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/fox@2x.png', - symbol: 'FOX', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - { - assetId: 'eip155:3/slip44:60', - chainId: 'eip155:3', - symbol: 'ETH', - name: 'Ethereum', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/eth@2x.png', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - { - assetId: 'eip155:3/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d', - chainId: 'eip155:3', - name: 'Fox', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/fox@2x.png', - symbol: 'FOX', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - { - assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0', - chainId: 'bip122:000000000019d6689c085ae165831e93', - symbol: 'BTC', - name: 'Bitcoin', - precision: 8, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/btc@2x.png', - explorer: 'https://live.blockcypher.com', - explorerTxLink: 'https://live.blockcypher.com/btc/tx/', - explorerAddressLink: 'https://live.blockcypher.com/btc/address/' - }, - { - assetId: 'bip122:000000000933ea01ad0ee984209779ba/slip44:0', - chainId: 'bip122:000000000933ea01ad0ee984209779ba', - symbol: 'BTC', - name: 'Bitcoin', - precision: 8, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/btc@2x.png', - explorer: 'https://live.blockcypher.com/btc-testnet/', - explorerTxLink: 'https://live.blockcypher.com/btc-testnet/tx/', - explorerAddressLink: 'https://live.blockcypher.com/btc-testnet/address/' - } -] - -export const mockIndexedAssetData: AssetsById = { - ethereum_MAINNET: { - assetId: 'eip155:1/slip44:60', - chainId: 'eip155:1', - symbol: 'ETH', - name: 'Ethereum', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/eth@2x.png', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - ethereum_MAINNET_0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9: { - assetId: 'eip155:1/erc20:0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9', - chainId: 'eip155:1', - name: 'Aave', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coingecko.com/coins/images/12645/thumb/AAVE.png?1601374110', - symbol: 'AAVE', - explorer: 'https://etherscan.io', - explorerAddressLink: 'https://etherscan.io/address/', - explorerTxLink: 'https://etherscan.io/tx/' - }, - ethereum_MAINNET_0xc770eefad204b5180df6a14ee197d99d808ee52d: { - assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d', - chainId: 'eip155:1', - name: 'Fox', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/fox@2x.png', - symbol: 'FOX', - explorer: 'https://etherscan.io', - explorerAddressLink: 'https://etherscan.io/address/', - explorerTxLink: 'https://etherscan.io/tx/' - }, - ethereum_ETH_ROPSTEN: { - assetId: 'eip155:3/slip44:60', - chainId: 'eip155:3', - symbol: 'ETH', - name: 'Ethereum', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/eth@2x.png', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - ethereum_ETH_ROPSTEN_0xc770eefad204b5180df6a14ee197d99d808ee52d: { - assetId: 'eip155:3/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d', - chainId: 'eip155:3', - name: 'Fox', - precision: 18, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/fox@2x.png', - symbol: 'FOX', - explorer: 'https://etherscan.io', - explorerTxLink: 'https://etherscan.io/tx/', - explorerAddressLink: 'https://etherscan.io/address/' - }, - bitcoin_MAINNET: { - assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0', - chainId: 'bip122:000000000019d6689c085ae165831e93', - symbol: 'BTC', - name: 'Bitcoin', - precision: 8, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/btc@2x.png', - explorer: 'https://live.blockcypher.com', - explorerTxLink: 'https://live.blockcypher.com/btc/tx/', - explorerAddressLink: 'https://live.blockcypher.com/btc/address/' - }, - bitcoin_TESTNET: { - assetId: 'bip122:000000000933ea01ad0ee984209779ba/slip44:0', - chainId: 'bip122:000000000933ea01ad0ee984209779ba', - symbol: 'BTC', - name: 'Bitcoin', - precision: 8, - color: '#FFFFFF', - icon: 'https://assets.coincap.io/assets/icons/btc@2x.png', - explorer: 'https://live.blockcypher.com/btc-testnet/', - explorerTxLink: 'https://live.blockcypher.com/btc-testnet/tx/', - explorerAddressLink: 'https://live.blockcypher.com/btc-testnet/address/' - } -} diff --git a/packages/investor-foxy/src/api/foxy-types.ts b/packages/investor-foxy/src/api/foxy-types.ts index 27b0af73a..d86ac9539 100644 --- a/packages/investor-foxy/src/api/foxy-types.ts +++ b/packages/investor-foxy/src/api/foxy-types.ts @@ -46,11 +46,6 @@ export type TxInput = { export type TxInputWithoutAmount = Pick> -export type TxInputWithoutAmountUnsigned = Pick< - TxInputWithoutAmount, - Exclude -> - export type TxInputWithoutAmountAndWallet = Pick< TxInputWithoutAmount, Exclude @@ -141,13 +136,6 @@ export type Recipient = { amount: string } -export type EstimateClaimFromTokemak = TxInputWithoutAmountAndWallet & { - recipient: Recipient - v: number - r: string - s: string -} - export type RebaseEvent = { epoch: string blockNumber: number diff --git a/packages/investor-foxy/src/constants/enums.ts b/packages/investor-foxy/src/constants/enums.ts index 62b127320..b91dbec8e 100644 --- a/packages/investor-foxy/src/constants/enums.ts +++ b/packages/investor-foxy/src/constants/enums.ts @@ -1,7 +1,3 @@ -export enum DefiProvider { - Foxy = 'foxy' -} - export enum DefiType { TokenStaking = 'token-staking' } diff --git a/packages/market-service/src/coingecko/coingecko-types.ts b/packages/market-service/src/coingecko/coingecko-types.ts index 67a8760aa..7b4421377 100644 --- a/packages/market-service/src/coingecko/coingecko-types.ts +++ b/packages/market-service/src/coingecko/coingecko-types.ts @@ -1,5 +1,3 @@ -export type CoinGeckoMarketCapNoId = Omit - export type CoinGeckoMarketData = { current_price: Record market_cap: Record diff --git a/packages/market-service/src/yearn/yearn-types.ts b/packages/market-service/src/yearn/yearn-types.ts index 0d063b1ea..0b3ff088d 100644 --- a/packages/market-service/src/yearn/yearn-types.ts +++ b/packages/market-service/src/yearn/yearn-types.ts @@ -1,58 +1,3 @@ -type Strategy = { - address: string - name: string -} -export type YearnMarketCap = { - inception: number - address: string - symbol: string - name: string - display_name: string - icon: string - token: { - name: string - symbol: string - address: string - decimals: number - display_name: string - icon: string - } - tvl: { - total_assets: number - price: number - tvl: number - } - apy: { - type: string - gross_apr: number - net_apy: number - fees: { - performance: number | null - withdrawal: number | null - management: number | null - keep_crv: number | null - cvx_keep_crv: number | null - } - points: null | { - week_ago: number | null - month_ago: number | null - inception: number | null - } - composite: null - } - strategies: Strategy[] - endorsed: boolean - version: string - decimals: number - type: string - emergency_shutdown: boolean - updated: number - migration: null | { - available: boolean - address: string - } -} - type VaultDayDatum = { pricePerShare: string timestamp: string diff --git a/packages/swapper/src/api.ts b/packages/swapper/src/api.ts index cf65e8f33..7780714a3 100644 --- a/packages/swapper/src/api.ts +++ b/packages/swapper/src/api.ts @@ -141,11 +141,6 @@ export interface MinMaxOutput { maximum: string } -export type GetMinMaxInput = { - sellAsset: Asset - buyAsset: Asset -} - export type ApprovalNeededOutput = { approvalNeeded: boolean } diff --git a/packages/types/src/market.ts b/packages/types/src/market.ts index 5ffbf21c1..401016372 100644 --- a/packages/types/src/market.ts +++ b/packages/types/src/market.ts @@ -31,7 +31,6 @@ export type MarketDataArgs = { } export type FindAllMarketType = (args: FindAllMarketArgs) => Promise -export type FindByCaip19MarketType = (args: MarketDataArgs) => Promise export type PriceHistoryType = (args: PriceHistoryArgs) => Promise From 272ac375f49064d8a9f91557d050a4ed1be54134 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Sat, 2 Jul 2022 10:36:45 +1000 Subject: [PATCH 2/5] chore: remove redundent nesting in template literal --- .../thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/swapper/src/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.ts b/packages/swapper/src/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.ts index 1a3081475..3f05641bf 100644 --- a/packages/swapper/src/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.ts +++ b/packages/swapper/src/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.ts @@ -5,6 +5,7 @@ import { QuoteFeeData, SwapError, SwapErrorTypes } from '../../../../../api' import { bn } from '../../../../utils/bignumber' import { ThorchainSwapperDeps } from '../../../types' import { estimateTradeFee } from '../../estimateTradeFee/estimateTradeFee' + export const getBtcTxFees = async ({ deps, opReturnData, @@ -28,7 +29,7 @@ export const getBtcTxFees = async ({ | undefined if (!adapter) throw new SwapError( - `[getBtcTxFees] - No chain adapter found for ${'bip122:000000000019d6689c085ae165831e93'}.`, + `[getBtcTxFees] - No chain adapter found for bip122:000000000019d6689c085ae165831e93.`, { code: SwapErrorTypes.UNSUPPORTED_CHAIN, details: { chainId: 'bip122:000000000019d6689c085ae165831e93' } From 905f98c5b4eb256d62fd3f3c18cdbbad8308e367 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Sat, 2 Jul 2022 10:43:49 +1000 Subject: [PATCH 3/5] chore: remove redundant awaits --- .../src/swappers/cow/CowSwapper.test.ts | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/swapper/src/swappers/cow/CowSwapper.test.ts b/packages/swapper/src/swappers/cow/CowSwapper.test.ts index 3b5398be9..4e65c8649 100644 --- a/packages/swapper/src/swappers/cow/CowSwapper.test.ts +++ b/packages/swapper/src/swappers/cow/CowSwapper.test.ts @@ -39,7 +39,7 @@ describe('CowSwapper', () => { const swapper = new CowSwapper(COW_SWAPPER_DEPS) describe('static properties', () => { - it('returns the correct swapper name', async () => { + it('returns the correct swapper name', () => { expect(CowSwapper.swapperName).toEqual('CowSwapper') }) }) @@ -58,78 +58,78 @@ describe('CowSwapper', () => { }) describe('filterAssetIdsBySellable', () => { - it('returns empty array when called with an empty array', async () => { - expect(await swapper.filterAssetIdsBySellable([])).toEqual([]) + it('returns empty array when called with an empty array', () => { + expect(swapper.filterAssetIdsBySellable([])).toEqual([]) }) - it('returns array filtered out of non erc20 tokens', async () => { - expect(await swapper.filterAssetIdsBySellable(ASSET_IDS)).toEqual([ + it('returns array filtered out of non erc20 tokens', () => { + expect(swapper.filterAssetIdsBySellable(ASSET_IDS)).toEqual([ WBTC.assetId, WETH.assetId, FOX.assetId ]) }) - it('returns array filtered out of unsupported tokens', async () => { + it('returns array filtered out of unsupported tokens', () => { const assetIds = [FOX.assetId, 'eip155:1/erc20:0xdc49108ce5c57bc3408c3a5e95f3d864ec386ed3'] - expect(await swapper.filterAssetIdsBySellable(assetIds)).toEqual([FOX.assetId]) + expect(swapper.filterAssetIdsBySellable(assetIds)).toEqual([FOX.assetId]) }) }) describe('filterBuyAssetsBySellAssetId', () => { - it('returns empty array when called with an empty assetIds array', async () => { + it('returns empty array when called with an empty assetIds array', () => { expect( - await swapper.filterBuyAssetsBySellAssetId({ assetIds: [], sellAssetId: WETH.assetId }) + swapper.filterBuyAssetsBySellAssetId({ assetIds: [], sellAssetId: WETH.assetId }) ).toEqual([]) }) - it('returns empty array when called with sellAssetId that is not sellable', async () => { + it('returns empty array when called with sellAssetId that is not sellable', () => { expect( - await swapper.filterBuyAssetsBySellAssetId({ + swapper.filterBuyAssetsBySellAssetId({ assetIds: ASSET_IDS, sellAssetId: ETH.assetId }) ).toEqual([]) expect( - await swapper.filterBuyAssetsBySellAssetId({ + swapper.filterBuyAssetsBySellAssetId({ assetIds: ASSET_IDS, sellAssetId: 'eip155:1/erc20:0xdc49108ce5c57bc3408c3a5e95f3d864ec386ed3' }) ).toEqual([]) }) - it('returns array filtered out of non erc20 tokens when called with a sellable sellAssetId', async () => { + it('returns array filtered out of non erc20 tokens when called with a sellable sellAssetId', () => { expect( - await swapper.filterBuyAssetsBySellAssetId({ + swapper.filterBuyAssetsBySellAssetId({ assetIds: ASSET_IDS, sellAssetId: WETH.assetId }) ).toEqual([WBTC.assetId, FOX.assetId]) expect( - await swapper.filterBuyAssetsBySellAssetId({ + swapper.filterBuyAssetsBySellAssetId({ assetIds: ASSET_IDS, sellAssetId: WBTC.assetId }) ).toEqual([WETH.assetId, FOX.assetId]) expect( - await swapper.filterBuyAssetsBySellAssetId({ + swapper.filterBuyAssetsBySellAssetId({ assetIds: ASSET_IDS, sellAssetId: FOX.assetId }) ).toEqual([WBTC.assetId, WETH.assetId]) }) - it('returns array filtered out of unsupported tokens when called with a sellable sellAssetId', async () => { + it('returns array filtered out of unsupported tokens when called with a sellable sellAssetId', () => { const assetIds = [FOX.assetId, 'eip155:1/erc20:0xdc49108ce5c57bc3408c3a5e95f3d864ec386ed3'] expect( - await swapper.filterBuyAssetsBySellAssetId({ + swapper.filterBuyAssetsBySellAssetId({ assetIds, sellAssetId: WETH.assetId }) ).toEqual([FOX.assetId]) - expect( - await swapper.filterBuyAssetsBySellAssetId({ assetIds, sellAssetId: FOX.assetId }) - ).toEqual([]) + expect(swapper.filterBuyAssetsBySellAssetId({ assetIds, sellAssetId: FOX.assetId })).toEqual( + [] + ) }) }) From 278f5da151d0fb506511180e2425bac80bd3c72a Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Sat, 2 Jul 2022 10:46:50 +1000 Subject: [PATCH 4/5] chore: protect abstract class consturctor --- packages/chain-adapters/src/evm/EVMBaseAdapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/chain-adapters/src/evm/EVMBaseAdapter.ts b/packages/chain-adapters/src/evm/EVMBaseAdapter.ts index 6434e6949..fd4002891 100644 --- a/packages/chain-adapters/src/evm/EVMBaseAdapter.ts +++ b/packages/chain-adapters/src/evm/EVMBaseAdapter.ts @@ -63,7 +63,7 @@ export abstract class EVMBaseAdapter implements IChainAda static defaultBIP44Params: BIP44Params - constructor(args: EVMBaseAdapterArgs) { + protected constructor(args: EVMBaseAdapterArgs) { EVMBaseAdapter.defaultBIP44Params = (this.constructor).defaultBIP44Params this.supportedChainIds = args.supportedChainIds From 023772916ac3cbcfe758234a05771e6226149fd5 Mon Sep 17 00:00:00 2001 From: Apotheosis <97164662+0xApotheosis@users.noreply.github.com> Date: Sat, 2 Jul 2022 10:53:18 +1000 Subject: [PATCH 5/5] chore: remove unneeded continues and optimize imports --- packages/chain-adapters/src/evm/EVMBaseAdapter.ts | 8 ++++++-- .../market-service/src/fiat-market-service-manager.ts | 2 -- packages/market-service/src/market-service-manager.ts | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/chain-adapters/src/evm/EVMBaseAdapter.ts b/packages/chain-adapters/src/evm/EVMBaseAdapter.ts index fd4002891..3364b3fc2 100644 --- a/packages/chain-adapters/src/evm/EVMBaseAdapter.ts +++ b/packages/chain-adapters/src/evm/EVMBaseAdapter.ts @@ -1,6 +1,10 @@ import { AssetId, ChainId, toAssetId } from '@shapeshiftoss/caip' -import { ETHSignMessage } from '@shapeshiftoss/hdwallet-core' -import { bip32ToAddressNList, ETHSignTx, ETHWallet } from '@shapeshiftoss/hdwallet-core' +import { + bip32ToAddressNList, + ETHSignMessage, + ETHSignTx, + ETHWallet +} from '@shapeshiftoss/hdwallet-core' import { BIP44Params, KnownChainIds } from '@shapeshiftoss/types' import * as unchained from '@shapeshiftoss/unchained-client' import WAValidator from 'multicoin-address-validator' diff --git a/packages/market-service/src/fiat-market-service-manager.ts b/packages/market-service/src/fiat-market-service-manager.ts index 471e6580b..96c19c3ae 100644 --- a/packages/market-service/src/fiat-market-service-manager.ts +++ b/packages/market-service/src/fiat-market-service-manager.ts @@ -15,7 +15,6 @@ export const findByFiatSymbol = async ({ symbol }: FiatMarketDataArgs) => { result = await FiatMarketProviders[i].findByFiatSymbol({ symbol }) } catch (e) { // Swallow error, not every fiat will be with every provider. - continue } } if (!result) return null @@ -33,7 +32,6 @@ export const findPriceHistoryByFiatSymbol: FiatPriceHistoryType = async ({ result = await FiatMarketProviders[i].findPriceHistoryByFiatSymbol({ symbol, timeframe }) } catch (e) { // Swallow error, not every fiat will be with every provider. - continue } } if (!result) return [] diff --git a/packages/market-service/src/market-service-manager.ts b/packages/market-service/src/market-service-manager.ts index 05b5451bf..4cfd62512 100644 --- a/packages/market-service/src/market-service-manager.ts +++ b/packages/market-service/src/market-service-manager.ts @@ -1,12 +1,12 @@ import { JsonRpcProvider } from '@ethersproject/providers' import { + FindAllMarketArgs, HistoryData, MarketCapResult, MarketData, MarketDataArgs, PriceHistoryArgs } from '@shapeshiftoss/types' -import { FindAllMarketArgs } from '@shapeshiftoss/types' import { Yearn } from '@yfi/sdk' import { MarketService } from './api' @@ -79,7 +79,6 @@ export class MarketServiceManager { result = await this.marketProviders[i].findByAssetId({ assetId }) } catch (e) { // Swallow error, not every asset will be with every provider. - continue } } if (!result) return null @@ -97,7 +96,6 @@ export class MarketServiceManager { result = await this.marketProviders[i].findPriceHistoryByAssetId({ assetId, timeframe }) } catch (e) { // Swallow error, not every asset will be with every provider. - continue } } if (!result) return []