+
{#if isDesktopOrLarger}
- {#if loading}
- 
-
-
-
-
- {:else}
-
-
-
---
.../src/components/TokenDropdown/TokenDropdown.svelte | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
index 6bfe56424a3..b2f23933788 100644
--- a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
+++ b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
@@ -23,7 +23,7 @@
import { getTokenAddresses } from '$libs/token/getTokenAddresses';
import { getLogger } from '$libs/util/logger';
import { uid } from '$libs/util/uid';
- import { account } from '$stores/account';
+ import { type Account, account } from '$stores/account';
import { connectedSourceChain } from '$stores/network';
import DialogView from './DialogView.svelte';
@@ -174,10 +174,11 @@
if (srcChain && destChain) updateBalance($account?.address, srcChain.id, destChain.id);
};
- const onAccountChange = () => {
+ const onAccountChange = (newAccount: Account, prevAccount?: Account) => {
const srcChain = $connectedSourceChain;
const destChain = $destNetwork;
- if (srcChain && destChain) updateBalance($account?.address, srcChain.id, destChain.id);
+ if (destChain && srcChain && (newAccount?.chainId === prevAccount?.chainId || !newAccount || !prevAccount))
+ updateBalance($account?.address, srcChain.id, destChain.id);
};
$: textClass = disabled ? 'text-secondary-content' : 'font-bold ';
From 74df1068388d34bb27685abf1a500ec58fa84e97 Mon Sep 17 00:00:00 2001
From: D <51912515+adaki2004@users.noreply.github.com>
Date: Thu, 22 Feb 2024 17:33:14 +0530
Subject: [PATCH 4/9] chore(protocol): informal changes (#15995)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Keszey Dániel
---
packages/protocol/contracts/common/EssentialContract.sol | 1 -
packages/protocol/contracts/tokenvault/ERC721Vault.sol | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/protocol/contracts/common/EssentialContract.sol b/packages/protocol/contracts/common/EssentialContract.sol
index f522369da51..beacb412704 100644
--- a/packages/protocol/contracts/common/EssentialContract.sol
+++ b/packages/protocol/contracts/common/EssentialContract.sol
@@ -36,7 +36,6 @@ abstract contract EssentialContract is OwnerUUPSUpgradable, AddressResolver {
}
/// @notice Initializes the contract without an address manager.
- // solhint-disable-next-line func-name-mixedcase
function __Essential_init() internal virtual {
__Essential_init(address(0));
}
diff --git a/packages/protocol/contracts/tokenvault/ERC721Vault.sol b/packages/protocol/contracts/tokenvault/ERC721Vault.sol
index 92df7884e7a..0c3151f27b9 100644
--- a/packages/protocol/contracts/tokenvault/ERC721Vault.sol
+++ b/packages/protocol/contracts/tokenvault/ERC721Vault.sol
@@ -118,6 +118,7 @@ contract ERC721Vault is BaseNFTVault, IERC721ReceiverUpgradeable {
});
}
+ /// @inheritdoc IRecallableSender
function onMessageRecalled(
IBridge.Message calldata message,
bytes32 msgHash
From 14484a00c1d59332361fba32b74d39db2ae4b864 Mon Sep 17 00:00:00 2001
From: Korbinian
Date: Thu, 22 Feb 2024 14:35:55 +0100
Subject: [PATCH 5/9] fix(bridge-ui): add dependency (#15999)
---
packages/bridge-ui/package.json | 5 +-
.../ConnectButton/ConnectButton.svelte | 2 +-
pnpm-lock.yaml | 333 ++++++++++++++----
3 files changed, 273 insertions(+), 67 deletions(-)
diff --git a/packages/bridge-ui/package.json b/packages/bridge-ui/package.json
index 37cbc4ffb05..9e4309c4515 100644
--- a/packages/bridge-ui/package.json
+++ b/packages/bridge-ui/package.json
@@ -61,8 +61,9 @@
"dependencies": {
"@wagmi/connectors": "^4.1.14",
"@wagmi/core": "^2.6.5",
- "@walletconnect/ethereum-provider": "^2.11.1",
- "@web3modal/wagmi": "^4.0.5",
+ "@walletconnect/ethereum-provider": "^2.11.2",
+ "@walletconnect/modal": "^2.6.2",
+ "@web3modal/wagmi": "^4.0.9",
"@zerodevx/svelte-toast": "^0.9.5",
"axios": "^1.6.7",
"buffer": "^6.0.3",
diff --git a/packages/bridge-ui/src/components/ConnectButton/ConnectButton.svelte b/packages/bridge-ui/src/components/ConnectButton/ConnectButton.svelte
index ff6ceaaa3eb..1db34da4d17 100644
--- a/packages/bridge-ui/src/components/ConnectButton/ConnectButton.svelte
+++ b/packages/bridge-ui/src/components/ConnectButton/ConnectButton.svelte
@@ -59,7 +59,7 @@
{:else}
{token?.name ? truncateString(token?.name, 15) : ''}
-
- {token?.metadata?.name ? truncateString(token?.metadata?.name, 15) : ''}
+
+
+ {#if loading}
+
- {/if}
-
+
+
- {token?.tokenId}
-
+
+ {:else}
+
+
+
+ {/if}
+ {token?.name ? truncateString(token?.name, 15) : 'No Token Name'}
+
+ {token?.metadata?.name ? truncateString(token?.metadata?.name, 15) : ''}
+
+ {token?.tokenId}
+
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ed3d0a8e58b..91a7f891006 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,11 +26,14 @@ importers:
specifier: ^2.6.5
version: 2.6.5(react@18.2.0)(typescript@5.3.3)(viem@2.7.11)
'@walletconnect/ethereum-provider':
- specifier: ^2.11.1
- version: 2.11.1(react@18.2.0)
+ specifier: ^2.11.2
+ version: 2.11.2(react@18.2.0)
+ '@walletconnect/modal':
+ specifier: ^2.6.2
+ version: 2.6.2(react@18.2.0)
'@web3modal/wagmi':
- specifier: ^4.0.5
- version: 4.0.5(@wagmi/connectors@4.1.14)(@wagmi/core@2.6.5)(typescript@5.3.3)(viem@2.7.11)
+ specifier: ^4.0.9
+ version: 4.0.9(@wagmi/connectors@4.1.14)(@wagmi/core@2.6.5)(typescript@5.3.3)(viem@2.7.11)
'@zerodevx/svelte-toast':
specifier: ^0.9.5
version: 0.9.5(svelte@4.2.11)
@@ -3011,10 +3014,6 @@ packages:
'@jridgewell/sourcemap-codec': 1.4.15
dev: true
- /@lit-labs/ssr-dom-shim@1.1.2:
- resolution: {integrity: sha512-jnOD+/+dSrfTWYfSXBXlo5l5f0q1UuJo3tkbMDCYA2lKUYq79jaxqtGEvnRoh049nt1vdo1+45RinipU6FGY2g==}
- dev: false
-
/@lit-labs/ssr-dom-shim@1.2.0:
resolution: {integrity: sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==}
dev: false
@@ -3022,7 +3021,7 @@ packages:
/@lit/reactive-element@1.6.3:
resolution: {integrity: sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==}
dependencies:
- '@lit-labs/ssr-dom-shim': 1.1.2
+ '@lit-labs/ssr-dom-shim': 1.2.0
dev: false
/@lit/reactive-element@2.0.4:
@@ -3302,6 +3301,7 @@ packages:
/@motionone/vue@10.16.4:
resolution: {integrity: sha512-z10PF9JV6SbjFq+/rYabM+8CVlMokgl8RFGvieSGNTmrkQanfHn+15XBrhG3BgUfvmTeSeyShfOHpG0i9zEdcg==}
+ deprecated: Motion One for Vue is deprecated. Use Oku Motion instead https://oku-ui.com/motion
dependencies:
'@motionone/dom': 10.16.4
tslib: 2.6.2
@@ -3741,6 +3741,7 @@ packages:
dependencies:
is-glob: 4.0.3
micromatch: 4.0.5
+ napi-wasm: 1.1.0
dev: false
bundledDependencies:
- napi-wasm
@@ -4969,7 +4970,7 @@ packages:
resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
dependencies:
'@types/minimatch': 5.1.2
- '@types/node': 20.10.4
+ '@types/node': 20.11.19
dev: true
/@types/glob@8.1.0:
@@ -5747,6 +5748,45 @@ packages:
- utf-8-validate
dev: false
+ /@walletconnect/core@2.11.2:
+ resolution: {integrity: sha512-bB4SiXX8hX3/hyBfVPC5gwZCXCl+OPj+/EDVM71iAO3TDsh78KPbrVAbDnnsbHzZVHlsMohtXX3j5XVsheN3+g==}
+ dependencies:
+ '@walletconnect/heartbeat': 1.2.1
+ '@walletconnect/jsonrpc-provider': 1.0.13
+ '@walletconnect/jsonrpc-types': 1.0.3
+ '@walletconnect/jsonrpc-utils': 1.0.8
+ '@walletconnect/jsonrpc-ws-connection': 1.0.14
+ '@walletconnect/keyvaluestorage': 1.1.1
+ '@walletconnect/logger': 2.0.1
+ '@walletconnect/relay-api': 1.0.9
+ '@walletconnect/relay-auth': 1.0.4
+ '@walletconnect/safe-json': 1.0.2
+ '@walletconnect/time': 1.0.2
+ '@walletconnect/types': 2.11.2
+ '@walletconnect/utils': 2.11.2
+ events: 3.3.0
+ isomorphic-unfetch: 3.1.0
+ lodash.isequal: 4.5.0
+ uint8arrays: 3.1.1
+ transitivePeerDependencies:
+ - '@azure/app-configuration'
+ - '@azure/cosmos'
+ - '@azure/data-tables'
+ - '@azure/identity'
+ - '@azure/keyvault-secrets'
+ - '@azure/storage-blob'
+ - '@capacitor/preferences'
+ - '@netlify/blobs'
+ - '@planetscale/database'
+ - '@react-native-async-storage/async-storage'
+ - '@upstash/redis'
+ - '@vercel/kv'
+ - bufferutil
+ - encoding
+ - supports-color
+ - utf-8-validate
+ dev: false
+
/@walletconnect/crypto@1.0.3:
resolution: {integrity: sha512-+2jdORD7XQs76I2Odgr3wwrtyuLUXD/kprNVsjWRhhhdO9Mt6WqVzOPu0/t7OHSmgal8k7SoBQzUc5hu/8zL/g==}
dependencies:
@@ -5840,6 +5880,40 @@ packages:
- utf-8-validate
dev: false
+ /@walletconnect/ethereum-provider@2.11.2(react@18.2.0):
+ resolution: {integrity: sha512-BUDqee0Uy2rCZVkW5Ao3q6Ado/3fePYnFdryVF+YL6bPhj+xQZ5OfKodl+uvs7Rwq++O5wTX2RqOTzpW7+v+Mg==}
+ dependencies:
+ '@walletconnect/jsonrpc-http-connection': 1.0.7
+ '@walletconnect/jsonrpc-provider': 1.0.13
+ '@walletconnect/jsonrpc-types': 1.0.3
+ '@walletconnect/jsonrpc-utils': 1.0.8
+ '@walletconnect/modal': 2.6.2(react@18.2.0)
+ '@walletconnect/sign-client': 2.11.2
+ '@walletconnect/types': 2.11.2
+ '@walletconnect/universal-provider': 2.11.2
+ '@walletconnect/utils': 2.11.2
+ events: 3.3.0
+ transitivePeerDependencies:
+ - '@azure/app-configuration'
+ - '@azure/cosmos'
+ - '@azure/data-tables'
+ - '@azure/identity'
+ - '@azure/keyvault-secrets'
+ - '@azure/storage-blob'
+ - '@capacitor/preferences'
+ - '@netlify/blobs'
+ - '@planetscale/database'
+ - '@react-native-async-storage/async-storage'
+ - '@types/react'
+ - '@upstash/redis'
+ - '@vercel/kv'
+ - bufferutil
+ - encoding
+ - react
+ - supports-color
+ - utf-8-validate
+ dev: false
+
/@walletconnect/events@1.0.1:
resolution: {integrity: sha512-NPTqaoi0oPBVNuLv7qPaJazmGHs5JGyO8eEAk5VGKmJzDR7AHzD4k6ilox5kxk1iwiOnFopBOOMLs86Oa76HpQ==}
dependencies:
@@ -6117,6 +6191,37 @@ packages:
- utf-8-validate
dev: false
+ /@walletconnect/sign-client@2.11.2:
+ resolution: {integrity: sha512-MfBcuSz2GmMH+P7MrCP46mVE5qhP0ZyWA0FyIH6/WuxQ6G+MgKsGfaITqakpRPsykWOJq8tXMs3XvUPDU413OQ==}
+ dependencies:
+ '@walletconnect/core': 2.11.2
+ '@walletconnect/events': 1.0.1
+ '@walletconnect/heartbeat': 1.2.1
+ '@walletconnect/jsonrpc-utils': 1.0.8
+ '@walletconnect/logger': 2.0.1
+ '@walletconnect/time': 1.0.2
+ '@walletconnect/types': 2.11.2
+ '@walletconnect/utils': 2.11.2
+ events: 3.3.0
+ transitivePeerDependencies:
+ - '@azure/app-configuration'
+ - '@azure/cosmos'
+ - '@azure/data-tables'
+ - '@azure/identity'
+ - '@azure/keyvault-secrets'
+ - '@azure/storage-blob'
+ - '@capacitor/preferences'
+ - '@netlify/blobs'
+ - '@planetscale/database'
+ - '@react-native-async-storage/async-storage'
+ - '@upstash/redis'
+ - '@vercel/kv'
+ - bufferutil
+ - encoding
+ - supports-color
+ - utf-8-validate
+ dev: false
+
/@walletconnect/time@1.0.2:
resolution: {integrity: sha512-uzdd9woDcJ1AaBZRhqy5rNC9laqWGErfc4dxA9a87mPdKOgWMD85mcFo9dIYIts/Jwocfwn07EC6EzclKubk/g==}
dependencies:
@@ -6173,6 +6278,31 @@ packages:
- supports-color
dev: false
+ /@walletconnect/types@2.11.2:
+ resolution: {integrity: sha512-p632MFB+lJbip2cvtXPBQslpUdiw1sDtQ5y855bOlAGquay+6fZ4h1DcDePeKQDQM3P77ax2a9aNPZxV6y/h1Q==}
+ dependencies:
+ '@walletconnect/events': 1.0.1
+ '@walletconnect/heartbeat': 1.2.1
+ '@walletconnect/jsonrpc-types': 1.0.3
+ '@walletconnect/keyvaluestorage': 1.1.1
+ '@walletconnect/logger': 2.0.1
+ events: 3.3.0
+ transitivePeerDependencies:
+ - '@azure/app-configuration'
+ - '@azure/cosmos'
+ - '@azure/data-tables'
+ - '@azure/identity'
+ - '@azure/keyvault-secrets'
+ - '@azure/storage-blob'
+ - '@capacitor/preferences'
+ - '@netlify/blobs'
+ - '@planetscale/database'
+ - '@react-native-async-storage/async-storage'
+ - '@upstash/redis'
+ - '@vercel/kv'
+ - supports-color
+ dev: false
+
/@walletconnect/universal-provider@2.11.0:
resolution: {integrity: sha512-zgJv8jDvIMP4Qse/D9oIRXGdfoNqonsrjPZanQ/CHNe7oXGOBiQND2IIeX+tS0H7uNA0TPvctljCLiIN9nw4eA==}
dependencies:
@@ -6235,6 +6365,37 @@ packages:
- utf-8-validate
dev: false
+ /@walletconnect/universal-provider@2.11.2:
+ resolution: {integrity: sha512-cNtIn5AVoDxKAJ4PmB8m5adnf5mYQMUamEUPKMVvOPscfGtIMQEh9peKsh2AN5xcRVDbgluC01Id545evFyymw==}
+ dependencies:
+ '@walletconnect/jsonrpc-http-connection': 1.0.7
+ '@walletconnect/jsonrpc-provider': 1.0.13
+ '@walletconnect/jsonrpc-types': 1.0.3
+ '@walletconnect/jsonrpc-utils': 1.0.8
+ '@walletconnect/logger': 2.0.1
+ '@walletconnect/sign-client': 2.11.2
+ '@walletconnect/types': 2.11.2
+ '@walletconnect/utils': 2.11.2
+ events: 3.3.0
+ transitivePeerDependencies:
+ - '@azure/app-configuration'
+ - '@azure/cosmos'
+ - '@azure/data-tables'
+ - '@azure/identity'
+ - '@azure/keyvault-secrets'
+ - '@azure/storage-blob'
+ - '@capacitor/preferences'
+ - '@netlify/blobs'
+ - '@planetscale/database'
+ - '@react-native-async-storage/async-storage'
+ - '@upstash/redis'
+ - '@vercel/kv'
+ - bufferutil
+ - encoding
+ - supports-color
+ - utf-8-validate
+ dev: false
+
/@walletconnect/utils@2.11.0:
resolution: {integrity: sha512-hxkHPlTlDQILHfIKXlmzgNJau/YcSBC3XHUSuZuKZbNEw3duFT6h6pm3HT/1+j1a22IG05WDsNBuTCRkwss+BQ==}
dependencies:
@@ -6301,6 +6462,39 @@ packages:
- supports-color
dev: false
+ /@walletconnect/utils@2.11.2:
+ resolution: {integrity: sha512-LyfdmrnZY6dWqlF4eDrx5jpUwsB2bEPjoqR5Z6rXPiHJKUOdJt7az+mNOn5KTSOlRpd1DmozrBrWr+G9fFLYVw==}
+ dependencies:
+ '@stablelib/chacha20poly1305': 1.0.1
+ '@stablelib/hkdf': 1.0.1
+ '@stablelib/random': 1.0.2
+ '@stablelib/sha256': 1.0.1
+ '@stablelib/x25519': 1.0.3
+ '@walletconnect/relay-api': 1.0.9
+ '@walletconnect/safe-json': 1.0.2
+ '@walletconnect/time': 1.0.2
+ '@walletconnect/types': 2.11.2
+ '@walletconnect/window-getters': 1.0.1
+ '@walletconnect/window-metadata': 1.0.1
+ detect-browser: 5.3.0
+ query-string: 7.1.3
+ uint8arrays: 3.1.1
+ transitivePeerDependencies:
+ - '@azure/app-configuration'
+ - '@azure/cosmos'
+ - '@azure/data-tables'
+ - '@azure/identity'
+ - '@azure/keyvault-secrets'
+ - '@azure/storage-blob'
+ - '@capacitor/preferences'
+ - '@netlify/blobs'
+ - '@planetscale/database'
+ - '@react-native-async-storage/async-storage'
+ - '@upstash/redis'
+ - '@vercel/kv'
+ - supports-color
+ dev: false
+
/@walletconnect/window-getters@1.0.1:
resolution: {integrity: sha512-vHp+HqzGxORPAN8gY03qnbTMnhqIwjeRJNOMOAzePRg4xVEEE2WvYsI9G2NMjOknA8hnuYbU3/hwLcKbjhc8+Q==}
dependencies:
@@ -6314,83 +6508,90 @@ packages:
tslib: 1.14.1
dev: false
- /@web3modal/common@4.0.5:
- resolution: {integrity: sha512-RQKyqJi3T+Ti57XEkb/4dYbrWMdGduZUacb1k+5H7GU4+Ev3HXjOdp2bcPqfEyr1DYKD/IsW/q/0oqXatwEeUQ==}
+ /@web3modal/common@4.0.9:
+ resolution: {integrity: sha512-EeolVpjWvL43M3Zyk4ZHPGhTrX4ibp6sYGbMuEEpZL6prJl/24uquuCBJYolQFOYcpgcv8IKiI7Ls3qUquxf/g==}
dependencies:
dayjs: 1.11.10
dev: false
- /@web3modal/core@4.0.5(react@18.2.0):
- resolution: {integrity: sha512-1QQHa8aNF1KX6ZAKBUU6UE4kwIa9x3FWX7Ak9eER/bTvmgyu2abJe3IwWPEt++nAjbvMKbIO6cATUXfSVk1Zyw==}
+ /@web3modal/core@4.0.9(react@18.2.0):
+ resolution: {integrity: sha512-RDC2Acknxa74ytV+4W0DBOioTz2s4RheaEL9V4t0q3Se3wP4aQUw2JojUpjQJFWSnTptZs1uPRCGonWRXnKxKw==}
dependencies:
- '@web3modal/common': 4.0.5
- '@web3modal/wallet': 4.0.5
+ '@web3modal/common': 4.0.9
+ '@web3modal/wallet': 4.0.9
valtio: 1.11.2(react@18.2.0)
transitivePeerDependencies:
- '@types/react'
- react
dev: false
- /@web3modal/polyfills@4.0.5:
- resolution: {integrity: sha512-2jnu4CEVnhatq/Bzyk4IgkPVGY3GgD13hZAPCx8mztZzPkrbKrSKfuq2KTVuTjw392DPp7EMmxmm8SSFnjwzuA==}
+ /@web3modal/polyfills@4.0.9:
+ resolution: {integrity: sha512-qGWiVMjrppTMzZnHYAyqdo2Vcj1yBtjS8gfZMYJrUELAIvmc3suQUbB/7YmZ2GrihGyhCOyO48+BKfEHKBXDvw==}
dependencies:
buffer: 6.0.3
dev: false
- /@web3modal/scaffold-react@4.0.5(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-4JQhLHH+IRjpsRbVtt2skaxzTKYqpLTr7zTMZyTECgOXpWyOtTCN0vgc2YatWbct972sZlJ0V8llIwDiGodHgA==}
+ /@web3modal/scaffold-react@4.0.9(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-p/nv3hb8bmgk45sxQ1xYaior+9cOJwJQ6R8/Nw8ldShWT4egoxT9tfxi2S3S8RJskJra+n+wZncZp5qPaEXErQ==}
peerDependencies:
react: '>=17'
react-dom: '>=17'
dependencies:
- '@web3modal/scaffold': 4.0.5(react@18.2.0)
+ '@web3modal/scaffold': 4.0.9(react@18.2.0)
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
transitivePeerDependencies:
- '@types/react'
dev: false
- /@web3modal/scaffold-utils@4.0.5(react@18.2.0):
- resolution: {integrity: sha512-FUjtpnf22TEgYpsG6oom1YtyDeydkWFmdXxf+xbnp+SlxuMpff9iF22bWIw1uM5eZYFQH3nIyDozCbOD/grQ+Q==}
+ /@web3modal/scaffold-utils@4.0.9(react@18.2.0):
+ resolution: {integrity: sha512-4sbRv61jeL9ydEZ818GJ0meXolgMCNtdULxyyd0HgCdZUd8NgZjaalYNSVBttIXLYgFbCgy/ccl3pv8xySaAeQ==}
dependencies:
- '@web3modal/polyfills': 4.0.5
- '@web3modal/scaffold': 4.0.5(react@18.2.0)
+ '@web3modal/polyfills': 4.0.9
+ '@web3modal/scaffold': 4.0.9(react@18.2.0)
valtio: 1.11.2(react@18.2.0)
transitivePeerDependencies:
- '@types/react'
- react
dev: false
- /@web3modal/scaffold-vue@4.0.5(react@18.2.0)(vue@3.4.19):
- resolution: {integrity: sha512-FrFDoqGRATPfNYdYug6vX0g79HdL8u08QcC3ZTix1yv2iYz424X7tSm+zQ0FBh7DnZPMYIximSNy1jrEw1wPoQ==}
+ /@web3modal/scaffold-vue@4.0.9(react@18.2.0)(vue@3.4.19):
+ resolution: {integrity: sha512-/HxEvHMCMadHbXeZNMsEqmkyI/MwRpDQVC+B9AyHjVQO781gVUME++1vQFxxx8ThuFOU3NI3HMhqbTLe+DJGVw==}
peerDependencies:
vue: '>=3'
dependencies:
- '@web3modal/scaffold': 4.0.5(react@18.2.0)
+ '@web3modal/scaffold': 4.0.9(react@18.2.0)
vue: 3.4.19(typescript@5.3.3)
transitivePeerDependencies:
- '@types/react'
- react
dev: false
- /@web3modal/scaffold@4.0.5(react@18.2.0):
- resolution: {integrity: sha512-K2j/fmUAPyZ6M5DvOAf88qcubrB//ulkOIS1ZX7R7g8isp9z7AtWn2c0b/O+l9CEeiKn0ZSIa7VF7GrUFDZ8vQ==}
+ /@web3modal/scaffold@4.0.9(react@18.2.0):
+ resolution: {integrity: sha512-zja2yhom3kfw5Sqn0MYvUKTtRuS8r2TIBWuB5ZwcrJ7+HnBwHSg0GQhW3FPilzturpeQR9rMySHzdWBioDBT6g==}
dependencies:
- '@web3modal/common': 4.0.5
- '@web3modal/core': 4.0.5(react@18.2.0)
- '@web3modal/ui': 4.0.5
+ '@web3modal/common': 4.0.9
+ '@web3modal/core': 4.0.9(react@18.2.0)
+ '@web3modal/ui': 4.0.9
lit: 3.1.0
transitivePeerDependencies:
- '@types/react'
- react
dev: false
- /@web3modal/siwe@4.0.5(typescript@5.3.3):
- resolution: {integrity: sha512-JxYoM0rvgekpvd2Wyw1mtq7mbv8JBsbP22K5Evf4ZUupVAgoeNHDGCBKK8nKwdwMuc2AfsAcdNqx+rwS6N9WLQ==}
+ /@web3modal/siwe@4.0.9(typescript@5.3.3):
+ resolution: {integrity: sha512-OB4z/lTHCAm3bjiuyPz4uBib46YU6kzp4eeSnAWZzAHj9mQnB4DZOoCdFQvFn+N1n3CzTZaMxz3CYjYn2A+Qhw==}
requiresBuild: true
+ peerDependenciesMeta:
+ react:
+ optional: true
+ react-dom:
+ optional: true
+ vue:
+ optional: true
dependencies:
- '@web3modal/core': 4.0.5(react@18.2.0)
- '@web3modal/scaffold-utils': 4.0.5(react@18.2.0)
+ '@web3modal/core': 4.0.9(react@18.2.0)
+ '@web3modal/scaffold-utils': 4.0.9(react@18.2.0)
optionalDependencies:
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
@@ -6401,30 +6602,39 @@ packages:
dev: false
optional: true
- /@web3modal/ui@4.0.5:
- resolution: {integrity: sha512-IGNzHtRWZjbjv/8s7kbVknrlV/R0OrVTmlrQMa4H16kEuInWBZkKjfJ6zlqEKNrhppJ01Ft11h4d3NWscu47fg==}
+ /@web3modal/ui@4.0.9:
+ resolution: {integrity: sha512-dzagpe7KVOeqY2KzGeu1+sPW17GGUdxwHirIbgceoFQvWaAYW4RTbj32ow1Uc7N4WspKzRg6AdA7nB4znyNqxg==}
dependencies:
lit: 3.1.0
qrcode: 1.5.3
dev: false
- /@web3modal/wagmi@4.0.5(@wagmi/connectors@4.1.14)(@wagmi/core@2.6.5)(typescript@5.3.3)(viem@2.7.11):
- resolution: {integrity: sha512-uUwhpv3gnq0SmXwO1YdbTVSZfZfgjEdp7lsc6u+Uoxv5Bw5XFkIV6FsSlQFk7SU3So+GEGa/u9iNejnl40hQUA==}
+ /@web3modal/wagmi@4.0.9(@wagmi/connectors@4.1.14)(@wagmi/core@2.6.5)(typescript@5.3.3)(viem@2.7.11):
+ resolution: {integrity: sha512-YrPBRIrT7LJKf1hnKB4QfHH4F6MeO3gwNkT3FlOuZcXK1s0awVaAZJG8Puys4Dg2EqJc8pDnKwcwjqGp+vjlHg==}
peerDependencies:
'@wagmi/connectors': '>=4.0.0'
'@wagmi/core': '>=2.0.0'
viem: '>=2.0.0'
+ peerDependenciesMeta:
+ '@web3modal/siwe':
+ optional: true
+ react:
+ optional: true
+ react-dom:
+ optional: true
+ vue:
+ optional: true
dependencies:
'@wagmi/connectors': 4.1.14(@wagmi/core@2.6.5)(react-dom@18.2.0)(react-native@0.73.4)(react@18.2.0)(typescript@5.3.3)(viem@2.7.11)
'@wagmi/core': 2.6.5(react@18.2.0)(typescript@5.3.3)(viem@2.7.11)
- '@web3modal/polyfills': 4.0.5
- '@web3modal/scaffold': 4.0.5(react@18.2.0)
- '@web3modal/scaffold-react': 4.0.5(react-dom@18.2.0)(react@18.2.0)
- '@web3modal/scaffold-utils': 4.0.5(react@18.2.0)
- '@web3modal/scaffold-vue': 4.0.5(react@18.2.0)(vue@3.4.19)
+ '@web3modal/polyfills': 4.0.9
+ '@web3modal/scaffold': 4.0.9(react@18.2.0)
+ '@web3modal/scaffold-react': 4.0.9(react-dom@18.2.0)(react@18.2.0)
+ '@web3modal/scaffold-utils': 4.0.9(react@18.2.0)
+ '@web3modal/scaffold-vue': 4.0.9(react@18.2.0)(vue@3.4.19)
viem: 2.7.11(typescript@5.3.3)(zod@3.22.4)
optionalDependencies:
- '@web3modal/siwe': 4.0.5(typescript@5.3.3)
+ '@web3modal/siwe': 4.0.9(typescript@5.3.3)
react: 18.2.0
react-dom: 18.2.0(react@18.2.0)
vue: 3.4.19(typescript@5.3.3)
@@ -6433,8 +6643,8 @@ packages:
- typescript
dev: false
- /@web3modal/wallet@4.0.5:
- resolution: {integrity: sha512-rw9LtXX7azOjpV/WWh2KRG4zlvXW+tE+QRxl0b12S4WgQXLoteqzAFiumvg/H4fBf73WFJ6Bos3g7Mf4M8Dp6A==}
+ /@web3modal/wallet@4.0.9:
+ resolution: {integrity: sha512-MU70GyFzhoVKclkdTwx89KDz6F8R77EtTO1Xw4D5qejTqwFtOAnupQQisv5HIu3v+GfpLeSUwyBaHzE25xeAmA==}
requiresBuild: true
dependencies:
zod: 3.22.4
@@ -6876,7 +7086,7 @@ packages:
resolution: {integrity: sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==}
engines: {node: '>= 0.4'}
dependencies:
- call-bind: 1.0.5
+ call-bind: 1.0.7
define-properties: 1.2.1
es-abstract: 1.22.3
es-array-method-boxes-properly: 1.0.0
@@ -7332,7 +7542,6 @@ packages:
function-bind: 1.1.2
get-intrinsic: 1.2.4
set-function-length: 1.2.1
- dev: false
/caller-callsite@2.0.0:
resolution: {integrity: sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==}
@@ -8170,7 +8379,6 @@ packages:
es-define-property: 1.0.0
es-errors: 1.3.0
gopd: 1.0.1
- dev: false
/define-lazy-prop@2.0.0:
resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
@@ -8550,12 +8758,10 @@ packages:
engines: {node: '>= 0.4'}
dependencies:
get-intrinsic: 1.2.4
- dev: false
/es-errors@1.3.0:
resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
engines: {node: '>= 0.4'}
- dev: false
/es-set-tostringtag@2.0.2:
resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==}
@@ -9828,7 +10034,6 @@ packages:
has-proto: 1.0.3
has-symbols: 1.0.3
hasown: 2.0.1
- dev: false
/get-port-please@3.1.2:
resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==}
@@ -10006,7 +10211,7 @@ packages:
dir-glob: 3.0.1
fast-glob: 3.3.2
glob: 7.2.3
- ignore: 5.3.0
+ ignore: 5.3.1
merge2: 1.4.1
slash: 3.0.0
dev: true
@@ -10199,7 +10404,6 @@ packages:
resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
dependencies:
es-define-property: 1.0.0
- dev: false
/has-proto@1.0.1:
resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
@@ -10208,7 +10412,6 @@ packages:
/has-proto@1.0.3:
resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
engines: {node: '>= 0.4'}
- dev: false
/has-symbols@1.0.3:
resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
@@ -10246,7 +10449,6 @@ packages:
engines: {node: '>= 0.4'}
dependencies:
function-bind: 1.1.2
- dev: false
/he@1.2.0:
resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
@@ -11503,7 +11705,7 @@ packages:
/lit-element@3.3.3:
resolution: {integrity: sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==}
dependencies:
- '@lit-labs/ssr-dom-shim': 1.1.2
+ '@lit-labs/ssr-dom-shim': 1.2.0
'@lit/reactive-element': 1.6.3
lit-html: 2.8.0
dev: false
@@ -12339,6 +12541,10 @@ packages:
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
+ /napi-wasm@1.1.0:
+ resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==}
+ dev: false
+
/natural-compare@1.4.0:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
dev: true
@@ -12565,7 +12771,7 @@ packages:
engines: {node: '>= 0.8'}
dependencies:
array.prototype.reduce: 1.0.6
- call-bind: 1.0.5
+ call-bind: 1.0.7
define-properties: 1.2.1
es-abstract: 1.22.3
safe-array-concat: 1.0.1
@@ -12825,7 +13031,7 @@ packages:
got: 12.6.1
registry-auth-token: 5.0.2
registry-url: 6.0.1
- semver: 7.5.4
+ semver: 7.6.0
dev: true
/param-case@3.0.4:
@@ -14164,7 +14370,6 @@ packages:
get-intrinsic: 1.2.4
gopd: 1.0.1
has-property-descriptors: 1.0.2
- dev: false
/set-function-name@2.0.1:
resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
@@ -16470,7 +16675,7 @@ packages:
pify: 4.0.1
recursive-readdir: 2.2.3
sc-istanbul: 0.4.6
- semver: 7.5.4
+ semver: 7.6.0
shelljs: 0.8.5
web3-utils: 1.10.3
transitivePeerDependencies:
From b151bcb2e159ece03da3c2014e35dbbbed7d8410 Mon Sep 17 00:00:00 2001
From: Korbinian
Date: Thu, 22 Feb 2024 19:23:42 +0100
Subject: [PATCH 6/9] fix(bridge-ui): incorrectly detecting bridged tokens
(#16007)
---
.../src/components/TokenDropdown/TokenDropdown.svelte | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
index b2f23933788..6f929afde84 100644
--- a/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
+++ b/packages/bridge-ui/src/components/TokenDropdown/TokenDropdown.svelte
@@ -98,7 +98,10 @@
}
if (tokenInfo.canonical && tokenInfo.bridged) {
// double check we have the correct address for the destination chain and it is not 0x0
- if (value?.addresses[destChain.id] !== tokenInfo.canonical?.address) {
+ if (
+ value?.addresses[destChain.id] !== tokenInfo.canonical?.address &&
+ value?.addresses[destChain.id] !== zeroAddress
+ ) {
log('selected token is bridged', value?.addresses[destChain.id]);
$selectedTokenIsBridged = true;
} else {
From 4d2372c1a86350e830a3cec19ba30d752f7fb3aa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 19:28:34 +0100
Subject: [PATCH 7/9] chore(main): release bridge-ui 2.9.1 (#15952)
Co-authored-by: teko <160625009+taiko-kitty@users.noreply.github.com>
---
.release-please-manifest.json | 2 +-
packages/bridge-ui/CHANGELOG.md | 11 +++++++++++
packages/bridge-ui/package.json | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 0d98e5560e1..0d19ed968f5 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,6 +1,6 @@
{
"packages/branding": "0.3.0",
- "packages/bridge-ui": "2.9.0",
+ "packages/bridge-ui": "2.9.1",
"packages/eventindexer": "0.13.0",
"packages/fork-diff": "0.4.0",
"packages/guardian-prover-health-check": "0.1.0",
diff --git a/packages/bridge-ui/CHANGELOG.md b/packages/bridge-ui/CHANGELOG.md
index 0c120efe35b..8f8390975f6 100644
--- a/packages/bridge-ui/CHANGELOG.md
+++ b/packages/bridge-ui/CHANGELOG.md
@@ -1,5 +1,16 @@
# Changelog
+## [2.9.1](https://github.com/taikoxyz/taiko-mono/compare/bridge-ui-v2.9.0...bridge-ui-v2.9.1) (2024-02-22)
+
+
+### Bug Fixes
+
+* **bridge-ui:** add dependency ([#15999](https://github.com/taikoxyz/taiko-mono/issues/15999)) ([14484a0](https://github.com/taikoxyz/taiko-mono/commit/14484a00c1d59332361fba32b74d39db2ae4b864))
+* **bridge-ui:** fix wrong balance updates on network switch ([#15980](https://github.com/taikoxyz/taiko-mono/issues/15980)) ([b556e00](https://github.com/taikoxyz/taiko-mono/commit/b556e000b25fc8d5405cba77f3eebb4152dc1497))
+* **bridge-ui:** incorrectly detecting bridged tokens ([#16007](https://github.com/taikoxyz/taiko-mono/issues/16007)) ([b151bcb](https://github.com/taikoxyz/taiko-mono/commit/b151bcb2e159ece03da3c2014e35dbbbed7d8410))
+* **bridge-ui:** transactions view styling ([#15997](https://github.com/taikoxyz/taiko-mono/issues/15997)) ([620a22d](https://github.com/taikoxyz/taiko-mono/commit/620a22dcb1ce77a9335dff8bbe0546c4c5065b23))
+* fix typos in tests and comments ([#15028](https://github.com/taikoxyz/taiko-mono/issues/15028)) ([54bf597](https://github.com/taikoxyz/taiko-mono/commit/54bf597c89a7f22161eeeffd13c20fe0acb4e2d7))
+
## [2.9.0](https://github.com/taikoxyz/taiko-mono/compare/bridge-ui-v2-v2.8.0...bridge-ui-v2-v2.9.0) (2023-10-18)
diff --git a/packages/bridge-ui/package.json b/packages/bridge-ui/package.json
index 9e4309c4515..3d8d12f7811 100644
--- a/packages/bridge-ui/package.json
+++ b/packages/bridge-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "bridge-ui",
- "version": "2.9.0",
+ "version": "2.9.1",
"private": true,
"scripts": {
"dev": "vite dev",
From a9f60b8c114dfd277e8dc227e7fbbe8716698d53 Mon Sep 17 00:00:00 2001
From: arul armstrong <33225342+arularmstrong@users.noreply.github.com>
Date: Fri, 23 Feb 2024 05:50:21 +0530
Subject: [PATCH 8/9] fix(bridge-ui): renamed configuredCustomToken to
configuredCustomTokens (#15905)
Co-authored-by: Korbinian
---
packages/bridge-ui/config/sample/configuredBridges.example | 4 ++--
...uredCustomToken.example => configuredCustomTokens.example} | 0
...omToken.schema.json => configuredCustomTokens.schema.json} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename packages/bridge-ui/config/sample/{configuredCustomToken.example => configuredCustomTokens.example} (100%)
rename packages/bridge-ui/config/schemas/{configuredCustomToken.schema.json => configuredCustomTokens.schema.json} (100%)
diff --git a/packages/bridge-ui/config/sample/configuredBridges.example b/packages/bridge-ui/config/sample/configuredBridges.example
index 9c3f23b2322..a75586d44a6 100644
--- a/packages/bridge-ui/config/sample/configuredBridges.example
+++ b/packages/bridge-ui/config/sample/configuredBridges.example
@@ -36,7 +36,7 @@
"signalServiceAddress": "",
"hops": [
{
- "chaind: ,
+ "chaind": ,
"crossChainSyncAddress": "",
"signalServiceAddress": "",
}
@@ -55,7 +55,7 @@
"signalServiceAddress": "",
"hops": [
{
- "chaind: ,
+ "chaind": ,
"crossChainSyncAddress": "",
"signalServiceAddress": "",
}
diff --git a/packages/bridge-ui/config/sample/configuredCustomToken.example b/packages/bridge-ui/config/sample/configuredCustomTokens.example
similarity index 100%
rename from packages/bridge-ui/config/sample/configuredCustomToken.example
rename to packages/bridge-ui/config/sample/configuredCustomTokens.example
diff --git a/packages/bridge-ui/config/schemas/configuredCustomToken.schema.json b/packages/bridge-ui/config/schemas/configuredCustomTokens.schema.json
similarity index 100%
rename from packages/bridge-ui/config/schemas/configuredCustomToken.schema.json
rename to packages/bridge-ui/config/schemas/configuredCustomTokens.schema.json
From 0496ff40e374354b83d17121e4760391fed90a31 Mon Sep 17 00:00:00 2001
From: Korbinian
Date: Fri, 23 Feb 2024 03:40:10 +0100
Subject: [PATCH 9/9] fix(bridge-ui): add injected provider to connectors
(#16008)
Co-authored-by: David
---
packages/bridge-ui/src/libs/connect/web3modal.ts | 2 ++
packages/bridge-ui/src/libs/wagmi/client.ts | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/bridge-ui/src/libs/connect/web3modal.ts b/packages/bridge-ui/src/libs/connect/web3modal.ts
index 431bd88c854..bfcb1cc5f91 100644
--- a/packages/bridge-ui/src/libs/connect/web3modal.ts
+++ b/packages/bridge-ui/src/libs/connect/web3modal.ts
@@ -10,6 +10,8 @@ const chainImages = getChainImages();
export const web3modal = createWeb3Modal({
wagmiConfig: config,
projectId,
+ featuredWalletIds: [],
+ excludeWalletIds: ['c57ca95b47569778a828d19178114f4db188b89b763c899ba0be274e97267d96'],
// chains,
chainImages,
themeVariables: {
diff --git a/packages/bridge-ui/src/libs/wagmi/client.ts b/packages/bridge-ui/src/libs/wagmi/client.ts
index 8f00a8071c0..449f758d6c9 100644
--- a/packages/bridge-ui/src/libs/wagmi/client.ts
+++ b/packages/bridge-ui/src/libs/wagmi/client.ts
@@ -1,4 +1,4 @@
-import { walletConnect } from '@wagmi/connectors';
+import { injected, walletConnect } from '@wagmi/connectors';
import { createConfig, getPublicClient, http, reconnect } from '@wagmi/core';
import { PUBLIC_WALLETCONNECT_PROJECT_ID } from '$env/static/public';
@@ -15,7 +15,7 @@ const transports = chains.reduce((acc, { id }) => ({ ...acc, [id]: http() }), {}
export const config = createConfig({
//@ts-ignore
chains: [...chains],
- connectors: [walletConnect({ projectId })],
+ connectors: [walletConnect({ projectId, showQrModal: false }), injected()],
transports,
});