From 0d72e5aa283d3336792cc403f2f7d6ef279db40b Mon Sep 17 00:00:00 2001 From: BeycanDeveloper Date: Thu, 7 Nov 2024 19:45:04 +0700 Subject: [PATCH 1/4] added isomorphic-ws for node and browser --- packages/networks/bitcoin/package.json | 3 ++- packages/networks/bitcoin/pnpm-lock.yaml | 12 ++++++++++++ .../bitcoin/src/services/TransactionListener.ts | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/networks/bitcoin/package.json b/packages/networks/bitcoin/package.json index e5dc705..b1275fe 100644 --- a/packages/networks/bitcoin/package.json +++ b/packages/networks/bitcoin/package.json @@ -1,6 +1,6 @@ { "name": "@multiplechain/bitcoin", - "version": "0.4.8", + "version": "0.4.10", "type": "module", "main": "dist/index.cjs", "module": "dist/index.es.js", @@ -76,6 +76,7 @@ "@multiplechain/utils": "^0.1.21", "axios": "^1.6.8", "bitcore-lib": "^10.0.28", + "isomorphic-ws": "^5.0.0", "lodash": "^4.17.21", "sats-connect": "^2.3.1", "ws": "^8.17.0" diff --git a/packages/networks/bitcoin/pnpm-lock.yaml b/packages/networks/bitcoin/pnpm-lock.yaml index b7eb102..5ded744 100644 --- a/packages/networks/bitcoin/pnpm-lock.yaml +++ b/packages/networks/bitcoin/pnpm-lock.yaml @@ -20,6 +20,9 @@ importers: bitcore-lib: specifier: ^10.0.28 version: 10.0.28 + isomorphic-ws: + specifier: ^5.0.0 + version: 5.0.0(ws@8.17.0) lodash: specifier: ^4.17.21 version: 4.17.21 @@ -268,6 +271,11 @@ packages: resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} + isomorphic-ws@5.0.0: + resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} + peerDependencies: + ws: '*' + js-sha256@0.9.0: resolution: {integrity: sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==} @@ -641,6 +649,10 @@ snapshots: dependencies: which-typed-array: 1.1.15 + isomorphic-ws@5.0.0(ws@8.17.0): + dependencies: + ws: 8.17.0 + js-sha256@0.9.0: {} jsontokens@4.0.1: diff --git a/packages/networks/bitcoin/src/services/TransactionListener.ts b/packages/networks/bitcoin/src/services/TransactionListener.ts index 20f12da..7c4af08 100644 --- a/packages/networks/bitcoin/src/services/TransactionListener.ts +++ b/packages/networks/bitcoin/src/services/TransactionListener.ts @@ -5,7 +5,7 @@ import type { DynamicTransactionListenerFilterType, TransactionId } from '@multiplechain/types' -import WebSocket from 'ws' +import WebSocket from 'isomorphic-ws' import { Provider } from './Provider' import { fromSatoshi } from '../utils' import { Transaction } from '../models/Transaction' From 483b532317c362f488936cdd9ccf455516c3913a Mon Sep 17 00:00:00 2001 From: BeycanDeveloper Date: Thu, 7 Nov 2024 19:52:02 +0700 Subject: [PATCH 2/4] added condition --- packages/networks/solana/src/services/Provider.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/networks/solana/src/services/Provider.ts b/packages/networks/solana/src/services/Provider.ts index 3edcb0d..f366a15 100644 --- a/packages/networks/solana/src/services/Provider.ts +++ b/packages/networks/solana/src/services/Provider.ts @@ -115,7 +115,13 @@ export class Provider implements ProviderInterface { */ async checkWsConnection(url?: string): Promise { try { - const result: any = await checkWebSocket(url ?? this.node.wsUrl ?? '') + const wsUrl = url ?? this.node.wsUrl ?? '' + + if (wsUrl === '' || wsUrl === undefined) { + return new Error(ErrorTypeEnum.WS_URL_NOT_DEFINED) + } + + const result: any = await checkWebSocket(wsUrl) if (result instanceof Error) { return result From 0424f15e14564e0a4ae626c1b65ce70a0fae8677 Mon Sep 17 00:00:00 2001 From: BeycanDeveloper Date: Thu, 7 Nov 2024 19:55:29 +0700 Subject: [PATCH 3/4] removed toEIP6963ProviderDetail --- .../networks/evm-chains/src/browser/index.ts | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/packages/networks/evm-chains/src/browser/index.ts b/packages/networks/evm-chains/src/browser/index.ts index ccf03f0..25d2094 100644 --- a/packages/networks/evm-chains/src/browser/index.ts +++ b/packages/networks/evm-chains/src/browser/index.ts @@ -44,7 +44,6 @@ const fromEIP6963ProviderDetail = ( return { name: detail.info.name, icon: detail.info.icon, - provider: detail.provider, id: detail.info.rdns ?? detail.info.uuid, platforms: [WalletPlatformEnum.BROWSER, WalletPlatformEnum.MOBILE], isDetected: () => true, @@ -70,30 +69,12 @@ const fromEIP6963ProviderDetail = ( } } -const toEIP6963ProviderDetail = ( - adapter: WalletAdapterInterface -): EIP6963ProviderDetail => { - if (adapter.provider === undefined) { - throw new Error('Cannot convert adapter without provider to EIP6963ProviderDetail') - } - - return { - info: { - uuid: adapter.id, - name: adapter.name, - icon: adapter.icon - }, - provider: adapter.provider as any - } -} - export * from '../index' export const browser = { Wallet, switcher, registerAdapter, - toEIP6963ProviderDetail, fromEIP6963ProviderDetail, adapters: Object.assign(adapters, adapterList) } From 53ffc8b84f58d6e7d6f977f8c9822c1ccf20dfa3 Mon Sep 17 00:00:00 2001 From: BeycanDeveloper Date: Thu, 7 Nov 2024 19:56:25 +0700 Subject: [PATCH 4/4] version up --- packages/networks/bitcoin/package.json | 2 +- packages/networks/evm-chains/package.json | 2 +- packages/networks/solana/package.json | 2 +- packages/networks/tron/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/networks/bitcoin/package.json b/packages/networks/bitcoin/package.json index b1275fe..e471a04 100644 --- a/packages/networks/bitcoin/package.json +++ b/packages/networks/bitcoin/package.json @@ -1,6 +1,6 @@ { "name": "@multiplechain/bitcoin", - "version": "0.4.10", + "version": "0.4.9", "type": "module", "main": "dist/index.cjs", "module": "dist/index.es.js", diff --git a/packages/networks/evm-chains/package.json b/packages/networks/evm-chains/package.json index 5bf5356..6cf2c4f 100644 --- a/packages/networks/evm-chains/package.json +++ b/packages/networks/evm-chains/package.json @@ -1,6 +1,6 @@ { "name": "@multiplechain/evm-chains", - "version": "0.4.8", + "version": "0.4.9", "type": "module", "main": "dist/index.cjs", "module": "dist/index.es.js", diff --git a/packages/networks/solana/package.json b/packages/networks/solana/package.json index 0d83c5f..62a7149 100644 --- a/packages/networks/solana/package.json +++ b/packages/networks/solana/package.json @@ -1,6 +1,6 @@ { "name": "@multiplechain/solana", - "version": "0.4.8", + "version": "0.4.9", "type": "module", "main": "dist/index.cjs", "module": "dist/index.es.js", diff --git a/packages/networks/tron/package.json b/packages/networks/tron/package.json index bd911f0..c9d1016 100644 --- a/packages/networks/tron/package.json +++ b/packages/networks/tron/package.json @@ -1,6 +1,6 @@ { "name": "@multiplechain/tron", - "version": "0.4.8", + "version": "0.4.9", "type": "module", "main": "dist/index.cjs", "module": "dist/index.es.js",