Skip to content

Commit 9039715

Browse files
ByteZhang1024ByteZhang1024
authored
Feat/tron features (#616)
* feat: add tron features * feat: add tron feature on touch & polkadot network * chore: release 1.1.19-patch.3
1 parent 73d8d1e commit 9039715

File tree

26 files changed

+114
-73
lines changed

26 files changed

+114
-73
lines changed

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

Lines changed: 2 additions & 2 deletions
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.1.19-alpha.2",
5+
"version": "1.1.19-alpha.3",
66
"author": "OneKey",
77
"description": "End-to-end encrypted workspaces for teams",
88
"main": "dist/index.js",
@@ -22,7 +22,7 @@
2222
"ts:check": "yarn tsc --noEmit"
2323
},
2424
"dependencies": {
25-
"@onekeyfe/hd-transport-electron": "1.1.19-alpha.2",
25+
"@onekeyfe/hd-transport-electron": "1.1.19-alpha.3",
2626
"@stoprocent/noble": "2.3.4",
2727
"debug": "4.3.4",
2828
"electron-is-dev": "^3.0.1",

‎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.1.19-alpha.2",
3+
"version": "1.1.19-alpha.3",
44
"scripts": {
55
"start": "cross-env 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.1.19-alpha.2",
23-
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.2",
24-
"@onekeyfe/hd-core": "1.1.19-alpha.2",
25-
"@onekeyfe/hd-web-sdk": "1.1.19-alpha.2",
22+
"@onekeyfe/hd-ble-sdk": "1.1.19-alpha.3",
23+
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.3",
24+
"@onekeyfe/hd-core": "1.1.19-alpha.3",
25+
"@onekeyfe/hd-web-sdk": "1.1.19-alpha.3",
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/connect-examples/expo-playground/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "onekey-hardware-playground",
3-
"version": "1.1.19-alpha.2",
3+
"version": "1.1.19-alpha.3",
44
"private": true,
55
"sideEffects": [
66
"app/utils/shim.js",
@@ -17,9 +17,9 @@
1717
},
1818
"dependencies": {
1919
"@noble/hashes": "^1.8.0",
20-
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.2",
21-
"@onekeyfe/hd-core": "1.1.19-alpha.2",
22-
"@onekeyfe/hd-shared": "1.1.19-alpha.2",
20+
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.3",
21+
"@onekeyfe/hd-core": "1.1.19-alpha.3",
22+
"@onekeyfe/hd-shared": "1.1.19-alpha.3",
2323
"@radix-ui/react-checkbox": "^1.3.2",
2424
"@radix-ui/react-dialog": "^1.1.14",
2525
"@radix-ui/react-dropdown-menu": "^2.1.15",

‎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.1.19-alpha.2",
3+
"version": "1.1.19-alpha.3",
44
"description": "Core processes and APIs for communicating with OneKey hardware devices.",
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.1.19-alpha.2",
29-
"@onekeyfe/hd-transport": "1.1.19-alpha.2",
28+
"@onekeyfe/hd-shared": "1.1.19-alpha.3",
29+
"@onekeyfe/hd-transport": "1.1.19-alpha.3",
3030
"axios": "1.12.2",
3131
"bignumber.js": "^9.0.2",
3232
"bytebuffer": "^5.0.1",

‎packages/core/src/api/btc/helpers/btcParamsUtils.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
2+
23
import { getScriptType, isMultisigPath, fromHardened } from '../../helpers/pathUtils';
34
import bitcoin from '../../../data/coins/bitcoin.json';
45

‎packages/core/src/api/polkadot/PolkadotGetAddress.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { PolkadotGetAddress as HardwarePolkadotGetAddress } from '@onekeyfe/hd-transport';
2-
31
import { serializedPath, validatePath } from '../helpers/pathUtils';
42
import { BaseMethod } from '../BaseMethod';
53
import { validateParams, validateResult } from '../helpers/paramsValidator';
6-
import { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
7-
import { getPolkadotVersionRangeWithBundle } from './networks';
4+
import { getPolkadotVersionRangeWithBundle, parseNetwork } from './networks';
5+
6+
import type { PolkadotGetAddress as HardwarePolkadotGetAddress } from '@onekeyfe/hd-transport';
7+
import type { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
88

99
export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
1010
hasBundle = false;
@@ -37,7 +37,7 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
3737
this.params.push({
3838
address_n: addressN,
3939
prefix,
40-
network,
40+
network: parseNetwork(network),
4141
show_display: showOnOneKey,
4242
});
4343
});

‎packages/core/src/api/polkadot/PolkadotSignTransaction.ts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { PolkadotSignTx as HardwarePolkadotSignTx } from '@onekeyfe/hd-transport';
21
import { serializedPath, validatePath } from '../helpers/pathUtils';
32
import { BaseMethod } from '../BaseMethod';
43
import { validateParams } from '../helpers/paramsValidator';
5-
import { PolkadotSignTransactionParams } from '../../types';
64
import { formatAnyHex } from '../helpers/hexUtils';
7-
import { getPolkadotVersionRange } from './networks';
5+
import { getPolkadotVersionRange, parseNetwork } from './networks';
6+
7+
import type { PolkadotSignTransactionParams } from '../../types';
8+
import type { PolkadotSignTx as HardwarePolkadotSignTx } from '@onekeyfe/hd-transport';
89

910
export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
1011
hasBundle = false;
@@ -17,16 +18,18 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
1718
validateParams(this.payload, [
1819
{ name: 'path', required: true },
1920
{ name: 'network', required: true },
21+
{ name: 'prefix' },
2022
{ name: 'rawTx', type: 'hexString', required: true },
2123
]);
2224

2325
// init params
24-
const { path, rawTx, network } = this.payload as PolkadotSignTransactionParams;
26+
const { path, rawTx, network, prefix } = this.payload as PolkadotSignTransactionParams;
2527
const addressN = validatePath(path, 3);
2628

2729
this.params = {
2830
address_n: addressN,
29-
network,
31+
network: parseNetwork(network),
32+
prefix,
3033
raw_tx: formatAnyHex(rawTx),
3134
};
3235
}

‎packages/core/src/api/polkadot/networks.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ enum Networks {
88
Astar = 'astar',
99
JoyStream = 'joystream',
1010
Manta = 'manta',
11+
Hydration = 'hydration',
12+
Bifrost = 'bifrost',
13+
BifrostKusama = 'bifrost-ksm',
14+
PolkadotAssetHub = 'polkadot-assethub',
15+
KusamaAssetHub = 'kusama-assethub',
1116
}
1217

1318
// All polkadot networks are included in no special case
@@ -54,3 +59,14 @@ export function getPolkadotVersionRangeWithBundle(networks: string[]) {
5459
}
5560
return baseVersionRange;
5661
}
62+
63+
export function parseNetwork(network: string) {
64+
switch (network) {
65+
case Networks.PolkadotAssetHub:
66+
return Networks.Polkadot;
67+
case Networks.KusamaAssetHub:
68+
return Networks.Kusama;
69+
default:
70+
return network;
71+
}
72+
}

‎packages/core/src/api/tron/TronGetAddress.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-transport';
21
import { UI_REQUEST } from '../../constants/ui-request';
32
import { serializedPath, validatePath } from '../helpers/pathUtils';
43
import { BaseMethod } from '../BaseMethod';
54
import { validateParams, validateResult } from '../helpers/paramsValidator';
6-
import { TronGetAddressParams, TronAddress } from '../../types';
5+
6+
import type { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-transport';
7+
import type { TronGetAddressParams, TronAddress } from '../../types';
78

89
export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]> {
910
hasBundle = false;

‎packages/core/src/api/tron/TronSignMessage.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import {
2-
TronSignMessage as HardwareTronSignMessage,
3-
TronMessageType,
4-
} from '@onekeyfe/hd-transport';
1+
import { TronMessageType } from '@onekeyfe/hd-transport';
52
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
3+
64
import { UI_REQUEST } from '../../constants/ui-request';
75
import { validatePath } from '../helpers/pathUtils';
86
import { BaseMethod } from '../BaseMethod';
97
import { validateParams } from '../helpers/paramsValidator';
108
import { stripHexPrefix } from '../helpers/hexUtils';
119

10+
import type { TronSignMessage as HardwareTronSignMessage } from '@onekeyfe/hd-transport';
11+
1212
export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage> {
1313
init() {
1414
this.checkDeviceId = true;
@@ -54,6 +54,9 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
5454
pro: {
5555
min: '4.16.0',
5656
},
57+
touch: {
58+
min: '4.12.0',
59+
},
5760
classic1s: {
5861
min: '3.13.0',
5962
},

0 commit comments

Comments
 (0)