Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: test 2.18.1-canary-ws-2 #3885

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

chore: test 2.18.1-canary-ws-2 #3885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6dfc472
chore: test `2.18.1-canary-ws-2`
ganchoradkov Feb 20, 2025
8ac802f
fix: type
ganchoradkov Feb 20, 2025
c9ee76f
chore: revert type
ganchoradkov Feb 20, 2025
a5eb34a
Merge branch 'main' into chore/test-2.18.1-canary-ws-2
ganchoradkov Feb 20, 2025
6799642
chore: ts-node
ganchoradkov Feb 20, 2025
615b157
chore: updates canary
ganchoradkov Feb 21, 2025
2db53db
Merge branch 'main' into chore/test-2.18.1-canary-ws-2
ganchoradkov Feb 21, 2025
d27ad8d
refactor: scrap auto reconnect
ganchoradkov Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/laboratory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
"@tanstack/react-query": "5.24.8",
"@wagmi/connectors": "5.7.7",
"@wagmi/core": "2.16.4",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"axios": "1.7.2",
"bitcoinjs-lib": "7.0.0-rc.0",
"bs58": "6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/html-ak-basic-sign-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@reown/appkit": "workspace:*",
"@walletconnect/sign-client": "2.18.0"
"@walletconnect/sign-client": "2.18.1-canary-ws-3"
},
"devDependencies": {
"vite": "5.4.12"
Expand Down
2 changes: 1 addition & 1 deletion examples/html-ak-basic-up/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@reown/appkit": "workspace:*",
"@walletconnect/universal-provider": "2.18.0"
"@walletconnect/universal-provider": "2.18.1-canary-ws-3"
},
"devDependencies": {
"vite": "5.4.12"
Expand Down
4 changes: 2 additions & 2 deletions examples/next-ak-basic-sign-client-app-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"dependencies": {
"@reown/appkit": "workspace:*",
"@tanstack/react-query": "5.56.2",
"@walletconnect/sign-client": "2.18.0",
"@walletconnect/types": "2.18.0",
"@walletconnect/sign-client": "2.18.1-canary-ws-3",
"@walletconnect/types": "2.18.1-canary-ws-3",
"next": "14.2.21",
"next-themes": "0.4.3",
"react": "19.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/next-ak-basic-up-app-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"@reown/appkit": "workspace:*",
"@tanstack/react-query": "5.56.2",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"next": "14.2.21",
"next-themes": "0.4.3",
"react": "19.0.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/parcel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dependencies": {
"@reown/appkit": "workspace:*",
"@reown/appkit-adapter-wagmi": "workspace:*",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"react": "19.0.0",
"react-dom": "19.0.0",
"viem": "2.23.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/react-ak-basic-sign-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"dependencies": {
"@reown/appkit": "workspace:*",
"@walletconnect/sign-client": "2.18.0",
"@walletconnect/types": "2.18.0",
"@walletconnect/sign-client": "2.18.1-canary-ws-3",
"@walletconnect/types": "2.18.1-canary-ws-3",
"ethers": "6.13.2",
"react": "19.0.0",
"react-dom": "19.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/react-ak-basic-up/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@reown/appkit": "workspace:*",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"ethers": "6.13.2",
"react": "19.0.0",
"react-dom": "19.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/vue-ak-basic-sign-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"dependencies": {
"@reown/appkit": "workspace:*",
"@walletconnect/sign-client": "2.18.0",
"@walletconnect/types": "2.18.0",
"@walletconnect/sign-client": "2.18.1-canary-ws-3",
"@walletconnect/types": "2.18.1-canary-ws-3",
"vue": "3.4.3"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/bitcoin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
"@reown/appkit-utils": "workspace:*",
"@wallet-standard/app": "1.1.0",
"@wallet-standard/base": "1.1.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"bitcoinjs-lib": "6.1.7",
"sats-connect": "3.0.1"
},
"devDependencies": {
"@leather.io/rpc": "2.1.21",
"@vitest/coverage-v8": "2.1.3",
"@wallet-standard/features": "1.0.3",
"@walletconnect/types": "2.18.0",
"@walletconnect/types": "2.18.1-canary-ws-3",
"vitest": "2.1.9"
},
"author": "Reown <[email protected]> (https://reown.com)",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/ethers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"@reown/appkit-utils": "workspace:*",
"@reown/appkit-ui": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/utils": "2.18.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"valtio": "1.13.2"
},
"optionalDependencies": {
Expand All @@ -38,7 +38,7 @@
},
"devDependencies": {
"@vitest/coverage-v8": "2.1.3",
"@walletconnect/types": "2.18.0",
"@walletconnect/types": "2.18.1-canary-ws-3",
"vitest": "2.1.9"
},
"author": "Reown <[email protected]> (https://reown.com)",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/ethers5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"@reown/appkit-utils": "workspace:*",
"@reown/appkit-ui": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/utils": "2.18.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"valtio": "1.13.2"
},
"optionalDependencies": {
Expand All @@ -38,7 +38,7 @@
},
"devDependencies": {
"@vitest/coverage-v8": "2.1.3",
"@walletconnect/types": "2.18.0",
"@walletconnect/types": "2.18.1-canary-ws-3",
"vitest": "2.1.9"
},
"author": "Reown <[email protected]> (https://reown.com)",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/solana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"@solana/wallet-standard-features": "1.2.0",
"@solana/wallet-standard-util": "1.1.1",
"@solana/web3.js": "1.98.0",
"@walletconnect/utils": "2.18.0",
"@walletconnect/types": "2.18.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"@walletconnect/types": "2.18.1-canary-ws-3",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"@wallet-standard/app": "1.1.0",
"@wallet-standard/base": "1.1.0",
"@wallet-standard/features": "1.0.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/wagmi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"@reown/appkit-utils": "workspace:*",
"@reown/appkit-ui": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/utils": "2.18.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"valtio": "1.13.2"
},
"optionalDependencies": {
Expand All @@ -41,7 +41,7 @@
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"@vitest/coverage-v8": "2.1.3",
"@walletconnect/types": "2.18.0",
"@walletconnect/types": "2.18.1-canary-ws-3",
"vitest": "2.1.9"
},
"author": "Reown <[email protected]> (https://reown.com)",
Expand Down
2 changes: 1 addition & 1 deletion packages/appkit-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@reown/appkit-polyfills": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/logger": "2.1.2",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"valtio": "1.13.2",
"viem": ">=2.23.0"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/appkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
"@reown/appkit-ui": "workspace:*",
"@reown/appkit-utils": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/types": "2.18.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/utils": "2.18.0",
"@walletconnect/types": "2.18.1-canary-ws-3",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"bs58": "6.0.0",
"valtio": "1.13.2",
"viem": ">=2.23.0"
Expand All @@ -122,8 +122,8 @@
"@types/react-dom": "19.0.0",
"@vitest/coverage-v8": "2.1.3",
"@vue/runtime-core": "3.4.3",
"@walletconnect/types": "2.18.0",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/types": "2.18.1-canary-ws-3",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"react": "19.0.0",
"react-dom": "19.0.0",
"vitest": "2.1.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"@reown/appkit-common": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/universal-provider": "2.18.0",
"@walletconnect/universal-provider": "2.18.1-canary-ws-3",
"valtio": "1.13.2",
"viem": ">=2.23"
},
Expand Down
23 changes: 3 additions & 20 deletions packages/scaffold-ui/src/views/w3m-connecting-wc-view/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import type { BaseError, Platform } from '@reown/appkit-core'
import {
ChainController,
ConnectionController,
ConstantsUtil,
CoreHelperUtil,
EventsController,
ModalController,
Expand All @@ -19,10 +18,6 @@ import { customElement } from '@reown/appkit-ui'
@customElement('w3m-connecting-wc-view')
export class W3mConnectingWcView extends LitElement {
// -- Members ------------------------------------------- //
private interval?: ReturnType<typeof setInterval> = undefined

private lastRetry = Date.now()

private wallet = RouterController.state.data?.wallet

// -- State & Properties -------------------------------- //
Expand All @@ -36,14 +31,6 @@ export class W3mConnectingWcView extends LitElement {
super()
this.determinePlatforms()
this.initializeConnection()
this.interval = setInterval(
this.initializeConnection.bind(this),
ConstantsUtil.TEN_SEC_MS
) as unknown as NodeJS.Timeout
}
Comment on lines -39 to -43
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🫠


public override disconnectedCallback() {
clearTimeout(this.interval)
}

// -- Render -------------------------------------------- //
Expand Down Expand Up @@ -80,13 +67,9 @@ export class W3mConnectingWcView extends LitElement {
properties: { message: (error as BaseError)?.message ?? 'Unknown' }
})
ConnectionController.setWcError(true)
if (CoreHelperUtil.isAllowedRetry(this.lastRetry)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still need this util? can we remove?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems isAllowedRetry is also used in AccountController

SnackController.showError((error as BaseError).message ?? 'Declined')
this.lastRetry = Date.now()
this.initializeConnection(true)
} else {
SnackController.showError((error as BaseError).message ?? 'Connection error')
}
SnackController.showError((error as BaseError).message ?? 'Connection error')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is no longer looped into reconnecting right? Just triple checking there won't be popups going crazy if a network issue happens and we enter a retry loop

Copy link
Member Author

@ganchoradkov ganchoradkov Feb 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope, when await ConnectionController.connectWalletConnect() rejects for whatever reason

  • rejected by the user
  • proposal expired

the router redirects back to wallet list and thats all

ConnectionController.resetWcConnection()
RouterController.goBack()
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/siwe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@reown/appkit-ui": "workspace:*",
"@reown/appkit-utils": "workspace:*",
"@reown/appkit-wallet": "workspace:*",
"@walletconnect/utils": "2.18.0",
"@walletconnect/utils": "2.18.1-canary-ws-3",
"lit": "3.1.0",
"valtio": "1.13.2",
"viem": "2.23.0"
Expand Down
Loading
Loading