@onekeyfe/hd-core 1.0.12-alpha.0 → 1.0.12-alpha.1

package/dist/api/allnetwork/AllNetworkGetAddress.d.ts

@@ -1,6 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
 import { CoreApi } from '../../types';
-import type { AllNetworkAddress, AllNetworkAddressParams, INetwork } from '../../types/api/allNetworkGetAddress';
+import type { AllNetworkAddress, AllNetworkAddressParams, CommonResponseParams, INetwork } from '../../types/api/allNetworkGetAddress';
 export default class AllNetworkGetAddress extends BaseMethod<{
     address_n: number[];
     show_display: boolean;
@@ -13,8 +13,15 @@ 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;
     };
+    callMethod(methodName: keyof CoreApi, params: any, baseParams: CommonResponseParams): Promise<AllNetworkAddress>;
     run(): Promise<AllNetworkAddress[]>;
 }
 //# sourceMappingURL=AllNetworkGetAddress.d.ts.map

package/dist/api/allnetwork/AllNetworkGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AllNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddress.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAuM9C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAC1D;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,GACR,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;KAClC,GAAG;QACF,UAAU,EAAE,MAAM,OAAO,CAAC;QAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAC/C;IAgBK,GAAG;CA0DV"}
+{"version":3,"file":"AllNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddress.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AA4N9C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAC1D;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,GACR,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;KAClC,GAAG;QACF,UAAU,EAAE,MAAM,OAAO,CAAC;QAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;YAAE,aAAa,EAAE,uBAAuB,CAAA;SAAE,CAAC;QAC3F,eAAe,EACX;YACE,UAAU,EAAE,MAAM,OAAO,CAAC;YAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/C,EAAE,GACH,SAAS,CAAC;KACf;IAyBK,UAAU,CAAC,UAAU,EAAE,MAAM,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,oBAAoB;IAwCnF,GAAG;CAiDV"}

package/dist/index.d.ts

@@ -655,7 +655,7 @@ interface CardanoSignedTxData {
     auxiliaryDataSupplement?: CardanoAuxiliaryDataSupplement;
 }
 
-type INetwork = 'evm' | 'btc' | 'tbtc' | 'doge' | 'neurai' | 'ltc' | 'bch' | 'sol' | 'algo' | 'near' | 'stc' | 'cfx' | 'tron' | 'aptos' | 'xrp' | 'cosmos' | 'ada' | 'sui' | 'fil' | 'dot' | 'kaspa' | 'nexa' | 'dynex' | 'nervos';
+type INetwork = 'evm' | 'btc' | 'tbtc' | 'doge' | 'neurai' | 'ltc' | 'bch' | 'sol' | 'algo' | 'near' | 'stc' | 'cfx' | 'tron' | 'aptos' | 'xrp' | 'cosmos' | 'ada' | 'sui' | 'fil' | 'dot' | 'kaspa' | 'nexa' | 'dynex' | 'nervos' | 'scdo' | 'ton' | 'alph' | 'nostr';
 type CommonResponseParams = {
     path: string;
     network: INetwork;
@@ -672,6 +672,8 @@ type AllNetworkAddressParams = {
 type AllNetworkAddressPayload = {
     address: string;
     publicKey?: string;
+    pub?: string;
+    npub?: string;
 } | {
     addressParameters: CardanoAddressParameters;
     protocolMagic: number;

package/dist/index.js

@@ -28062,7 +28062,7 @@ const networkConfigMap = {
         methodName: 'xrpGetAddress',
     },
     cosmos: {
-        methodName: 'cosmosGetAddress',
+        methodName: 'cosmosGetPublicKey',
         getParams: (baseParams) => {
             const { path, prefix, showOnOneKey } = baseParams;
             return {
@@ -28099,6 +28099,14 @@ const networkConfigMap = {
     },
     sui: {
         methodName: 'suiGetAddress',
+        dependOnMethodName: ['suiGetPublicKey'],
+        getParams: (baseParams) => {
+            const { path, showOnOneKey } = baseParams;
+            return {
+                path,
+                showOnOneKey,
+            };
+        },
     },
     fil: {
         methodName: 'filecoinGetAddress',
@@ -28168,6 +28176,18 @@ const networkConfigMap = {
             };
         },
     },
+    scdo: {
+        methodName: 'scdoGetAddress',
+    },
+    ton: {
+        methodName: 'tonGetAddress',
+    },
+    alph: {
+        methodName: 'alephiumGetAddress',
+    },
+    nostr: {
+        methodName: 'nostrGetPublicKey',
+    },
 };
 class AllNetworkGetAddress extends BaseMethod {
     init() {
@@ -28184,7 +28204,7 @@ class AllNetworkGetAddress extends BaseMethod {
         });
     }
     generateMethodName({ network, payload, }) {
-        var _a, _b;
+        var _a, _b, _c;
         const { name: networkName, coin } = networkAliases[network] || {
             name: network,
             coin: payload === null || payload === void 0 ? void 0 : payload.chainName,
@@ -28193,45 +28213,65 @@ class AllNetworkGetAddress extends BaseMethod {
         if (!config) {
             throw new Error(`Unsupported network: ${network}`);
         }
+        const dependOnMethods = (_a = config.dependOnMethodName) === null || _a === void 0 ? void 0 : _a.map(dependOnMethodName => {
+            var _a;
+            return ({
+                methodName: dependOnMethodName,
+                params: (_a = config === null || config === void 0 ? void 0 : config.getParams) === null || _a === void 0 ? void 0 : _a.call(config, payload, coin, dependOnMethodName),
+            });
+        });
         return {
             methodName: config.methodName,
-            params: (_b = (_a = config === null || config === void 0 ? void 0 : config.getParams) === null || _a === void 0 ? void 0 : _a.call(config, payload, coin)) !== null && _b !== void 0 ? _b : payload,
+            params: Object.assign(Object.assign({}, ((_c = (_b = config === null || config === void 0 ? void 0 : config.getParams) === null || _b === void 0 ? void 0 : _b.call(config, payload, coin, config.methodName)) !== null && _c !== void 0 ? _c : payload)), { originPayload: payload }),
+            dependOnMethods,
         };
     }
+    callMethod(methodName, params, baseParams) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const method = findMethod({
+                event: IFRAME.CALL,
+                type: IFRAME.CALL,
+                payload: Object.assign({ connectId: this.payload.connectId, deviceId: this.payload.deviceId, method: methodName }, params),
+            });
+            method.connector = this.connector;
+            method.postMessage = this.postMessage;
+            method.init();
+            (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
+            let result;
+            try {
+                const response = yield method.run();
+                result = Object.assign(Object.assign({}, baseParams), { success: true, error: response.error, payload: response });
+            }
+            catch (e) {
+                const errorMessage = e instanceof Error ? handleHardwareError(e, this.device, method) : 'Unknown error';
+                result = Object.assign(Object.assign({}, baseParams), { success: false, error: errorMessage });
+            }
+            return result;
+        });
+    }
     run() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
             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,
                     payload: param,
                 });
-                const method = findMethod({
-                    event: IFRAME.CALL,
-                    type: IFRAME.CALL,
-                    payload: Object.assign({ connectId: this.payload.connectId, deviceId: this.payload.deviceId, method: methodName }, params),
-                });
-                method.connector = this.connector;
-                method.postMessage = this.postMessage;
-                method.init();
-                (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
-                const baseParams = {
-                    network: param.network,
-                    path: typeof param.path === 'string' ? param.path : serializedPath(param.path),
-                    chainName: param.chainName,
-                    prefix: param.prefix,
-                };
-                let result;
-                try {
-                    const response = yield method.run();
-                    result = Object.assign(Object.assign({}, baseParams), { success: true, error: response.error, payload: response });
+                const dependOnMethodResults = [];
+                for (const dependOnMethod of dependOnMethods !== null && dependOnMethods !== void 0 ? dependOnMethods : []) {
+                    const response = yield this.callMethod(dependOnMethod.methodName, dependOnMethod.params, param);
+                    dependOnMethodResults.push(response);
                 }
-                catch (e) {
-                    const errorMessage = e instanceof Error ? handleHardwareError(e, this.device, method) : 'Unknown error';
-                    result = Object.assign(Object.assign({}, baseParams), { success: false, error: errorMessage });
+                if (dependOnMethodResults.some(result => !result.success)) {
+                    responses.push(Object.assign(Object.assign({}, param), { success: false, error: (_a = dependOnMethodResults.find(result => !result.success)) === null || _a === void 0 ? void 0 : _a.error }));
+                    return Promise.resolve(responses);
                 }
+                const response = yield this.callMethod(methodName, params, param);
+                const dependOnPayloads = dependOnMethodResults.reduce((acc, cur) => Object.assign(acc, lodash.get(cur, 'payload', {})), {});
+                const result = Object.assign(Object.assign({}, response), { payload: Object.assign(Object.assign({}, response.payload), dependOnPayloads) });
                 responses.push(result);
                 this.postPreviousAddressMessage(result);
             }

package/dist/types/api/allNetworkGetAddress.d.ts

@@ -1,7 +1,7 @@
 import type { CommonParams, Response } from '../params';
 import type { CardanoAddressParameters } from './cardano';
-export type INetwork = 'evm' | 'btc' | 'tbtc' | 'doge' | 'neurai' | 'ltc' | 'bch' | 'sol' | 'algo' | 'near' | 'stc' | 'cfx' | 'tron' | 'aptos' | 'xrp' | 'cosmos' | 'ada' | 'sui' | 'fil' | 'dot' | 'kaspa' | 'nexa' | 'dynex' | 'nervos';
-type CommonResponseParams = {
+export type INetwork = 'evm' | 'btc' | 'tbtc' | 'doge' | 'neurai' | 'ltc' | 'bch' | 'sol' | 'algo' | 'near' | 'stc' | 'cfx' | 'tron' | 'aptos' | 'xrp' | 'cosmos' | 'ada' | 'sui' | 'fil' | 'dot' | 'kaspa' | 'nexa' | 'dynex' | 'nervos' | 'scdo' | 'ton' | 'alph' | 'nostr';
+export type CommonResponseParams = {
     path: string;
     network: INetwork;
     chainName?: string;
@@ -17,6 +17,8 @@ export type AllNetworkAddressParams = {
 type AllNetworkAddressPayload = {
     address: string;
     publicKey?: string;
+    pub?: string;
+    npub?: string;
 } | {
     addressParameters: CardanoAddressParameters;
     protocolMagic: number;

package/dist/types/api/allNetworkGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/allNetworkGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,KAAK,GACL,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,CAAC;AAEb,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,wBAAwB,GACzB;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GACD;IAEE,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAEE,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC"}
+{"version":3,"file":"allNetworkGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/allNetworkGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,MAAM,MAAM,QAAQ,GAChB,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,QAAQ,GACR,KAAK,GACL,KAAK,GAEL,KAAK,GACL,MAAM,GACN,MAAM,GACN,KAAK,GACL,KAAK,GACL,MAAM,GACN,OAAO,GACP,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,OAAO,GACP,QAAQ,GACR,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,CAAC;AAEZ,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,KAAK,wBAAwB,GACzB;IACE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACD;IAEE,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAEE,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG;IACrD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,uBAAuB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC"}

package/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",
@@ -44,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "4707d9ff824c0201684bb67b1053d907dabcd7e0"
+  "gitHead": "dedf68e03978e46ef921e1d71fd06fc323dfab26"
 }

package/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',
@@ -207,6 +218,18 @@ const networkConfigMap: NetworkConfigMap = {
       };
     },
   },
+  scdo: {
+    methodName: 'scdoGetAddress',
+  },
+  ton: {
+    methodName: 'tonGetAddress',
+  },
+  alph: {
+    methodName: 'alephiumGetAddress',
+  },
+  nostr: {
+    methodName: 'nostrGetPublicKey',
+  },
 };
 
 export default class AllNetworkGetAddress extends BaseMethod<
@@ -243,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,
@@ -254,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);
     }

package/src/types/api/allNetworkGetAddress.ts

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