From 541472afe3ffe343cc03b2aaf80ceef7148800bf Mon Sep 17 00:00:00 2001 From: "James Morris, MS" <96435344+james-a-morris@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:12:29 -0400 Subject: [PATCH 01/21] feat: add balancer to base routes (#839) * feat: add balancer to base routes * hotfix: use correct bal address --------- Co-authored-by: Dong-Ha Kim --- ...6fA914353c44b2E33eBE05f21846F1048bEda.json | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json b/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json index c05540526..430278a73 100644 --- a/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json +++ b/src/data/routes_1_0xc186fA914353c44b2E33eBE05f21846F1048bEda.json @@ -359,6 +359,15 @@ "isNative": false, "l1TokenAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F" }, + { + "fromChain": 1, + "toChain": 8453, + "fromTokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D", + "fromSpokeAddress": "0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, { "fromChain": 10, "toChain": 1, @@ -710,6 +719,15 @@ "isNative": false, "l1TokenAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F" }, + { + "fromChain": 10, + "toChain": 8453, + "fromTokenAddress": "0xFE8B128bA8C78aabC59d4c64cEE7fF28e9379921", + "fromSpokeAddress": "0x6f26Bf09B1C792e3228e5467807a900A503c0281", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, { "fromChain": 137, "toChain": 1, @@ -1007,6 +1025,15 @@ "isNative": false, "l1TokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48" }, + { + "fromChain": 137, + "toChain": 8453, + "fromTokenAddress": "0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3", + "fromSpokeAddress": "0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, { "fromChain": 42161, "toChain": 1, @@ -1331,6 +1358,15 @@ "isNative": false, "l1TokenAddress": "0x6B175474E89094C44Da98b954EedeAC495271d0F" }, + { + "fromChain": 42161, + "toChain": 8453, + "fromTokenAddress": "0x040d1EdC9569d4Bab2D15287Dc5A4F10F56a56B8", + "fromSpokeAddress": "0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, { "fromChain": 324, "toChain": 1, @@ -1701,6 +1737,42 @@ "fromTokenSymbol": "ETH", "isNative": true, "l1TokenAddress": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2" + }, + { + "fromChain": 8453, + "toChain": 1, + "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1", + "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, + { + "fromChain": 8453, + "toChain": 10, + "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1", + "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, + { + "fromChain": 8453, + "toChain": 42161, + "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1", + "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" + }, + { + "fromChain": 8453, + "toChain": 137, + "fromTokenAddress": "0x4158734D47Fc9692176B5085E0F52ee0Da5d47F1", + "fromSpokeAddress": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64", + "fromTokenSymbol": "BAL", + "isNative": false, + "l1TokenAddress": "0xba100000625a3754423978a60c9317c58a424e3D" } ], "pools": [ From 4264d45799dd0a0fffbbaddd216da7c11aff8096 Mon Sep 17 00:00:00 2001 From: Dong-Ha Kim Date: Wed, 11 Oct 2023 09:12:49 +0200 Subject: [PATCH 02/21] fix: bump web3 onboard + fix for mobile (#854) * chore: remove legacy layout component * fix: web3 onboard modal --- package.json | 16 +- .../@web3-onboard+walletconnect+2.4.1.patch | 13 - src/components/Layout/Layout.tsx | 37 -- src/components/Layout/index.ts | 2 - src/components/index.ts | 1 - src/onboard-override.css | 17 +- src/utils/onboard.ts | 2 +- yarn.lock | 339 ++++++++++-------- 8 files changed, 214 insertions(+), 213 deletions(-) delete mode 100644 patches/@web3-onboard+walletconnect+2.4.1.patch delete mode 100644 src/components/Layout/Layout.tsx delete mode 100644 src/components/Layout/index.ts diff --git a/package.json b/package.json index 9f3428a34..dae84d867 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,16 @@ "@fortawesome/react-fontawesome": "^0.2.0", "@google-cloud/logging": "^10.1.1", "@reach/dialog": "^0.16.2", + "@safe-global/safe-apps-provider": "^0.18.0", + "@safe-global/safe-apps-sdk": "^8.1.0", "@sentry/react": "^7.37.2", "@uma/sdk": "^0.22.2", - "@web3-onboard/coinbase": "^2.2.4", - "@web3-onboard/core": "^2.20.4", - "@web3-onboard/gnosis": "^2.1.10", - "@web3-onboard/injected-wallets": "^2.10.2", - "@web3-onboard/react": "^2.8.9", - "@web3-onboard/walletconnect": "^2.4.1", + "@web3-onboard/coinbase": "^2.2.5", + "@web3-onboard/core": "^2.21.2", + "@web3-onboard/gnosis": "^2.2.0", + "@web3-onboard/injected-wallets": "^2.10.6", + "@web3-onboard/react": "^2.8.13", + "@web3-onboard/walletconnect": "^2.4.6", "axios": "^0.27.2", "bnc-notify": "^1.9.8", "copy-to-clipboard": "^3.3.3", @@ -50,7 +52,7 @@ }, "scripts": { "start": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite", - "dev": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite --port $PORT", + "dev": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && vite --port $PORT --host", "build": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && tsc && vite build", "analyze": "yarn build --stats && webpack-bundle-analyzer build/bundle-stats.json -m server -r build/bundle-stats.html", "test": "export REACT_APP_GIT_COMMIT_HASH=$(git rev-parse HEAD) && jest --env jsdom src", diff --git a/patches/@web3-onboard+walletconnect+2.4.1.patch b/patches/@web3-onboard+walletconnect+2.4.1.patch deleted file mode 100644 index efb5267e3..000000000 --- a/patches/@web3-onboard+walletconnect+2.4.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/@web3-onboard/walletconnect/dist/v2.js b/node_modules/@web3-onboard/walletconnect/dist/v2.js -index e24edd8..459a4ab 100644 ---- a/node_modules/@web3-onboard/walletconnect/dist/v2.js -+++ b/node_modules/@web3-onboard/walletconnect/dist/v2.js -@@ -48,7 +48,7 @@ function walletConnect(options) { - ? // @ts-ignore - // Required as WC package does not support hex numbers - requiredChains.map(chainID => parseInt(chainID)) -- : [1]; -+ : []; - // Defaults to the chains provided within the web3-onboard init chain property - const optionalChainsParsed = Array.isArray(optionalChains) && - optionalChains.length && diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx deleted file mode 100644 index 3e92a81af..000000000 --- a/src/components/Layout/Layout.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react"; -import styled from "@emotion/styled"; - -import { COLORS } from "utils"; - -import Footer from "../Footer/Footer"; - -const Layout: React.FC = ({ children }) => ( - <> - -
{children}
- - -