Skip to content

Commit 7b0cba7

Browse files
ByteZhang1024ByteZhang1024
authored
Fix/evm batch pubkey (#456)
* fix: evm inject * fix: evm batch pubkey
1 parent 941f559 commit 7b0cba7

File tree

14 files changed

+43
-41
lines changed

14 files changed

+43
-41
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hardware-example",
33
"productName": "HardwareExample",
44
"executableName": "onekey-hardware-example",
5-
"version": "1.0.26-alpha.1",
5+
"version": "1.0.26-alpha.2",
66
"author": "OneKey",
77
"description": "End-to-end encrypted workspaces for teams",
88
"main": "dist/index.js",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-example",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"scripts": {
55
"start": "CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
66
"android": "yarn expo run:android",
@@ -19,10 +19,10 @@
1919
"@noble/ed25519": "^2.1.0",
2020
"@noble/hashes": "^1.3.3",
2121
"@noble/secp256k1": "^1.7.1",
22-
"@onekeyfe/hd-ble-sdk": "^1.0.26-alpha.1",
23-
"@onekeyfe/hd-common-connect-sdk": "^1.0.26-alpha.1",
24-
"@onekeyfe/hd-core": "^1.0.26-alpha.1",
25-
"@onekeyfe/hd-web-sdk": "^1.0.26-alpha.1",
22+
"@onekeyfe/hd-ble-sdk": "^1.0.26-alpha.2",
23+
"@onekeyfe/hd-common-connect-sdk": "^1.0.26-alpha.2",
24+
"@onekeyfe/hd-core": "^1.0.26-alpha.2",
25+
"@onekeyfe/hd-web-sdk": "^1.0.26-alpha.2",
2626
"@onekeyfe/react-native-ble-utils": "^0.1.3",
2727
"@polkadot/util-crypto": "13.1.1",
2828
"@react-native-async-storage/async-storage": "1.21.0",

‎packages/core/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-core",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"description": "> TODO: description",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
2525
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2626
},
2727
"dependencies": {
28-
"@onekeyfe/hd-shared": "^1.0.26-alpha.1",
29-
"@onekeyfe/hd-transport": "^1.0.26-alpha.1",
28+
"@onekeyfe/hd-shared": "^1.0.26-alpha.2",
29+
"@onekeyfe/hd-transport": "^1.0.26-alpha.2",
3030
"axios": "^0.27.2",
3131
"bignumber.js": "^9.0.2",
3232
"bytebuffer": "^5.0.1",

‎packages/core/src/api/evm/EVMGetPublicKey.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
1919
this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
2020

2121
this.hasBundle = !!this.payload?.bundle;
22-
this.useBatch = !!this.payload?.useBatch;
22+
this.useBatch = this.payload?.bundle?.every(
23+
(item: EVMGetPublicKeyParams) => item.showOnOneKey !== true
24+
);
2325
const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
2426

2527
// check payload
@@ -74,7 +76,7 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
7476
publicKey,
7577
}));
7678

77-
validateResult(responses, ['pub'], {
79+
validateResult(result, ['pub'], {
7880
expectedLength: this.params.length,
7981
});
8082
return Promise.resolve(result);

‎packages/core/src/types/api/evmGetPublicKey.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ export declare function evmGetPublicKey(
3131
export declare function evmGetPublicKey(
3232
connectId: string,
3333
deviceId: string,
34-
params: CommonParams & { bundle?: EVMGetPublicKeyParams[]; useBatch?: boolean }
34+
params: CommonParams & { bundle?: EVMGetPublicKeyParams[] }
3535
): Response<Omit<EVMPublicKey, 'node' | 'xpub'>>;

‎packages/hd-ble-sdk/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-ble-sdk",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,8 +20,8 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "^1.0.26-alpha.1",
24-
"@onekeyfe/hd-shared": "^1.0.26-alpha.1",
25-
"@onekeyfe/hd-transport-react-native": "^1.0.26-alpha.1"
23+
"@onekeyfe/hd-core": "^1.0.26-alpha.2",
24+
"@onekeyfe/hd-shared": "^1.0.26-alpha.2",
25+
"@onekeyfe/hd-transport-react-native": "^1.0.26-alpha.2"
2626
}
2727
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-common-connect-sdk",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,10 +20,10 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "^1.0.26-alpha.1",
24-
"@onekeyfe/hd-shared": "^1.0.26-alpha.1",
25-
"@onekeyfe/hd-transport-http": "^1.0.26-alpha.1",
26-
"@onekeyfe/hd-transport-lowlevel": "^1.0.26-alpha.1",
27-
"@onekeyfe/hd-transport-webusb": "^1.0.26-alpha.1"
23+
"@onekeyfe/hd-core": "^1.0.26-alpha.2",
24+
"@onekeyfe/hd-shared": "^1.0.26-alpha.2",
25+
"@onekeyfe/hd-transport-http": "^1.0.26-alpha.2",
26+
"@onekeyfe/hd-transport-lowlevel": "^1.0.26-alpha.2",
27+
"@onekeyfe/hd-transport-webusb": "^1.0.26-alpha.2"
2828
}
2929
}

‎packages/hd-transport-http/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-http",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"description": "hardware http transport",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2525
},
2626
"dependencies": {
27-
"@onekeyfe/hd-shared": "^1.0.26-alpha.1",
28-
"@onekeyfe/hd-transport": "^1.0.26-alpha.1",
27+
"@onekeyfe/hd-shared": "^1.0.26-alpha.2",
28+
"@onekeyfe/hd-transport": "^1.0.26-alpha.2",
2929
"axios": "^0.27.2"
3030
}
3131
}

‎packages/hd-transport-lowlevel/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-lowlevel",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
55
"license": "MIT",
66
"main": "dist/index.js",
@@ -19,7 +19,7 @@
1919
"lint:fix": "eslint . --fix"
2020
},
2121
"dependencies": {
22-
"@onekeyfe/hd-shared": "^1.0.26-alpha.1",
23-
"@onekeyfe/hd-transport": "^1.0.26-alpha.1"
22+
"@onekeyfe/hd-shared": "^1.0.26-alpha.2",
23+
"@onekeyfe/hd-transport": "^1.0.26-alpha.2"
2424
}
2525
}

‎packages/hd-transport-react-native/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-react-native",
3-
"version": "1.0.26-alpha.1",
3+
"version": "1.0.26-alpha.2",
44
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
55
"license": "MIT",
66
"main": "dist/index.js",
@@ -19,8 +19,8 @@
1919
"lint:fix": "eslint . --fix"
2020
},
2121
"dependencies": {
22-
"@onekeyfe/hd-shared": "^1.0.26-alpha.1",
23-
"@onekeyfe/hd-transport": "^1.0.26-alpha.1",
22+
"@onekeyfe/hd-shared": "^1.0.26-alpha.2",
23+
"@onekeyfe/hd-transport": "^1.0.26-alpha.2",
2424
"@onekeyfe/react-native-ble-utils": "^0.1.3",
2525
"react-native-ble-plx": "3.5.0"
2626
}

0 commit comments

Comments
 (0)