diff --git a/packages/asset-swapper/package.json b/packages/asset-swapper/package.json index 875188577a..640f86373c 100644 --- a/packages/asset-swapper/package.json +++ b/packages/asset-swapper/package.json @@ -69,7 +69,7 @@ "@0x/json-schemas": "^6.4.4", "@0x/neon-router": "^0.3.5", "@0x/protocol-utils": "^11.16.0", - "@0x/quote-server": "^6.0.6", + "@0x/quote-server": "^8.0.0", "@0x/types": "^3.3.6", "@0x/utils": "^6.5.3", "@0x/web3-wrapper": "^7.6.5", @@ -89,7 +89,7 @@ "graphql": "^15.4.0", "graphql-request": "^3.4.0", "heartbeats": "^5.0.1", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "msw": "^0.44.2" }, "devDependencies": { @@ -100,8 +100,7 @@ "@0x/subproviders": "^6.6.5", "@0x/ts-doc-gen": "^0.0.28", "@0x/tslint-config": "^4.1.4", - "@0x/types": "^3.3.6", - "@types/lodash": "4.14.104", + "@types/lodash": "4.14.137", "@types/mocha": "^5.2.7", "@types/node": "12.12.54", "chai": "^4.0.1", @@ -110,11 +109,10 @@ "dirty-chai": "^2.0.1", "gitpkg": "https://github.com/0xProject/gitpkg.git", "mocha": "^6.2.0", - "msw": "^0.44.2", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", "shx": "^0.2.2", - "tslint": "5.11.0", + "tslint": "^6.1.3", "typedoc": "~0.16.11", "typemoq": "^2.1.0", "typescript": "4.6.3" diff --git a/packages/asset-swapper/src/types.ts b/packages/asset-swapper/src/types.ts index 6721230194..52bc48d761 100644 --- a/packages/asset-swapper/src/types.ts +++ b/packages/asset-swapper/src/types.ts @@ -18,10 +18,10 @@ import { LiquidityProviderRegistry, OptimizedMarketOrder, } from './utils/market_operation_utils/types'; -export { SamplerMetrics } from './utils/market_operation_utils/types'; import { ExtendedQuoteReportSources, PriceComparisonsReport, QuoteReport } from './utils/quote_report_generator'; import { MetricsProxy } from './utils/quote_requestor'; import { TokenAdjacencyGraph } from './utils/token_adjacency_graph'; +export { SamplerMetrics } from './utils/market_operation_utils/types'; export type Address = string; 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 c503d65ae3..b129372dff 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 @@ -33,8 +33,8 @@ import { MSTABLE_POOLS_BY_CHAIN_ID, NERVE_BSC_INFOS, NULL_ADDRESS, - PANCAKESWAP_ROUTER_BY_CHAIN_ID, PANCAKESWAPV2_ROUTER_BY_CHAIN_ID, + PANCAKESWAP_ROUTER_BY_CHAIN_ID, PANGOLIN_ROUTER_BY_CHAIN_ID, PLATYPUS_AVALANCHE_INFOS, QUICKSWAP_ROUTER_BY_CHAIN_ID, diff --git a/packages/asset-swapper/src/utils/market_operation_utils/index.ts b/packages/asset-swapper/src/utils/market_operation_utils/index.ts index 1ff786341f..ea85a759d0 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/index.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/index.ts @@ -29,7 +29,6 @@ import { PriceComparisonsReport, QuoteReport, } from './../quote_report_generator'; - import { getComparisonPrices } from './comparison_price'; import { BUY_SOURCE_FILTER_BY_CHAIN_ID, diff --git a/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/pair_swaps_cache.ts b/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/pair_swaps_cache.ts index bc4fbc8b78..f79fee1b2f 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/pair_swaps_cache.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/pools_cache/pair_swaps_cache.ts @@ -1,6 +1,5 @@ -import { BalancerSwaps } from '../types'; - import { ONE_HOUR_IN_SECONDS, ONE_SECOND_MS } from '../constants'; +import { BalancerSwaps } from '../types'; export interface CacheValue { expiresAt: number; 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 a4387bd43b..fe5bbbc84b 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 @@ -26,9 +26,9 @@ import { AAVE_V2_SUBGRAPH_URL_BY_CHAIN_ID, AVALANCHE_TOKENS, BALANCER_V2_VAULT_ADDRESS_BY_CHAIN, - BANCOR_REGISTRY_BY_CHAIN_ID, BANCORV3_NETWORK_BY_CHAIN_ID, BANCORV3_NETWORK_INFO_BY_CHAIN_ID, + BANCOR_REGISTRY_BY_CHAIN_ID, BEETHOVEN_X_VAULT_ADDRESS_BY_CHAIN, COMPOUND_API_URL_BY_CHAIN_ID, DODOV1_CONFIG_BY_CHAIN_ID, diff --git a/packages/asset-swapper/tslint.json b/packages/asset-swapper/tslint.json index 9ed65e4e05..ddc50eb3c7 100644 --- a/packages/asset-swapper/tslint.json +++ b/packages/asset-swapper/tslint.json @@ -1,6 +1,7 @@ { "extends": ["@0x/tslint-config"], "rules": { + "array-type": false, "custom-no-magic-numbers": false, "max-file-line-count": false, "binary-expression-operand-order": false diff --git a/yarn.lock b/yarn.lock index e0df0c9030..1b9a099f20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -813,7 +813,7 @@ lodash "^4.17.11" web3-provider-engine "14.0.6" -"@0x/json-schemas@^6.0.1", "@0x/json-schemas@^6.1.3": +"@0x/json-schemas@^6.1.3": version "6.1.3" resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.1.3.tgz#da71ed2e50ae6813a6d4d0fe5f8ad69b8e6a7435" dependencies: @@ -822,7 +822,7 @@ ajv "^6.12.5" lodash.values "^4.3.0" -"@0x/json-schemas@^6.4.4": +"@0x/json-schemas@^6.4.0", "@0x/json-schemas@^6.4.4": version "6.4.4" resolved "https://registry.yarnpkg.com/@0x/json-schemas/-/json-schemas-6.4.4.tgz#9243c18ef6c1333c3cc47bf2870912d7badb307e" dependencies: @@ -878,9 +878,10 @@ ethers "~4.0.4" lodash "^4.17.11" -"@0x/protocol-utils@^1.0.1": +"@0x/protocol-utils@^1.9.0": version "1.11.2" resolved "https://registry.yarnpkg.com/@0x/protocol-utils/-/protocol-utils-1.11.2.tgz#c27ccf3410b99d8c364550bc18dc8b04dc2e967e" + integrity sha512-DmYCWb3fB1NSBbR7JV2Tr4oXr/3rDzVpECWUvntCyIwdohHSM7ytjYbL9ilvlH3vuDK85CSyFWNrbSP6xZfTpA== dependencies: "@0x/assert" "^3.0.34" "@0x/contract-addresses" "^6.12.1" @@ -894,13 +895,14 @@ ethers "~4.0.4" lodash "^4.17.11" -"@0x/quote-server@^6.0.6": - version "6.0.6" - resolved "https://registry.yarnpkg.com/@0x/quote-server/-/quote-server-6.0.6.tgz#0f0bf50647efc4bff039a491689974af7e8c5776" +"@0x/quote-server@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@0x/quote-server/-/quote-server-8.0.0.tgz#3537bd0c71317afa2b3899c5f11f34c4c73cb418" + integrity sha512-H4aLgyMgeDpv+i1NpaLe9uPbIq3Vq+NP1JSwUolFMGX4AANCakhTzXchqGINt5v9eoqEPyOkPwvN+DsjXvuDrg== dependencies: - "@0x/json-schemas" "^6.0.1" + "@0x/json-schemas" "^6.4.0" "@0x/order-utils" "^10.2.4" - "@0x/protocol-utils" "^1.0.1" + "@0x/protocol-utils" "^1.9.0" "@0x/utils" "^5.4.1" "@types/express" "^4.17.3" express "^4.17.1" @@ -2654,6 +2656,11 @@ version "4.14.104" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80" +"@types/lodash@4.14.137": + version "4.14.137" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.137.tgz#8a4804937dc6462274ffcc088df8f14fc1b368e2" + integrity sha512-g4rNK5SRKloO+sUGbuO7aPtwbwzMgjK+bm9BBhLD7jGUiGR7zhwYEhSln/ihgYQBeIJ5j7xjyaYzrWTcu3UotQ== + "@types/mime@*": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a" @@ -5271,7 +5278,7 @@ diff@3.5.0, diff@^3.1.0, diff@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" -diff@4.0.2: +diff@4.0.2, diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -8699,6 +8706,11 @@ lodash.values@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347" +lodash@4.17.15: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + lodash@4.17.20, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.2.1: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" @@ -9146,6 +9158,11 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1. version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" +minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + minipass@^2.3.5, minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -9220,6 +9237,13 @@ mkdirp@0.5.x, mkdirp@0.x.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0: dependencies: minimist "^1.2.5" +mkdirp@^0.5.3: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + mocha@8.1.2: version "8.1.2" resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.1.2.tgz#d67fad13300e4f5cd48135a935ea566f96caf827" @@ -12459,7 +12483,7 @@ tslib@1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8" -tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.13.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -12499,13 +12523,32 @@ tslint@5.11.0: tslib "^1.8.0" tsutils "^2.27.2" +tslint@^6.1.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" + integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== + dependencies: + "@babel/code-frame" "^7.0.0" + builtin-modules "^1.1.1" + chalk "^2.3.0" + commander "^2.12.1" + diff "^4.0.1" + glob "^7.1.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + mkdirp "^0.5.3" + resolve "^1.3.2" + semver "^5.3.0" + tslib "^1.13.0" + tsutils "^2.29.0" + tsutils@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.0.0.tgz#0c5070a17a0503e056da038c48b5a1870a50a9ad" dependencies: tslib "^1.8.1" -tsutils@^2.13.1, tsutils@^2.27.2: +tsutils@^2.13.1, tsutils@^2.27.2, tsutils@^2.29.0: version "2.29.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" dependencies: