From e8796bc7e5c586ffe8be904c0b104b602fffdb3c Mon Sep 17 00:00:00 2001 From: ConjunctiveNormalForm Date: Tue, 21 May 2024 11:07:31 -0400 Subject: [PATCH] use latest x-sdk --- package.json | 2 +- test/unit/entities/DutchV2Quote.test.ts | 3 --- yarn.lock | 36 +++++++++++++++---------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index e672a0ba..ef360571 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@uniswap/router-sdk": "^1.9.0", "@uniswap/sdk-core": "^4.2.0", "@uniswap/smart-order-router": "^3.26.0", - "@uniswap/uniswapx-sdk": "^2.0.1-alpha.10", + "@uniswap/uniswapx-sdk": "2.1.0-beta.4", "@uniswap/universal-router-sdk": "^1.9.0", "aws-cdk-lib": "2.85.0", "aws-embedded-metrics": "^4.1.0", diff --git a/test/unit/entities/DutchV2Quote.test.ts b/test/unit/entities/DutchV2Quote.test.ts index 86184c09..7e3f6a37 100644 --- a/test/unit/entities/DutchV2Quote.test.ts +++ b/test/unit/entities/DutchV2Quote.test.ts @@ -56,9 +56,6 @@ describe('DutchV2Quote', () => { const order = v2Quote.toOrder(); const orderJson = order.toJSON(); - console.log(orderJson.outputs); - console.log(v2Quote.amountOutGasAndPortionAdjusted.toString()); - expect(orderJson.outputs[0].startAmount).toEqual( v2Quote.amountOutGasAndPortionAdjusted .mul(BPS - V2_OUTPUT_AMOUNT_BUFFER_BPS) diff --git a/yarn.lock b/yarn.lock index 0fdd8511..2c3c059d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2070,6 +2070,14 @@ ethers "^5.3.1" tiny-invariant "^1.3.1" +"@uniswap/permit2-sdk@^1.2.1": + version "1.2.1" + resolved "https://registry.npmjs.org/@uniswap/permit2-sdk/-/permit2-sdk-1.2.1.tgz#7f562d96a26de0538508ba9ea2b2f02150572bf2" + integrity sha512-3eEVW6d1tepF9L4XLGhrGoVPKFBe/kQYRCvkzMmYu32amEeV2L8sg5TBJhrVZu+cu0srX7rh3nhOucNdMVOGzg== + dependencies: + ethers "^5.7.0" + tiny-invariant "^1.1.0" + "@uniswap/router-sdk@^1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@uniswap/router-sdk/-/router-sdk-1.9.0.tgz#f35432ddc400ddb83985adc840c5898e2bc008cd" @@ -2081,10 +2089,10 @@ "@uniswap/v2-sdk" "^4.3.0" "@uniswap/v3-sdk" "^3.11.0" -"@uniswap/sdk-core@^4.0.3": - version "4.0.6" - resolved "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.0.6.tgz" - integrity sha512-6GzCVfnOiJtvo91zlF/VjnC2OEbBRThVclzrh7+Zmo8dBovXwSlXwqn3RkSWACn/XEOzAKH70TficfOWm6mWJA== +"@uniswap/sdk-core@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.2.0.tgz#9930f133baec9c1118d891ebf8fcba7f7efc153d" + integrity sha512-yXAMLHZRYYuh6KpN2nOlLTYBjGiopmI9WUB4Z0tyNkW4ZZub54cUt22eibpGbZAhRAMxclox9IPIs6wwrM3soQ== dependencies: "@ethersproject/address" "^5.0.2" big.js "^5.2.2" @@ -2093,10 +2101,10 @@ tiny-invariant "^1.1.0" toformat "^2.0.0" -"@uniswap/sdk-core@^4.2.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.2.0.tgz#9930f133baec9c1118d891ebf8fcba7f7efc153d" - integrity sha512-yXAMLHZRYYuh6KpN2nOlLTYBjGiopmI9WUB4Z0tyNkW4ZZub54cUt22eibpGbZAhRAMxclox9IPIs6wwrM3soQ== +"@uniswap/sdk-core@^5.0.0": + version "5.0.0" + resolved "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-5.0.0.tgz#7accd8c7372b14811777cbd1d92133d4de57c683" + integrity sha512-m5KmkqvvEz5rurRHdG3zGJappi1Crxet3B2dpgDFgq5MKoKd6qCbeChRkoQjTTJpY1MLGCsXj8ZtZ0/arisvLQ== dependencies: "@ethersproject/address" "^5.0.2" big.js "^5.2.2" @@ -2165,15 +2173,15 @@ resolved "https://registry.npmjs.org/@uniswap/token-lists/-/token-lists-1.0.0-beta.33.tgz" integrity sha512-JQkXcpRI3jFG8y3/CGC4TS8NkDgcxXaOQuYW8Qdvd6DcDiIyg2vVYCG9igFEzF0G6UvxgHkBKC7cWCgzZNYvQg== -"@uniswap/uniswapx-sdk@^2.0.1-alpha.10": - version "2.0.1-alpha.10" - resolved "https://registry.yarnpkg.com/@uniswap/uniswapx-sdk/-/uniswapx-sdk-2.0.1-alpha.10.tgz#7ea770031fd59bb92121ad6c44c1a8710055b995" - integrity sha512-nDWJ9qLFBLId2lxJ8TMy15HIBlzQe2yFE6LEJSzEF1T5EGDFv1G/ioKQSm2LJg4cO11UfVouHKsn6rwYS6P9wA== +"@uniswap/uniswapx-sdk@2.1.0-beta.4": + version "2.1.0-beta.4" + resolved "https://registry.npmjs.org/@uniswap/uniswapx-sdk/-/uniswapx-sdk-2.1.0-beta.4.tgz#052bd0d3601e4e14eb76e744f4ab164b952756c9" + integrity sha512-kIbWoGiMrrpq265/99+zOBOlHP/t22lLYKW5C7yKT0HiSM+t671Nl6hvUftRkdf2J7CribOBH1koJyWjkMikOA== dependencies: "@ethersproject/bytes" "^5.7.0" "@ethersproject/providers" "^5.7.0" - "@uniswap/permit2-sdk" "^1.2.0" - "@uniswap/sdk-core" "^4.0.3" + "@uniswap/permit2-sdk" "^1.2.1" + "@uniswap/sdk-core" "^5.0.0" ethers "^5.7.0" "@uniswap/universal-router-sdk@^1.8.1":