@onekeyfe/hd-core 1.0.33-alpha.6 → 1.0.33-alpha.8

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

@@ -5,6 +5,7 @@ type MethodParams = {
     methodName: keyof CoreApi;
     params: Parameters<CoreApi[keyof CoreApi]>[0];
     _originRequestParams: AllNetworkAddressParams;
+    _originalIndex: number;
 };
 export default class AllNetworkGetAddress extends BaseMethod<{
     address_n: number[];
@@ -13,9 +14,10 @@ export default class AllNetworkGetAddress extends BaseMethod<{
     chain_name?: string;
 }[]> {
     init(): void;
-    generateMethodName({ network, payload, }: {
+    generateMethodName({ network, payload, originalIndex, }: {
         network: INetwork;
         payload: AllNetworkAddressParams;
+        originalIndex: number;
     }): MethodParams;
     callMethod(methodName: keyof CoreApi, params: any & {
         bundle: (any & {

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,EAEvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AA4N9C,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;CAC/C,CAAC;AAEF,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,YAAY;IAoBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IAyDG,GAAG;CA2DV"}
+{"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,EAEvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AA4N9C,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,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,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IAyDG,GAAG;CAqDV"}

package/dist/index.js

@@ -7376,7 +7376,7 @@ var nested$1 = {
 				type: "bool",
 				id: 3
 			},
-			btc_test: {
+			passphrase_state: {
 				type: "string",
 				id: 8000
 			}
@@ -7759,6 +7759,14 @@ var nested$1 = {
 			onekey_se04_state: {
 				type: "OneKeySEState",
 				id: 624
+			},
+			attach_to_pin_user: {
+				type: "bool",
+				id: 625
+			},
+			unlocked_attach_pin: {
+				type: "bool",
+				id: 626
 			}
 		},
 		nested: {
@@ -29923,7 +29931,7 @@ class AllNetworkGetAddress extends BaseMethod {
             ]);
         });
     }
-    generateMethodName({ network, payload, }) {
+    generateMethodName({ network, payload, originalIndex, }) {
         var _a, _b;
         const { name: networkName, coin } = networkAliases[network] || {
             name: network,
@@ -29937,6 +29945,7 @@ class AllNetworkGetAddress extends BaseMethod {
             methodName: config.methodName,
             params: Object.assign(Object.assign({}, ((_b = (_a = config === null || config === void 0 ? void 0 : config.getParams) === null || _a === void 0 ? void 0 : _a.call(config, payload, coin, config.methodName)) !== null && _b !== void 0 ? _b : payload)), { originPayload: payload }),
             _originRequestParams: payload,
+            _originalIndex: originalIndex,
         };
     }
     callMethod(methodName, params) {
@@ -29984,10 +29993,11 @@ class AllNetworkGetAddress extends BaseMethod {
             const responses = [];
             const resultMap = {};
             const { bundle } = this.payload;
-            const methodReduceParams = bundle
-                .map(param => this.generateMethodName({
+            const methodGroups = bundle
+                .map((param, index) => this.generateMethodName({
                 network: param.network,
                 payload: param,
+                originalIndex: index,
             }))
                 .reduce((acc, cur) => {
                 if (!acc[cur.methodName]) {
@@ -29996,28 +30006,25 @@ class AllNetworkGetAddress extends BaseMethod {
                 acc[cur.methodName].push(cur);
                 return acc;
             }, {});
-            const methodParamsArray = Object.values(methodReduceParams);
-            const generateResponseKey = (payload) => `${payload.path}-${payload.network}-${payload.chainName}-${payload.prefix}`;
-            for (let i = 0; i < methodParamsArray.length; i++) {
-                const methodParams = methodParamsArray[i];
-                const { methodName } = methodParams[0];
-                const params = {
-                    bundle: methodParams.map(param => (Object.assign({}, param.params))),
+            let i = 0;
+            for (const [methodName, params] of Object.entries(methodGroups)) {
+                const methodParams = {
+                    bundle: params.map(param => (Object.assign({}, param.params))),
                 };
-                const response = yield this.callMethod(methodName, params);
-                for (let i = 0; i < methodParams.length; i++) {
-                    const { _originRequestParams } = methodParams[i];
-                    const responseKey = generateResponseKey(_originRequestParams);
+                const response = yield this.callMethod(methodName, methodParams);
+                for (let i = 0; i < params.length; i++) {
+                    const { _originRequestParams, _originalIndex } = params[i];
+                    const responseKey = `${_originalIndex}`;
                     resultMap[responseKey] = Object.assign(Object.assign({}, _originRequestParams), response[i]);
                 }
                 if (((_b = (_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle) === null || _b === void 0 ? void 0 : _b.length) > 1) {
                     const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
                     this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
                 }
+                i++;
             }
-            for (const param of bundle) {
-                const responseKey = generateResponseKey(param);
-                responses.push(resultMap[responseKey]);
+            for (let i = 0; i < bundle.length; i++) {
+                responses.push(resultMap[i]);
             }
             return Promise.resolve(responses);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.33-alpha.6",
+  "version": "1.0.33-alpha.8",
   "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.33-alpha.6",
-    "@onekeyfe/hd-transport": "^1.0.33-alpha.6",
+    "@onekeyfe/hd-shared": "^1.0.33-alpha.8",
+    "@onekeyfe/hd-transport": "^1.0.33-alpha.8",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "b38e4e40565deb11573fe69ff9090729699227de"
+  "gitHead": "9aff42556c0777138dae0bf6bafcba615b18d05a"
 }

package/src/api/allnetwork/AllNetworkGetAddress.ts

@@ -236,6 +236,7 @@ type MethodParams = {
   methodName: keyof CoreApi;
   params: Parameters<CoreApi[keyof CoreApi]>[0];
   _originRequestParams: AllNetworkAddressParams;
+  _originalIndex: number;
 };
 
 export default class AllNetworkGetAddress extends BaseMethod<
@@ -267,9 +268,11 @@ export default class AllNetworkGetAddress extends BaseMethod<
   generateMethodName({
     network,
     payload,
+    originalIndex,
   }: {
     network: INetwork;
     payload: AllNetworkAddressParams;
+    originalIndex: number;
   }): MethodParams {
     const { name: networkName, coin } = networkAliases[network] || {
       name: network,
@@ -287,6 +290,7 @@ export default class AllNetworkGetAddress extends BaseMethod<
         originPayload: payload,
       },
       _originRequestParams: payload,
+      _originalIndex: originalIndex,
     };
   }
 
@@ -355,11 +359,12 @@ export default class AllNetworkGetAddress extends BaseMethod<
     const responses: AllNetworkAddress[] = [];
     const resultMap: Record<string, AllNetworkAddress> = {};
     const { bundle } = this.payload as AllNetworkGetAddressParams;
-    const methodReduceParams = bundle
-      .map(param =>
+    const methodGroups = bundle
+      .map((param, index) =>
         this.generateMethodName({
           network: param.network,
           payload: param,
+          originalIndex: index,
         })
       )
       .reduce((acc, cur) => {
@@ -370,27 +375,20 @@ export default class AllNetworkGetAddress extends BaseMethod<
         return acc;
       }, {} as Record<keyof CoreApi, MethodParams[]>);
 
-    const methodParamsArray = Object.values(methodReduceParams);
-
-    const generateResponseKey = (payload: CommonResponseParams) =>
-      `${payload.path}-${payload.network}-${payload.chainName}-${payload.prefix}`;
-
-    for (let i = 0; i < methodParamsArray.length; i++) {
-      const methodParams = methodParamsArray[i];
-      const { methodName } = methodParams[0];
-
-      const params = {
-        bundle: methodParams.map(param => ({
+    let i = 0;
+    for (const [methodName, params] of Object.entries(methodGroups)) {
+      const methodParams = {
+        bundle: params.map(param => ({
           ...param.params,
         })),
       };
 
       // call method
-      const response = await this.callMethod(methodName, params);
+      const response = await this.callMethod(methodName as keyof CoreApi, methodParams);
 
-      for (let i = 0; i < methodParams.length; i++) {
-        const { _originRequestParams } = methodParams[i];
-        const responseKey = generateResponseKey(_originRequestParams);
+      for (let i = 0; i < params.length; i++) {
+        const { _originRequestParams, _originalIndex } = params[i];
+        const responseKey = `${_originalIndex}`;
         resultMap[responseKey] = {
           ..._originRequestParams,
           ...response[i],
@@ -401,11 +399,11 @@ export default class AllNetworkGetAddress extends BaseMethod<
         const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
         this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
       }
+      i++;
     }
 
-    for (const param of bundle) {
-      const responseKey = generateResponseKey(param);
-      responses.push(resultMap[responseKey]);
+    for (let i = 0; i < bundle.length; i++) {
+      responses.push(resultMap[i]);
     }
 
     return Promise.resolve(responses);

package/src/data/messages/messages.json

@@ -6061,7 +6061,7 @@
           "type": "bool",
           "id": 3
         },
-        "btc_test": {
+        "passphrase_state": {
           "type": "string",
           "id": 8000
         }
@@ -6442,6 +6442,14 @@
         "onekey_se04_state": {
           "type": "OneKeySEState",
           "id": 624
+        },
+        "attach_to_pin_user": {
+          "type": "bool",
+          "id": 625
+        },
+        "unlocked_attach_pin": {
+          "type": "bool",
+          "id": 626
         }
       },
       "nested": {