From 1841d5b0c7992b83d21c5d98b986b0be15681b52 Mon Sep 17 00:00:00 2001 From: Alberto Gualis Date: Tue, 26 Nov 2024 09:58:39 +0100 Subject: [PATCH 1/4] chore: bump sdk to 0.32.2 --- packages/lib/package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/lib/package.json b/packages/lib/package.json index 44986c54b..9a4e23173 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@apollo/client": "^3.11.8", - "@balancer/sdk": "0.32.1", + "@balancer/sdk": "0.32.2", "@chakra-ui/anatomy": "^2.2.2", "@chakra-ui/clickable": "^2.1.0", "@chakra-ui/hooks": "^2.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b09012f2d..94a11c675 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -326,8 +326,8 @@ importers: specifier: ^3.11.8 version: 3.11.8(@types/react@18.2.34)(graphql-ws@5.16.0(graphql@16.9.0))(graphql@16.9.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@balancer/sdk': - specifier: 0.32.1 - version: 0.32.1(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8) + specifier: 0.32.2 + version: 0.32.2(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8) '@chakra-ui/anatomy': specifier: ^2.2.2 version: 2.2.2 @@ -1709,8 +1709,8 @@ packages: resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==} engines: {node: '>=6.9.0'} - '@balancer/sdk@0.32.1': - resolution: {integrity: sha512-c4ZPexmCP8vYhrM4zgLivugxW0jbsvFEUcD0tguiFLvjfReTt6+Q7R+YMVQYTKpaU38NZiFjYE7UV0KD0z+9XQ==} + '@balancer/sdk@0.32.2': + resolution: {integrity: sha512-z5FYDattD2M6Tm2JTI5H8Nc9nbRyayW+zciyeS08sGbF7hWWDPZoI/bwr1NdiZf8jzqs+r1UW8t0Zfy8iotrEA==} engines: {node: '>=18.x'} '@bcoe/v8-coverage@0.2.3': @@ -11597,7 +11597,7 @@ snapshots: '@babel/helper-validator-identifier': 7.25.7 to-fast-properties: 2.0.0 - '@balancer/sdk@0.32.1(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)': + '@balancer/sdk@0.32.2(bufferutil@4.0.8)(typescript@5.4.5)(utf-8-validate@5.0.10)(zod@3.23.8)': dependencies: decimal.js-light: 2.5.1 lodash.clonedeep: 4.5.0 From c1ada61f2d01ec8886d7d45ca9e6be2546ff95d5 Mon Sep 17 00:00:00 2001 From: Alberto Gualis Date: Tue, 26 Nov 2024 10:19:54 +0100 Subject: [PATCH 2/4] chore: fix unit test --- .../lib/modules/pool/actions/LiquidityActionHelpers.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts b/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts index a69797967..0ea86c1e5 100644 --- a/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts +++ b/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts @@ -82,10 +82,10 @@ it('returns NestedPoolState for nested pools', () => { expect(nestedPoolState.mainTokens).toHaveLength(4) expect(nestedPoolState.mainTokens.map(t => t.address)).toEqual([ + wETHAddress, daiAddress, - usdtAddress, usdcAddress, - wETHAddress, + usdtAddress, ]) }) From a51d480c4ba96dcd0d47691b573f6d12e06eb3ab Mon Sep 17 00:00:00 2001 From: Alberto Gualis Date: Tue, 26 Nov 2024 10:34:40 +0100 Subject: [PATCH 3/4] chore: sort tokens to avoid flaky unit tests --- .../lib/modules/pool/actions/LiquidityActionHelpers.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts b/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts index 0ea86c1e5..9c2620fe5 100644 --- a/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts +++ b/packages/lib/modules/pool/actions/LiquidityActionHelpers.spec.ts @@ -73,7 +73,7 @@ it('returns NestedPoolState for nested pools', () => { const secondPool = nestedPoolState.pools[1] expect(secondPool.id).toBe(threePoolId) - expect(secondPool.tokens.map(t => t.address)).toEqual([ + expect(secondPool.tokens.sort().map(t => t.address)).toEqual([ daiAddress, usdcDaiUsdtBptAddress, usdcAddress, @@ -81,7 +81,7 @@ it('returns NestedPoolState for nested pools', () => { ]) expect(nestedPoolState.mainTokens).toHaveLength(4) - expect(nestedPoolState.mainTokens.map(t => t.address)).toEqual([ + expect(nestedPoolState.mainTokens.sort().map(t => t.address)).toEqual([ wETHAddress, daiAddress, usdcAddress, From aba8c61a6d5a0409329a01a29db69a11ec9311cd Mon Sep 17 00:00:00 2001 From: Alberto Gualis Date: Tue, 26 Nov 2024 10:43:21 +0100 Subject: [PATCH 4/4] chore: sort tokens to avoid flaky unit tests --- packages/lib/modules/pool/__mocks__/gqlPoolMock.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/lib/modules/pool/__mocks__/gqlPoolMock.spec.ts b/packages/lib/modules/pool/__mocks__/gqlPoolMock.spec.ts index e29d34f37..e31eb2459 100644 --- a/packages/lib/modules/pool/__mocks__/gqlPoolMock.spec.ts +++ b/packages/lib/modules/pool/__mocks__/gqlPoolMock.spec.ts @@ -64,10 +64,10 @@ test('getPoolMock creates a proper nested pool mock (nestedPoolMock)', () => { ] `) - expect(nestedPoolState.mainTokens.map(t => t.address)).toEqual([ + expect(nestedPoolState.mainTokens.sort().map(t => t.address)).toEqual([ + wETHAddress, daiAddress, - usdtAddress, usdcAddress, - wETHAddress, + usdtAddress, ]) })