From b428ce9d0f0318a9a2a648b43c17e6dc851d43ec Mon Sep 17 00:00:00 2001 From: pocin <8642344+pocin@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:31:47 +0200 Subject: [PATCH 1/3] fix: update balancer-sdk to fix fetchPools() error --- apps/dapp/package.json | 2 +- yarn.lock | 62 ++++++++++++++++++++++++++++++++---------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/apps/dapp/package.json b/apps/dapp/package.json index f7bb1ac1a..5f081f3a3 100644 --- a/apps/dapp/package.json +++ b/apps/dapp/package.json @@ -20,7 +20,7 @@ "codegen:safe-api-v1": "yarn safe-api-v1-host && openapi --input ./src/safe/open-api/apiV1.json --output ./src/safe/open-api/client" }, "dependencies": { - "@balancer-labs/sdk": "^1.0.4", + "@balancer-labs/sdk": "1.1.6-beta.23", "@safe-global/safe-apps-provider": "^0.18.0", "@safe-global/safe-apps-sdk": "^8.1.0", "@safe-global/safe-core-sdk-types": "2.3.0", diff --git a/yarn.lock b/yarn.lock index a4fbef0b5..54186bcf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1224,7 +1224,29 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" -"@balancer-labs/sdk@^1.0.4", "@balancer-labs/sdk@^1.1.2": +"@balancer-labs/sdk@1.1.6-beta.23": + version "1.1.6-beta.23" + resolved "https://registry.yarnpkg.com/@balancer-labs/sdk/-/sdk-1.1.6-beta.23.tgz#c87a7e31dca2477231c24117b0544040aba10ec0" + integrity sha512-wcFMU0O2wqdnUUhe7jOM5ikr6ipYP7vmqygiDKB2lSlN3hgd/AOTgsw4E7tMuwlf7xUpLC5hRNi4WiRivrZHBQ== + dependencies: + "@balancer-labs/sor" "^4.1.1-beta.17" + "@ethersproject/abi" "^5.4.0" + "@ethersproject/abstract-signer" "^5.4.0" + "@ethersproject/address" "^5.4.0" + "@ethersproject/base64" "5.5.0" + "@ethersproject/bignumber" "^5.4.0" + "@ethersproject/bytes" "^5.4.0" + "@ethersproject/constants" "^5.4.0" + "@ethersproject/contracts" "^5.4.0" + "@ethersproject/providers" "^5.4.5" + axios "^0.24.0" + ethers "^5" + graphql "^15.6.1" + graphql-request "^3.5.0" + json-to-graphql-query "^2.2.4" + lodash "^4.17.21" + +"@balancer-labs/sdk@^1.1.2": version "1.1.4" resolved "https://registry.yarnpkg.com/@balancer-labs/sdk/-/sdk-1.1.4.tgz#d5ed27bb0688ba90f79897c64616e67c9d392f9c" integrity sha512-MW8KAKFl3IRcA0rJHLhoeUHPtIOo3joW8nWju6TGaOCEodvYuFzeEd0CUQa9txWRmaKBJX0KRa6txAdmqV49Pw== @@ -1245,10 +1267,10 @@ json-to-graphql-query "^2.2.4" lodash "^4.17.21" -"@balancer-labs/sor@^4.1.1-beta.16": - version "4.1.1-beta.16" - resolved "https://registry.yarnpkg.com/@balancer-labs/sor/-/sor-4.1.1-beta.16.tgz#bee2a863c751ca10320090b4831db26492b1959f" - integrity sha512-EKS7J78r5jKDsGqOs2gzIyhOqYyDAmrwp/nY2bSsfymNXSTr7g3YS418UJl1hSQMBEeN4N2MnH0neM1oJxHHoQ== +"@balancer-labs/sor@^4.1.1-beta.16", "@balancer-labs/sor@^4.1.1-beta.17": + version "4.1.1-beta.17" + resolved "https://registry.yarnpkg.com/@balancer-labs/sor/-/sor-4.1.1-beta.17.tgz#8c404a86174003cccf2bb87d49221cfdcf083246" + integrity sha512-JcX/HeppyoIs+Sa3Z/pdZhqMOBAGajOwVkBkFA8rehd1K2qaU/k/a3OkbIidXjs4lQI9sJE1WO8RauCLtuLQfg== dependencies: isomorphic-fetch "^2.2.1" @@ -5045,7 +5067,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.0", "@types/react@^18.2.79": +"@types/react@*", "@types/react@^18.2.79": version "18.2.79" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.79.tgz#c40efb4f255711f554d47b449f796d1c7756d865" integrity sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w== @@ -11987,7 +12009,7 @@ ethers@^4.0.32, ethers@^4.0.40, ethers@^4.0.45: uuid "2.0.1" xmlhttprequest "1.8.0" -ethers@^5.0.13, ethers@^5.7.1, ethers@^5.7.2, ethers@~5.7.0: +ethers@^5, ethers@^5.0.13, ethers@^5.7.1, ethers@^5.7.2, ethers@~5.7.0: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -12610,11 +12632,16 @@ follow-redirects@1.5.10: dependencies: debug "=3.1.0" -follow-redirects@^1.12.1, follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, follow-redirects@^1.14.9: +follow-redirects@^1.12.1, follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.14.9: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +follow-redirects@^1.14.4: + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + for-each@^0.3.3, for-each@~0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -13357,9 +13384,9 @@ graphql-request@^3.5.0: form-data "^3.0.0" graphql@^15.6.1: - version "15.8.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" - integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== + version "15.9.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.9.0.tgz#4e8ca830cfd30b03d44d3edd9cac2b0690304b53" + integrity sha512-GCOQdvm7XxV1S4U4CGrsdlEN37245eC8P9zaYCMr6K1BG0IPGy5lUwmJsEOGyl1GD6HXjOtl2keCP9asRBwNvA== growl@1.10.5: version "1.10.5" @@ -22480,16 +22507,21 @@ websocket@^1.0.31, websocket@^1.0.32: utf-8-validate "^5.0.2" yaeti "^0.0.6" -whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0: - version "3.6.18" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.18.tgz#2f640cdee315abced7daeaed2309abd1e44e62d4" - integrity sha512-ltN7j66EneWn5TFDO4L9inYC1D+Czsxlrw2SalgjMmEMkLfA5SIZxEFdE6QtHFiiM6Q7WL32c7AkI3w6yxM84Q== +whatwg-fetch@>=0.10.0: + version "3.6.20" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70" + integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg== whatwg-fetch@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== +whatwg-fetch@^3.0.0: + version "3.6.18" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.18.tgz#2f640cdee315abced7daeaed2309abd1e44e62d4" + integrity sha512-ltN7j66EneWn5TFDO4L9inYC1D+Czsxlrw2SalgjMmEMkLfA5SIZxEFdE6QtHFiiM6Q7WL32c7AkI3w6yxM84Q== + whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" From 977f53aa7c1a0fe96f8c6f114e67e6179bbc81db Mon Sep 17 00:00:00 2001 From: pocin <8642344+pocin@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:29:54 +0200 Subject: [PATCH 2/3] fix: switch rpc provider balancer-sdk requests are too large for llamarpc --- apps/dapp/src/constants/env/local.tsx | 2 +- apps/dapp/src/constants/env/preview.tsx | 2 +- apps/dapp/src/constants/env/production.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dapp/src/constants/env/local.tsx b/apps/dapp/src/constants/env/local.tsx index bd6806d01..977245bd5 100644 --- a/apps/dapp/src/constants/env/local.tsx +++ b/apps/dapp/src/constants/env/local.tsx @@ -5,7 +5,7 @@ const ENV = import.meta.env; const env: Environment = { alchemyId: '-nNWThz_YpX1cGffGiz-lbSMu7dmp4GK', - rpcUrl: 'https://eth.llamarpc.com', + rpcUrl: 'https://rpc.ankr.com/eth', backendUrl: 'http://localhost:3001', contracts: { balancerVault: '', diff --git a/apps/dapp/src/constants/env/preview.tsx b/apps/dapp/src/constants/env/preview.tsx index 745692817..0579f1c05 100644 --- a/apps/dapp/src/constants/env/preview.tsx +++ b/apps/dapp/src/constants/env/preview.tsx @@ -3,7 +3,7 @@ import { Environment } from './types'; const env: Environment = { alchemyId: 'AorwfDdHDsEjIX4HPwS70zkVjWqjv5vZ', - rpcUrl: 'https://eth.llamarpc.com', + rpcUrl: 'https://rpc.ankr.com/eth', backendUrl: 'https://backend-stage.templedao.link', contracts: { balancerVault: '', diff --git a/apps/dapp/src/constants/env/production.tsx b/apps/dapp/src/constants/env/production.tsx index d25c2d5ff..a224063aa 100644 --- a/apps/dapp/src/constants/env/production.tsx +++ b/apps/dapp/src/constants/env/production.tsx @@ -3,7 +3,7 @@ import { Environment } from './types'; const env: Environment = { alchemyId: 'XiIZxWykHU5AOFBwxKgxseXWN984Mp8F', - rpcUrl: 'https://eth.llamarpc.com', + rpcUrl: 'https://rpc.ankr.com/eth', backendUrl: 'https://backend.templedao.link', contracts: { balancerVault: '0xBA12222222228d8Ba445958a75a0704d566BF2C8', From dae681aa573d3a515f2610122a9dc40d1bbe4029 Mon Sep 17 00:00:00 2001 From: pocin <8642344+pocin@users.noreply.github.com> Date: Fri, 12 Jul 2024 09:45:37 +0200 Subject: [PATCH 3/3] chore: update balancer to latest beta release --- apps/dapp/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/dapp/package.json b/apps/dapp/package.json index 5f081f3a3..1667b34f5 100644 --- a/apps/dapp/package.json +++ b/apps/dapp/package.json @@ -20,7 +20,7 @@ "codegen:safe-api-v1": "yarn safe-api-v1-host && openapi --input ./src/safe/open-api/apiV1.json --output ./src/safe/open-api/client" }, "dependencies": { - "@balancer-labs/sdk": "1.1.6-beta.23", + "@balancer-labs/sdk": "1.1.6-beta.24", "@safe-global/safe-apps-provider": "^0.18.0", "@safe-global/safe-apps-sdk": "^8.1.0", "@safe-global/safe-core-sdk-types": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 54186bcf8..751bed6e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1224,10 +1224,10 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" -"@balancer-labs/sdk@1.1.6-beta.23": - version "1.1.6-beta.23" - resolved "https://registry.yarnpkg.com/@balancer-labs/sdk/-/sdk-1.1.6-beta.23.tgz#c87a7e31dca2477231c24117b0544040aba10ec0" - integrity sha512-wcFMU0O2wqdnUUhe7jOM5ikr6ipYP7vmqygiDKB2lSlN3hgd/AOTgsw4E7tMuwlf7xUpLC5hRNi4WiRivrZHBQ== +"@balancer-labs/sdk@1.1.6-beta.24": + version "1.1.6-beta.24" + resolved "https://registry.yarnpkg.com/@balancer-labs/sdk/-/sdk-1.1.6-beta.24.tgz#32a520fed3b675d75edcc53cb70b8edcabb68fb9" + integrity sha512-08leMntjusXMX2F6SZnWAhwt7KxVZdirldavN9+6NA51fo2HDBsqPEr8c2hsh4b/Vm4iVKyn7QrfLoWwdxvTcQ== dependencies: "@balancer-labs/sor" "^4.1.1-beta.17" "@ethersproject/abi" "^5.4.0"