fix: Alph node provider (#231)

* chore: update version * fix: Alph provider issue * chore: update version
OneKeyHQ · Sep 9, 2024 · 44a6d42 · 44a6d42
1 parent 2946cc1
commit 44a6d42
Show file tree

Hide file tree

Showing 35 changed files with 181 additions and 165 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,9 +29,9 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-events": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-events": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
     "ms": "^2.1.3"

diff --git a/packages/core/src/versionInfo.ts b/packages/core/src/versionInfo.ts
@@ -1,5 +1,5 @@
 
-const version = '2.1.3';
+const version = '2.1.5';
 const versionBuild = '2020-0101-1';
 
 export default {

diff --git a/packages/desktop/desktop-bridge-injected/package.json b/packages/desktop/desktop-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/desktop-bridge-injected",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -34,7 +34,7 @@
     "electron": "^17.2.0"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6"
   }
 }
diff --git a/packages/empty/package.json b/packages/empty/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-empty",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-errors",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/events/package.json b/packages/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-events",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],

diff --git a/packages/example/package.json b/packages/example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-example",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "private": true,
   "scripts": {
     "postinstall": "patch-package",
@@ -21,17 +21,17 @@
     "@metamask/eth-sig-util": "^7.0.2",
     "@metamask/onboarding": "^1.0.1",
     "@mysten/dapp-kit": "0.13.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/onekey-aptos-provider": "2.1.5",
-    "@onekeyfe/onekey-cardano-provider": "2.1.5",
-    "@onekeyfe/onekey-conflux-provider": "2.1.5",
-    "@onekeyfe/onekey-cosmos-provider": "2.1.5",
-    "@onekeyfe/onekey-near-provider": "2.1.5",
-    "@onekeyfe/onekey-solana-provider": "2.1.5",
-    "@onekeyfe/onekey-sui-provider": "2.1.5",
-    "@onekeyfe/onekey-tron-provider": "2.1.5",
-    "@onekeyfe/onekey-webln-provider": "2.1.5",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/onekey-aptos-provider": "2.1.6",
+    "@onekeyfe/onekey-cardano-provider": "2.1.6",
+    "@onekeyfe/onekey-conflux-provider": "2.1.6",
+    "@onekeyfe/onekey-cosmos-provider": "2.1.6",
+    "@onekeyfe/onekey-near-provider": "2.1.6",
+    "@onekeyfe/onekey-solana-provider": "2.1.6",
+    "@onekeyfe/onekey-sui-provider": "2.1.6",
+    "@onekeyfe/onekey-tron-provider": "2.1.6",
+    "@onekeyfe/onekey-webln-provider": "2.1.6",
     "@polkadot/api": "^9.11.3",
     "@polkadot/extension-dapp": "^0.47.5",
     "@radix-ui/react-checkbox": "^1.1.0",

diff --git a/packages/extension/extension-bridge-hosted/package.json b/packages/extension/extension-bridge-hosted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-hosted",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,8 +28,8 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
     "uuid": "^8.3.2"
   },
   "devDependencies": {

diff --git a/packages/extension/extension-bridge-injected/package.json b/packages/extension/extension-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-injected",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6"
   }
 }
diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-injected",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -42,12 +42,12 @@
     "electron": "*"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/desktop-bridge-injected": "2.1.5",
-    "@onekeyfe/extension-bridge-injected": "2.1.5",
-    "@onekeyfe/inpage-providers-hub": "2.1.5",
-    "@onekeyfe/native-bridge-injected": "2.1.5",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/desktop-bridge-injected": "2.1.6",
+    "@onekeyfe/extension-bridge-injected": "2.1.6",
+    "@onekeyfe/inpage-providers-hub": "2.1.6",
+    "@onekeyfe/native-bridge-injected": "2.1.6",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0"
   }

diff --git a/packages/native/native-bridge-injected/package.json b/packages/native/native-bridge-injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/native-bridge-injected",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,7 +28,7 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6"
   }
 }
diff --git a/packages/providers/inpage-providers-hub/package.json b/packages/providers/inpage-providers-hub/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/inpage-providers-hub",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -30,26 +30,26 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/onekey-algo-provider": "2.1.5",
-    "@onekeyfe/onekey-alph-provider": "2.1.5",
-    "@onekeyfe/onekey-aptos-provider": "2.1.5",
-    "@onekeyfe/onekey-btc-provider": "2.1.5",
-    "@onekeyfe/onekey-cardano-provider": "2.1.5",
-    "@onekeyfe/onekey-conflux-provider": "2.1.5",
-    "@onekeyfe/onekey-cosmos-provider": "2.1.5",
-    "@onekeyfe/onekey-eth-provider": "2.1.5",
-    "@onekeyfe/onekey-nostr-provider": "2.1.5",
-    "@onekeyfe/onekey-polkadot-provider": "2.1.5",
-    "@onekeyfe/onekey-private-external-account-provider": "2.1.5",
-    "@onekeyfe/onekey-private-provider": "2.1.5",
-    "@onekeyfe/onekey-scdo-provider": "2.1.5",
-    "@onekeyfe/onekey-solana-provider": "2.1.5",
-    "@onekeyfe/onekey-sui-provider": "2.1.5",
-    "@onekeyfe/onekey-ton-provider": "2.1.5",
-    "@onekeyfe/onekey-tron-provider": "2.1.5",
-    "@onekeyfe/onekey-webln-provider": "2.1.5",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/onekey-algo-provider": "2.1.6",
+    "@onekeyfe/onekey-alph-provider": "2.1.6",
+    "@onekeyfe/onekey-aptos-provider": "2.1.6",
+    "@onekeyfe/onekey-btc-provider": "2.1.6",
+    "@onekeyfe/onekey-cardano-provider": "2.1.6",
+    "@onekeyfe/onekey-conflux-provider": "2.1.6",
+    "@onekeyfe/onekey-cosmos-provider": "2.1.6",
+    "@onekeyfe/onekey-eth-provider": "2.1.6",
+    "@onekeyfe/onekey-nostr-provider": "2.1.6",
+    "@onekeyfe/onekey-polkadot-provider": "2.1.6",
+    "@onekeyfe/onekey-private-external-account-provider": "2.1.6",
+    "@onekeyfe/onekey-private-provider": "2.1.6",
+    "@onekeyfe/onekey-scdo-provider": "2.1.6",
+    "@onekeyfe/onekey-solana-provider": "2.1.6",
+    "@onekeyfe/onekey-sui-provider": "2.1.6",
+    "@onekeyfe/onekey-ton-provider": "2.1.6",
+    "@onekeyfe/onekey-tron-provider": "2.1.6",
+    "@onekeyfe/onekey-webln-provider": "2.1.6",
     "web3": "^1.7.3"
   },
   "devDependencies": {

diff --git a/packages/providers/onekey-algo-provider/package.json b/packages/providers/onekey-algo-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-algo-provider",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,9 +28,9 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/extension-bridge-injected": "2.1.5"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/extension-bridge-injected": "2.1.6"
   }
 }
diff --git a/packages/providers/onekey-alph-provider/package.json b/packages/providers/onekey-alph-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-alph-provider",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -31,9 +31,9 @@
     "@alephium/get-extension-wallet": "^1.5.2",
     "@alephium/walletconnect-provider": "^1.5.2",
     "@alephium/web3": "^1.5.2",
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/extension-bridge-injected": "2.1.5"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/extension-bridge-injected": "2.1.6"
   }
 }
diff --git a/packages/providers/onekey-alph-provider/src/OnekeyAlphProvider.ts b/packages/providers/onekey-alph-provider/src/OnekeyAlphProvider.ts
@@ -38,10 +38,14 @@ export class ProviderAlph extends InteractiveSignerProvider implements AlephiumW
   id = 'alephium';
   name = 'Alephium';
   icon = 'https://uni.onekey-asset.com/static/logo/onekey.png';
-  version = '0.0.0';
+  version = '0.9.4';
   _accountInfo: Account | undefined;
 
   _base: ProviderAlphBase
+
+  onDisconnected: (() => void | Promise<void>) | undefined = undefined
+  #nodeProvider: NodeProvider | undefined = undefined
+  #explorerProvider: ExplorerProvider | undefined = undefined
 
   constructor(props: OneKeyTonProviderProps) {
     super();
@@ -126,6 +130,10 @@ export class ProviderAlph extends InteractiveSignerProvider implements AlephiumW
       method: 'disconnect',
       params: [],
     });
+    if (this.onDisconnected !== undefined) {
+      await this.onDisconnected()
+    }
+    this.onDisconnected = undefined;
     this._handleDisconnected();
   }
 
@@ -137,6 +145,9 @@ export class ProviderAlph extends InteractiveSignerProvider implements AlephiumW
   }
 
   enableIfConnected(options: EnableOptions): Promise<Account | undefined> {
+    if (options.onDisconnected) {
+      this.onDisconnected = options.onDisconnected
+    }
     return this.bridgeRequest({
       method: 'enableIfConnected',
       params: options,
@@ -155,8 +166,7 @@ export class ProviderAlph extends InteractiveSignerProvider implements AlephiumW
     let params: Record<string, unknown> = {};
     if (opt) {
       if (opt.onDisconnected) {
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        this.on(PROVIDER_EVENTS.disconnect, opt.onDisconnected);
+        this.onDisconnected = opt.onDisconnected
       }
       params = {}
       Object.keys(opt).forEach((key) => {
@@ -170,11 +180,17 @@ export class ProviderAlph extends InteractiveSignerProvider implements AlephiumW
   }
 
   get nodeProvider(): NodeProvider | undefined {
-    return undefined;
+    if (!this.#nodeProvider) {
+      this.#nodeProvider = new NodeProvider('https://node.mainnet.alephium.org');
+    }
+    return this.#nodeProvider;
   }
 
   get explorerProvider(): ExplorerProvider | undefined {
-    return undefined;
+    if (!this.#explorerProvider) {
+      this.#explorerProvider = new ExplorerProvider('https://backend.mainnet.alephium.org');
+    }
+    return this.#explorerProvider;
   }
 
   unsafeGetSelectedAccount(): Promise<Account> {

diff --git a/packages/providers/onekey-aptos-provider/package.json b/packages/providers/onekey-aptos-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-aptos-provider",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,10 +28,10 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/extension-bridge-injected": "2.1.5",
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/extension-bridge-injected": "2.1.6",
     "aptos": "^1.3.17",
     "eth-rpc-errors": "^4.0.3"
   }

diff --git a/packages/providers/onekey-btc-provider/package.json b/packages/providers/onekey-btc-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/onekey-btc-provider",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,9 +28,9 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-errors": "2.1.5",
-    "@onekeyfe/cross-inpage-provider-types": "2.1.5",
-    "@onekeyfe/extension-bridge-injected": "2.1.5"
+    "@onekeyfe/cross-inpage-provider-core": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-errors": "2.1.6",
+    "@onekeyfe/cross-inpage-provider-types": "2.1.6",
+    "@onekeyfe/extension-bridge-injected": "2.1.6"
   }
 }