Skip to content

Commit 9117ce6

Browse files
ByteZhang1024ByteZhang1024
authored
Feat/ada sign message (#519)
* chore: ada signmessage * feat: support tron delegate resource contract lockPeriod * chore: release 1.0.39-alpha.11
1 parent 97fbf97 commit 9117ce6

File tree

22 files changed

+94
-49
lines changed

22 files changed

+94
-49
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.39-alpha.10",
5+
"version": "1.0.39-alpha.11",
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.39-alpha.10",
3+
"version": "1.0.39-alpha.11",
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.39-alpha.10",
23-
"@onekeyfe/hd-common-connect-sdk": "^1.0.39-alpha.10",
24-
"@onekeyfe/hd-core": "^1.0.39-alpha.10",
25-
"@onekeyfe/hd-web-sdk": "^1.0.39-alpha.10",
22+
"@onekeyfe/hd-ble-sdk": "^1.0.39-alpha.11",
23+
"@onekeyfe/hd-common-connect-sdk": "^1.0.39-alpha.11",
24+
"@onekeyfe/hd-core": "^1.0.39-alpha.11",
25+
"@onekeyfe/hd-web-sdk": "^1.0.39-alpha.11",
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": "@onekeyfe/onekey-hardware-playground",
3-
"version": "1.0.39-alpha.10",
3+
"version": "1.0.39-alpha.11",
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-core": "^1.0.39-alpha.10",
21-
"@onekeyfe/hd-shared": "^1.0.39-alpha.10",
22-
"@onekeyfe/hd-web-sdk": "^1.0.39-alpha.10",
20+
"@onekeyfe/hd-core": "^1.0.39-alpha.11",
21+
"@onekeyfe/hd-shared": "^1.0.39-alpha.11",
22+
"@onekeyfe/hd-web-sdk": "^1.0.39-alpha.11",
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.0.39-alpha.10",
3+
"version": "1.0.39-alpha.11",
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.39-alpha.10",
29-
"@onekeyfe/hd-transport": "^1.0.39-alpha.10",
28+
"@onekeyfe/hd-shared": "^1.0.39-alpha.11",
29+
"@onekeyfe/hd-transport": "^1.0.39-alpha.11",
3030
"axios": "^0.27.2",
3131
"bignumber.js": "^9.0.2",
3232
"bytebuffer": "^5.0.1",

‎packages/core/src/api/cardano/CardanoSignMessage.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
2020
{ name: 'message', type: 'string', required: true },
2121
{ name: 'derivationType', type: 'number' },
2222
{ name: 'networkId', type: 'number', required: true },
23+
{ name: 'addressType', type: 'number' },
2324
]);
2425

2526
const addressN = validatePath(payload.path, 3);
@@ -32,6 +33,7 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
3233
? payload.derivationType
3334
: PROTO.CardanoDerivationType.ICARUS,
3435
network_id: payload.networkId,
36+
address_type: payload.addressType,
3537
};
3638
}
3739

@@ -43,7 +45,20 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
4345
};
4446
}
4547

48+
getAddressTypeVersionRange() {
49+
return {
50+
pro: {
51+
min: '4.9.3',
52+
},
53+
};
54+
}
55+
4656
async run() {
57+
this.checkFeatureVersionLimit(
58+
() => this.params.address_type !== null && this.params.address_type !== undefined,
59+
() => this.getAddressTypeVersionRange()
60+
);
61+
4762
const res = await this.device.commands.typedCall(
4863
'CardanoSignMessage',
4964
'CardanoMessageSignature',

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
6767
balance: tx.contract.delegateResourceContract.balance,
6868
receiver_address: tx.contract.delegateResourceContract.receiverAddress,
6969
lock: tx.contract.delegateResourceContract.lock,
70+
lock_period: tx.contract.delegateResourceContract.lockPeriod,
7071
},
7172
};
7273
}
@@ -170,8 +171,28 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
170171
);
171172
}
172173

174+
supportDelegateResourceLockPeriodVersionRange(): DeviceFirmwareRange {
175+
return {
176+
pro: {
177+
min: '4.15.0',
178+
},
179+
};
180+
}
181+
182+
checkSupportDelegateContractLockPeriod() {
183+
const { delegate_resource_contract } = this.params.contract;
184+
this.checkFeatureVersionLimit(
185+
() =>
186+
!!delegate_resource_contract &&
187+
delegate_resource_contract.lock_period !== undefined &&
188+
delegate_resource_contract.lock_period !== null,
189+
() => this.supportDelegateResourceLockPeriodVersionRange()
190+
);
191+
}
192+
173193
async run() {
174194
this.checkFixDataTypeSupportVoteWitnessError();
195+
this.checkSupportDelegateContractLockPeriod();
175196

176197
const response = await this.device.commands.typedCall('TronSignTx', 'TronSignedTx', {
177198
...this.params,

‎packages/core/src/data/messages/messages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11509,6 +11509,10 @@
1150911509
"lock": {
1151011510
"type": "bool",
1151111511
"id": 5
11512+
},
11513+
"lock_period": {
11514+
"type": "uint64",
11515+
"id": 6
1151211516
}
1151311517
}
1151411518
},

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
import type { CardanoMessageSignature } from '@onekeyfe/hd-transport';
22
import type { CommonParams, Response } from '../params';
3+
import { PROTO } from '../../constants';
34

45
export type CardanoSignMessageParams = {
56
address_n: number[];
67
message: string;
78
derivation_type: number;
89
network_id: number;
10+
address_type: number;
911
};
1012

1113
export type CardanoSignMessageMethodParams = {
1214
path: string;
1315
message: string;
1416
derivationType: number;
1517
networkId: number;
18+
addressType?: PROTO.CardanoAddressType;
1619
};
1720

1821
export declare function cardanoSignMessage(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export type TronDelegateResourceContract = {
2929
balance?: number;
3030
receiverAddress?: string;
3131
lock?: boolean;
32+
lockPeriod?: number;
3233
};
3334

3435
export type TronUnDelegateResourceContract = {

‎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.39-alpha.10",
3+
"version": "1.0.39-alpha.11",
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.39-alpha.10",
24-
"@onekeyfe/hd-shared": "^1.0.39-alpha.10",
25-
"@onekeyfe/hd-transport-react-native": "^1.0.39-alpha.10"
23+
"@onekeyfe/hd-core": "^1.0.39-alpha.11",
24+
"@onekeyfe/hd-shared": "^1.0.39-alpha.11",
25+
"@onekeyfe/hd-transport-react-native": "^1.0.39-alpha.11"
2626
}
2727
}

0 commit comments

Comments
 (0)