optimize: all network (#372)

* chore: optimize allnetwork

* chore: release version 1.0.12-alpha.1

* chore: fix lint

packages/connect-examples/electron-example/package.json

@@ -2,7 +2,7 @@
   "name": "hardware-example",
   "productName": "HardwareExample",
   "executableName": "onekey-hardware-example",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "author": "OneKey",
   "description": "End-to-end encrypted workspaces for teams",
   "main": "dist/index.js",

packages/connect-examples/expo-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-example",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "scripts": {
     "start": "CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
     "android": "yarn expo run:android",
@@ -19,10 +19,10 @@
     "@noble/ed25519": "^2.1.0",
     "@noble/hashes": "^1.3.3",
     "@noble/secp256k1": "^1.7.1",
-    "@onekeyfe/hd-ble-sdk": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-common-connect-sdk": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-core": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-web-sdk": "^1.0.12-alpha.0",
+    "@onekeyfe/hd-ble-sdk": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-common-connect-sdk": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-core": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-web-sdk": "^1.0.12-alpha.1",
     "@onekeyfe/react-native-ble-plx": "3.0.0",
     "@polkadot/util-crypto": "13.1.1",
     "@react-native-async-storage/async-storage": "1.21.0",

packages/connect-examples/expo-example/src/data/allnetwork.ts

@@ -206,10 +206,15 @@ const api: PlaygroundProps[] = [
               // ton chain has a different derivation path
             },
             {
-              network: 'alephium',
+              network: 'alph',
               path: "m/44'/1234'/0'/0/0",
               showOnOneKey: false,
             },
+            {
+              network: 'nostr',
+              path: "m/44'/1237'/0'/0/0",
+              showOnOneKey: false,
+            },
           ],
         },
       },

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport": "^1.0.12-alpha.0",
+    "@onekeyfe/hd-shared": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport": "^1.0.12-alpha.1",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",

packages/core/src/api/allnetwork/AllNetworkGetAddress.ts

@@ -1,5 +1,6 @@
 import semver from 'semver';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { get } from 'lodash';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -9,6 +10,7 @@ import { CoreApi } from '../../types';
 import type {
   AllNetworkAddress,
   AllNetworkAddressParams,
+  CommonResponseParams,
   INetwork,
 } from '../../types/api/allNetworkGetAddress';
 import { findMethod } from '../utils';
@@ -21,7 +23,8 @@ const Mainnet = 'mainnet';
 
 type NetworkConfig = {
   methodName: keyof CoreApi;
-  getParams?: (baseParams: AllNetworkAddressParams, chainName?: string) => any;
+  getParams?: (baseParams: AllNetworkAddressParams, chainName?: string, methodName?: string) => any;
+  dependOnMethodName?: (keyof CoreApi)[];
 };
 
 type INetworkReal = Exclude<INetwork, 'tbtc' | 'bch' | 'doge' | 'ltc' | 'neurai'>;
@@ -96,7 +99,7 @@ const networkConfigMap: NetworkConfigMap = {
     methodName: 'xrpGetAddress',
   },
   cosmos: {
-    methodName: 'cosmosGetAddress',
+    methodName: 'cosmosGetPublicKey',
     getParams: (baseParams: AllNetworkAddressParams) => {
       const { path, prefix, showOnOneKey } = baseParams;
       return {
@@ -138,6 +141,14 @@ const networkConfigMap: NetworkConfigMap = {
   },
   sui: {
     methodName: 'suiGetAddress',
+    dependOnMethodName: ['suiGetPublicKey'],
+    getParams: (baseParams: AllNetworkAddressParams) => {
+      const { path, showOnOneKey } = baseParams;
+      return {
+        path,
+        showOnOneKey,
+      };
+    },
   },
   fil: {
     methodName: 'filecoinGetAddress',
@@ -216,6 +227,9 @@ const networkConfigMap: NetworkConfigMap = {
   alph: {
     methodName: 'alephiumGetAddress',
   },
+  nostr: {
+    methodName: 'nostrGetPublicKey',
+  },
 };
 
 export default class AllNetworkGetAddress extends BaseMethod<
@@ -252,7 +266,13 @@ export default class AllNetworkGetAddress extends BaseMethod<
     payload: AllNetworkAddressParams;
   }): {
     methodName: keyof CoreApi;
-    params: Parameters<CoreApi[keyof CoreApi]>[0];
+    params: Parameters<CoreApi[keyof CoreApi]>[0] & { originPayload: AllNetworkAddressParams };
+    dependOnMethods:
+      | {
+          methodName: keyof CoreApi;
+          params: Parameters<CoreApi[keyof CoreApi]>[0];
+        }[]
+      | undefined;
   } {
     const { name: networkName, coin } = networkAliases[network] || {
       name: network,
@@ -263,64 +283,104 @@ export default class AllNetworkGetAddress extends BaseMethod<
       throw new Error(`Unsupported network: ${network}`);
     }
 
+    const dependOnMethods = config.dependOnMethodName?.map(dependOnMethodName => ({
+      methodName: dependOnMethodName,
+      params: config?.getParams?.(payload, coin, dependOnMethodName),
+    }));
+
     return {
       methodName: config.methodName,
-      params: config?.getParams?.(payload, coin) ?? payload,
+      params: {
+        ...(config?.getParams?.(payload, coin, config.methodName) ?? payload),
+        originPayload: payload,
+      },
+      dependOnMethods,
     };
   }
 
+  async callMethod(methodName: keyof CoreApi, params: any, baseParams: CommonResponseParams) {
+    const method: BaseMethod = findMethod({
+      event: IFRAME.CALL,
+      type: IFRAME.CALL,
+      payload: {
+        connectId: this.payload.connectId,
+        deviceId: this.payload.deviceId,
+        method: methodName,
+        ...params,
+      },
+    });
+
+    method.connector = this.connector;
+    method.postMessage = this.postMessage;
+    method.init();
+    method.setDevice?.(this.device);
+
+    let result: AllNetworkAddress;
+    try {
+      const response = await method.run();
+      result = {
+        ...baseParams,
+        success: true,
+        error: response.error,
+        payload: response,
+      };
+    } catch (e: any) {
+      const errorMessage =
+        e instanceof Error ? handleHardwareError(e, this.device, method) : 'Unknown error';
+
+      result = {
+        ...baseParams,
+        success: false,
+        error: errorMessage,
+      };
+    }
+
+    return result;
+  }
+
   async run() {
     const responses: AllNetworkAddress[] = [];
     for (let i = 0; i < this.payload.bundle.length; i++) {
       const param = this.payload.bundle[i];
-      const { methodName, params } = this.generateMethodName({
+      const { methodName, params, dependOnMethods } = this.generateMethodName({
         network: param.network as INetwork,
         payload: param,
       });
 
-      const method: BaseMethod = findMethod({
-        event: IFRAME.CALL,
-        type: IFRAME.CALL,
-        payload: {
-          connectId: this.payload.connectId,
-          deviceId: this.payload.deviceId,
-          method: methodName,
-          ...params,
-        },
-      });
-
-      method.connector = this.connector;
-      method.postMessage = this.postMessage;
-      method.init();
-      method.setDevice?.(this.device);
-
-      const baseParams = {
-        network: param.network,
-        path: typeof param.path === 'string' ? param.path : serializedPath(param.path),
-        chainName: param.chainName,
-        prefix: param.prefix,
-      };
+      // run depend on methods
+      const dependOnMethodResults: AllNetworkAddress[] = [];
+      for (const dependOnMethod of dependOnMethods ?? []) {
+        const response = await this.callMethod(
+          dependOnMethod.methodName,
+          dependOnMethod.params,
+          param
+        );
+        dependOnMethodResults.push(response);
+      }
 
-      let result: AllNetworkAddress;
-      try {
-        const response = await method.run();
-        result = {
-          ...baseParams,
-          success: true,
-          error: response.error,
-          payload: response,
-        };
-      } catch (e: any) {
-        const errorMessage =
-          e instanceof Error ? handleHardwareError(e, this.device, method) : 'Unknown error';
-
-        result = {
-          ...baseParams,
+      // if any depend on method failed, return the error
+      if (dependOnMethodResults.some(result => !result.success)) {
+        responses.push({
+          ...param,
           success: false,
-          error: errorMessage,
-        };
+          error: dependOnMethodResults.find(result => !result.success)?.error,
+        });
+        return Promise.resolve(responses);
       }
 
+      // call method
+      const response = await this.callMethod(methodName, params, param);
+
+      const dependOnPayloads = dependOnMethodResults.reduce(
+        (acc, cur) => Object.assign(acc, get(cur, 'payload', {})),
+        {}
+      );
+
+      const result: AllNetworkAddress = {
+        ...response,
+        // @ts-expect-error
+        payload: { ...response.payload, ...dependOnPayloads },
+      };
       responses.push(result);
       this.postPreviousAddressMessage(result);
     }

packages/core/src/types/api/allNetworkGetAddress.ts

@@ -30,9 +30,10 @@ export type INetwork =
   | 'nervos'
   | 'scdo'
   | 'ton'
-  | 'alph';
+  | 'alph'
+  | 'nostr';
 
-type CommonResponseParams = {
+export type CommonResponseParams = {
   path: string;
   network: INetwork;
   chainName?: string;
@@ -51,6 +52,9 @@ type AllNetworkAddressPayload =
   | {
       address: string;
       publicKey?: string;
+      pub?: string;
+      // Nostr public key (bech32)
+      npub?: string;
     }
   | {
       // Cardano

packages/hd-ble-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-ble-sdk",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,8 +20,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-shared": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport-react-native": "^1.0.12-alpha.0"
+    "@onekeyfe/hd-core": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-shared": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport-react-native": "^1.0.12-alpha.1"
   }
 }

packages/hd-common-connect-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,10 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-shared": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport-http": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport-lowlevel": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport-webusb": "^1.0.12-alpha.0"
+    "@onekeyfe/hd-core": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-shared": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport-http": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport-lowlevel": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport-webusb": "^1.0.12-alpha.1"
   }
 }

packages/hd-transport-http/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-http",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "description": "hardware http transport",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport": "^1.0.12-alpha.0",
+    "@onekeyfe/hd-shared": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport": "^1.0.12-alpha.1",
     "axios": "^0.27.2"
   }
 }

packages/hd-transport-lowlevel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-lowlevel",
-  "version": "1.0.12-alpha.0",
+  "version": "1.0.12-alpha.1",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.12-alpha.0",
-    "@onekeyfe/hd-transport": "^1.0.12-alpha.0"
+    "@onekeyfe/hd-shared": "^1.0.12-alpha.1",
+    "@onekeyfe/hd-transport": "^1.0.12-alpha.1"
   }
 }