@onekeyfe/hd-core 0.2.3 → 0.2.5

package/dist/api/xrp/XrpGetAddress.d.ts

@@ -1,3 +1,4 @@
+import { XrpAddress } from '../../types/api/xrpGetAddress';
 import { BaseMethod } from '../BaseMethod';
 export default class XrpGetAddress extends BaseMethod<{
     address_n: number[];
@@ -10,10 +11,6 @@ export default class XrpGetAddress extends BaseMethod<{
             min: string;
         };
     };
-    run(): Promise<{
-        path: string;
-        publicKey: string;
-        address: string;
-    }[]>;
+    run(): Promise<XrpAddress | XrpAddress[]>;
 }
 //# sourceMappingURL=XrpGetAddress.d.ts.map

package/dist/api/xrp/XrpGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/xrp/XrpGetAddress.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CACnD;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,EAAE,CACJ;IACC,SAAS,UAAS;IAElB,IAAI;IA2BJ,eAAe;;;;;IAQT,GAAG;;;;;CAaV"}
+{"version":3,"file":"XrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/xrp/XrpGetAddress.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAuB,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CACnD;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,EAAE,CACJ;IACC,SAAS,UAAS;IAElB,IAAI;IA2BJ,eAAe;;;;;IAQT,GAAG;CAyCV"}

package/dist/index.d.ts

@@ -1144,14 +1144,14 @@ declare function cosmosSignTransaction(connectId: string, deviceId: string, para
 
 declare type XrpAddress = {
     path: string;
-    publicKey: string;
+    publicKey?: string;
     address: string;
 };
 declare type XrpGetAddressParams = {
     path: string | number[];
     showOnOneKey?: boolean;
 };
-declare function xrpGetAddress(connectId: string, deviceId: string, params: CommonParams & XrpGetAddressParams): Response<XrpAddress[]>;
+declare function xrpGetAddress(connectId: string, deviceId: string, params: CommonParams & XrpGetAddressParams): Response<XrpAddress>;
 declare function xrpGetAddress(connectId: string, deviceId: string, params: CommonParams & {
     bundle?: XrpGetAddressParams[];
 }): Response<XrpAddress[]>;

package/dist/index.js

@@ -16078,17 +16078,36 @@ class XrpGetAddress$1 extends BaseMethod {
         };
     }
     run() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-                paths: this.params,
-                ecdsa_curve_name: 'secp256k1',
-            });
-            const responses = res.message.public_keys.map((publicKey, index) => ({
-                path: serializedPath(this.params[index].address_n),
-                publicKey,
-                address: rippleKeypairs.deriveAddress(publicKey),
-            }));
-            return responses;
+            if (this.hasBundle && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
+                const res = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+                    paths: this.params,
+                    ecdsa_curve_name: 'secp256k1',
+                });
+                const result = res.message.public_keys.map((publicKey, index) => ({
+                    path: serializedPath(this.params[index].address_n),
+                    publicKey,
+                    address: rippleKeypairs.deriveAddress(publicKey),
+                }));
+                return Promise.resolve(result);
+            }
+            const responses = [];
+            for (let i = 0; i < this.params.length; i++) {
+                const param = this.params[i];
+                const res = yield this.device.commands.typedCall('RippleGetAddress', 'RippleAddress', Object.assign({}, param));
+                const publicKey = yield this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+                    paths: [{ address_n: param.address_n }],
+                    ecdsa_curve_name: 'secp256k1',
+                });
+                const { address } = res.message;
+                responses.push({
+                    path: serializedPath(param.address_n),
+                    address,
+                    publicKey: (_c = (_b = publicKey.message) === null || _b === void 0 ? void 0 : _b.public_keys) === null || _c === void 0 ? void 0 : _c[0],
+                });
+            }
+            return Promise.resolve(this.hasBundle ? responses : responses[0]);
         });
     }
 }

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

@@ -1,14 +1,14 @@
 import type { CommonParams, Response } from '../params';
 export declare type XrpAddress = {
     path: string;
-    publicKey: string;
+    publicKey?: string;
     address: string;
 };
 export declare type XrpGetAddressParams = {
     path: string | number[];
     showOnOneKey?: boolean;
 };
-export declare function xrpGetAddress(connectId: string, deviceId: string, params: CommonParams & XrpGetAddressParams): Response<XrpAddress[]>;
+export declare function xrpGetAddress(connectId: string, deviceId: string, params: CommonParams & XrpGetAddressParams): Response<XrpAddress>;
 export declare function xrpGetAddress(connectId: string, deviceId: string, params: CommonParams & {
     bundle?: XrpGetAddressParams[];
 }): Response<XrpAddress[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"xrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/xrpGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC"}
+{"version":3,"file":"xrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/xrpGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,mBAAmB,GACzC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GACxD,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "> TODO: description",
   "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": "^0.2.3",
-    "@onekeyfe/hd-transport": "^0.2.3",
+    "@onekeyfe/hd-shared": "^0.2.5",
+    "@onekeyfe/hd-transport": "^0.2.5",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "jszip": "^3.10.1",
@@ -42,5 +42,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "041446f8614f0c9437600e858a2c49e4bc6815dc"
+  "gitHead": "05ae2785be37f8d157de5f386010caa2f58335c3"
 }

package/src/api/xrp/XrpGetAddress.ts

@@ -1,6 +1,7 @@
 import { deriveAddress } from 'ripple-keypairs';
 import { UI_REQUEST } from '../../constants/ui-request';
-import { XrpGetAddressParams } from '../../types/api/xrpGetAddress';
+import { XrpAddress, XrpGetAddressParams } from '../../types/api/xrpGetAddress';
+import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
@@ -49,16 +50,44 @@ export default class XrpGetAddress extends BaseMethod<
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-      paths: this.params,
-      ecdsa_curve_name: 'secp256k1',
-    });
-    const responses = res.message.public_keys.map((publicKey: string, index: number) => ({
-      path: serializedPath((this.params as unknown as any[])[index].address_n),
-      publicKey,
-      address: deriveAddress(publicKey),
-    }));
+    if (this.hasBundle && supportBatchPublicKey(this.device?.features)) {
+      const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
+        paths: this.params,
+        ecdsa_curve_name: 'secp256k1',
+      });
+      const result = res.message.public_keys.map((publicKey: string, index: number) => ({
+        path: serializedPath((this.params as unknown as any[])[index].address_n),
+        publicKey,
+        address: deriveAddress(publicKey),
+      }));
+      return Promise.resolve(result);
+    }
+
+    const responses: XrpAddress[] = [];
+    for (let i = 0; i < this.params.length; i++) {
+      const param = this.params[i];
+
+      const res = await this.device.commands.typedCall('RippleGetAddress', 'RippleAddress', {
+        ...param,
+      });
+      const publicKey = await this.device.commands.typedCall(
+        'BatchGetPublickeys',
+        'EcdsaPublicKeys',
+        {
+          paths: [{ address_n: param.address_n }],
+          ecdsa_curve_name: 'secp256k1',
+        }
+      );
+
+      const { address } = res.message;
+
+      responses.push({
+        path: serializedPath(param.address_n),
+        address,
+        publicKey: publicKey.message?.public_keys?.[0],
+      });
+    }
 
-    return responses;
+    return Promise.resolve(this.hasBundle ? responses : responses[0]);
   }
 }

package/src/types/api/xrpGetAddress.ts

@@ -2,7 +2,7 @@ import type { CommonParams, Response } from '../params';
 
 export type XrpAddress = {
   path: string;
-  publicKey: string;
+  publicKey?: string;
   address: string;
 };
 
@@ -15,7 +15,7 @@ export declare function xrpGetAddress(
   connectId: string,
   deviceId: string,
   params: CommonParams & XrpGetAddressParams
-): Response<XrpAddress[]>;
+): Response<XrpAddress>;
 
 export declare function xrpGetAddress(
   connectId: string,