Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/connect-examples/electron-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hardware-example",
"productName": "HardwareExample",
"executableName": "onekey-hardware-example",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"author": "OneKey",
"description": "End-to-end encrypted workspaces for teams",
"main": "dist/index.js",
Expand All @@ -22,7 +22,7 @@
"ts:check": "yarn tsc --noEmit"
},
"dependencies": {
"@onekeyfe/hd-transport-electron": "1.1.17",
"@onekeyfe/hd-transport-electron": "1.1.17-patch.1",
"@stoprocent/noble": "2.3.4",
"debug": "4.3.4",
"electron-is-dev": "^3.0.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/connect-examples/expo-example/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expo-example",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"scripts": {
"start": "cross-env CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
"android": "yarn expo run:android",
Expand All @@ -19,10 +19,10 @@
"@noble/ed25519": "^2.1.0",
"@noble/hashes": "^1.3.3",
"@noble/secp256k1": "^1.7.1",
"@onekeyfe/hd-ble-sdk": "1.1.17",
"@onekeyfe/hd-common-connect-sdk": "1.1.17",
"@onekeyfe/hd-core": "1.1.17",
"@onekeyfe/hd-web-sdk": "1.1.17",
"@onekeyfe/hd-ble-sdk": "1.1.17-patch.1",
"@onekeyfe/hd-common-connect-sdk": "1.1.17-patch.1",
"@onekeyfe/hd-core": "1.1.17-patch.1",
"@onekeyfe/hd-web-sdk": "1.1.17-patch.1",
"@onekeyfe/react-native-ble-utils": "^0.1.3",
"@polkadot/util-crypto": "13.1.1",
"@react-native-async-storage/async-storage": "1.21.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/connect-examples/expo-playground/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "onekey-hardware-playground",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"private": true,
"sideEffects": [
"app/utils/shim.js",
Expand All @@ -17,9 +17,9 @@
},
"dependencies": {
"@noble/hashes": "^1.8.0",
"@onekeyfe/hd-common-connect-sdk": "1.1.17",
"@onekeyfe/hd-core": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-common-connect-sdk": "1.1.17-patch.1",
"@onekeyfe/hd-core": "1.1.17-patch.1",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@radix-ui/react-checkbox": "^1.3.2",
"@radix-ui/react-dialog": "^1.1.14",
"@radix-ui/react-dropdown-menu": "^2.1.15",
Expand Down
12 changes: 5 additions & 7 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-core",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"description": "Core processes and APIs for communicating with OneKey hardware devices.",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -25,8 +25,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1",
"axios": "1.12.2",
"bignumber.js": "^9.0.2",
"bytebuffer": "^5.0.1",
Expand All @@ -35,15 +35,13 @@
"semver": "^7.3.7"
},
"peerDependencies": {
"@noble/hashes": "^1.1.3",
"ripple-keypairs": "^1.3.1"
"@noble/hashes": "^1.1.3"
},
"devDependencies": {
"@noble/hashes": "^1.1.3",
"@types/parse-uri": "^1.0.0",
"@types/semver": "^7.3.9",
"@types/w3c-web-usb": "^1.0.10",
"@types/web-bluetooth": "^0.0.21",
"ripple-keypairs": "^1.3.1"
"@types/web-bluetooth": "^0.0.21"
}
}
19 changes: 0 additions & 19 deletions packages/core/src/api/xrp/XrpGetAddress.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { deriveAddress } from 'ripple-keypairs';
import { UI_REQUEST } from '../../constants/ui-request';
import { XrpAddress, XrpGetAddressParams } from '../../types/api/xrpGetAddress';
import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
import { BaseMethod } from '../BaseMethod';
import { validateParams, validateResult } from '../helpers/paramsValidator';
import { serializedPath, validatePath } from '../helpers/pathUtils';
import { batchGetPublickeys } from '../helpers/batchGetPublickeys';

export default class XrpGetAddress extends BaseMethod<
{
Expand Down Expand Up @@ -57,22 +54,6 @@ export default class XrpGetAddress extends BaseMethod<
}

async run() {
if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) {
const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 144);
const result = res.public_keys.map((publicKey: string, index: number) => ({
path: serializedPath((this.params as unknown as any[])[index].address_n),
address: deriveAddress(publicKey),
publicKey,
pub: publicKey,
}));

validateResult(result, ['address', 'publicKey'], {
expectedLength: this.params.length,
});

return Promise.resolve(result);
}

const responses: XrpAddress[] = [];
for (let i = 0; i < this.params.length; i++) {
const param = this.params[i];
Expand Down
8 changes: 4 additions & 4 deletions packages/hd-ble-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-ble-sdk",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -20,8 +20,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport-react-native": "1.1.17"
"@onekeyfe/hd-core": "1.1.17-patch.1",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport-react-native": "1.1.17-patch.1"
}
}
14 changes: 7 additions & 7 deletions packages/hd-common-connect-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-common-connect-sdk",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -20,11 +20,11 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport-emulator": "1.1.17",
"@onekeyfe/hd-transport-http": "1.1.17",
"@onekeyfe/hd-transport-lowlevel": "1.1.17",
"@onekeyfe/hd-transport-web-device": "1.1.17"
"@onekeyfe/hd-core": "1.1.17-patch.1",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport-emulator": "1.1.17-patch.1",
"@onekeyfe/hd-transport-http": "1.1.17-patch.1",
"@onekeyfe/hd-transport-lowlevel": "1.1.17-patch.1",
"@onekeyfe/hd-transport-web-device": "1.1.17-patch.1"
}
}
8 changes: 4 additions & 4 deletions packages/hd-transport-electron/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-electron",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
Expand All @@ -25,9 +25,9 @@
"electron-log": ">=4.0.0"
},
"dependencies": {
"@onekeyfe/hd-core": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17",
"@onekeyfe/hd-core": "1.1.17-patch.1",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1",
"@stoprocent/noble": "2.3.4",
"p-retry": "^4.6.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-emulator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-emulator",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"description": "hardware emulator transport",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -24,8 +24,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1",
"axios": "1.12.2",
"secure-json-parse": "^4.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-http/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-http",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"description": "hardware http transport",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -24,8 +24,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1",
"axios": "1.12.2",
"secure-json-parse": "^4.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-lowlevel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-lowlevel",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -19,7 +19,7 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17"
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1"
}
}
6 changes: 3 additions & 3 deletions packages/hd-transport-react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-react-native",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1",
"@onekeyfe/react-native-ble-utils": "^0.1.4",
"react-native-ble-plx": "3.5.0"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/hd-transport-web-device/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-web-device",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
Expand All @@ -20,11 +20,11 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport": "1.1.17"
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport": "1.1.17-patch.1"
},
"devDependencies": {
"@onekeyfe/hd-transport-electron": "1.1.17",
"@onekeyfe/hd-transport-electron": "1.1.17-patch.1",
"@types/w3c-web-usb": "^1.0.6",
"@types/web-bluetooth": "^0.0.17"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/hd-transport/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand Down
12 changes: 6 additions & 6 deletions packages/hd-web-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@onekeyfe/hd-web-sdk",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
"type": "commonjs",
"main": "build/onekey-js-sdk.js",
"main": "build/onekey-js-sdk.min.js",
"types": "dist/index.d.ts",
"publishConfig": {
"access": "public"
Expand All @@ -21,10 +21,10 @@
},
"dependencies": {
"@onekeyfe/cross-inpage-provider-core": "^0.0.17",
"@onekeyfe/hd-core": "1.1.17",
"@onekeyfe/hd-shared": "1.1.17",
"@onekeyfe/hd-transport-http": "1.1.17",
"@onekeyfe/hd-transport-web-device": "1.1.17"
"@onekeyfe/hd-core": "1.1.17-patch.1",
"@onekeyfe/hd-shared": "1.1.17-patch.1",
"@onekeyfe/hd-transport-http": "1.1.17-patch.1",
"@onekeyfe/hd-transport-web-device": "1.1.17-patch.1"
},
"devDependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-shared",
"version": "1.1.17",
"version": "1.1.17-patch.1",
"description": "Hardware SDK's shared tool library",
"keywords": [
"Hardware-SDK",
Expand Down
26 changes: 0 additions & 26 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10164,13 +10164,6 @@ base-x@^3.0.2:
dependencies:
safe-buffer "^5.0.1"

base-x@^3.0.9:
version "3.0.11"
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.11.tgz#40d80e2a1aeacba29792ccc6c5354806421287ff"
integrity sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA==
dependencies:
safe-buffer "^5.0.1"

base64-js@*, base64-js@^1.2.3, base64-js@^1.3.0, base64-js@^1.3.1, base64-js@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
Expand Down Expand Up @@ -22614,14 +22607,6 @@ ripple-address-codec@^4.2.4:
base-x "3.0.9"
create-hash "^1.1.2"

ripple-address-codec@^4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/ripple-address-codec/-/ripple-address-codec-4.3.1.tgz#68fbaf646bb8567f70743af7f1ce4479f73efbf6"
integrity sha512-Qa3+9wKVvpL/xYtT6+wANsn0A1QcC5CT6IMZbRJZ/1lGt7gmwIfsrCuz1X0+LCEO7zgb+3UT1I1dc0k/5dwKQQ==
dependencies:
base-x "^3.0.9"
create-hash "^1.1.2"

ripple-address-codec@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/ripple-address-codec/-/ripple-address-codec-5.0.0.tgz#97059f7bba6f9ed7a52843de8aa427723fb529f6"
Expand Down Expand Up @@ -22650,17 +22635,6 @@ ripple-keypairs@^1.1.4:
hash.js "^1.0.3"
ripple-address-codec "^4.2.4"

ripple-keypairs@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/ripple-keypairs/-/ripple-keypairs-1.3.1.tgz#7fa531df36b138134afb53555a87d7f5eb465b2e"
integrity sha512-dmPlraWKJciFJxHcoubDahGnoIalG5e/BtV6HNDUs7wLXmtnLMHt6w4ed9R8MTL2zNrVPiIdI/HCtMMo0Tm7JQ==
dependencies:
bn.js "^5.1.1"
brorand "^1.0.5"
elliptic "^6.5.4"
hash.js "^1.0.3"
ripple-address-codec "^4.3.1"

ripple-keypairs@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ripple-keypairs/-/ripple-keypairs-2.0.0.tgz#4a1a8142e9a58c07e61b3cc6cfe7317db718d289"
Expand Down
Loading