@onekeyfe/hd-core 0.2.9 → 0.2.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/cardano/CardanoGetAddress.d.ts +1 -0
- package/dist/api/cardano/CardanoGetAddress.d.ts.map +1 -1
- package/dist/index.d.ts +14 -4
- package/dist/index.js +28 -9
- package/dist/types/api/cardanoGetAddress.d.ts +4 -2
- package/dist/types/api/cardanoGetAddress.d.ts.map +1 -1
- package/dist/types/api/export.d.ts +2 -0
- package/dist/types/api/export.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/cardano/CardanoGetAddress.ts +39 -12
- package/src/types/api/cardanoGetAddress.ts +4 -2
- package/src/types/api/export.ts +8 -0
|
@@ -2,6 +2,7 @@ import { BaseMethod } from '../BaseMethod';
|
|
|
2
2
|
import { CardanoGetAddressParams, CardanoAddress } from '../../types/api/cardanoGetAddress';
|
|
3
3
|
export default class CardanoGetAddress extends BaseMethod<CardanoGetAddressParams[]> {
|
|
4
4
|
hasBundle?: boolean;
|
|
5
|
+
isCheck?: boolean;
|
|
5
6
|
init(): void;
|
|
6
7
|
run(): Promise<CardanoAddress | CardanoAddress[]>;
|
|
7
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CardanoGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/cardano/CardanoGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAU3C,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAE5F,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,EAAE,CAAC;IAClF,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,IAAI;
|
|
1
|
+
{"version":3,"file":"CardanoGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/cardano/CardanoGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAU3C,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAE5F,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,EAAE,CAAC;IAClF,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,IAAI;IAmCE,GAAG;CA6DV"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import EventEmitter, { EventEmitter as EventEmitter$1 } from 'events';
|
|
2
2
|
import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
|
|
3
|
-
import { Messages, Success as Success$1, RecoveryDeviceType, SafetyCheckLevel, ResourceType, CipheredKeyValue as CipheredKeyValue$1, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, UintType, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, OneKeyDeviceInfo, Transport } from '@onekeyfe/hd-transport';
|
|
3
|
+
import { Messages, Success as Success$1, RecoveryDeviceType, SafetyCheckLevel, ResourceType, CipheredKeyValue as CipheredKeyValue$1, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, UintType, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, CardanoAddressParametersType, OneKeyDeviceInfo, Transport } from '@onekeyfe/hd-transport';
|
|
4
4
|
export { Messages as PROTO } from '@onekeyfe/hd-transport';
|
|
5
5
|
import { Deferred } from '@onekeyfe/hd-shared';
|
|
6
6
|
|
|
@@ -1351,9 +1351,18 @@ declare type CardanoGetAddressMethodParams = {
|
|
|
1351
1351
|
networkId: number;
|
|
1352
1352
|
protocolMagic: number;
|
|
1353
1353
|
derivationType: number;
|
|
1354
|
-
address
|
|
1354
|
+
address?: string;
|
|
1355
|
+
isCheck?: boolean;
|
|
1355
1356
|
showOnOneKey: boolean;
|
|
1356
1357
|
};
|
|
1358
|
+
declare type CardanoGetAddressParams = {
|
|
1359
|
+
address_parameters: CardanoAddressParametersType;
|
|
1360
|
+
network_id: number;
|
|
1361
|
+
protocol_magic: number;
|
|
1362
|
+
derivation_type: number;
|
|
1363
|
+
address: string;
|
|
1364
|
+
show_display: boolean;
|
|
1365
|
+
};
|
|
1357
1366
|
declare type CardanoAddress = {
|
|
1358
1367
|
addressParameters: CardanoAddressParameters;
|
|
1359
1368
|
protocolMagic: number;
|
|
@@ -1361,7 +1370,8 @@ declare type CardanoAddress = {
|
|
|
1361
1370
|
serializedPath: string;
|
|
1362
1371
|
serializedStakingPath: string;
|
|
1363
1372
|
address: string;
|
|
1364
|
-
xpub
|
|
1373
|
+
xpub?: string;
|
|
1374
|
+
stakeAddress?: string;
|
|
1365
1375
|
};
|
|
1366
1376
|
declare function cardanoGetAddress(connectId: string, deviceId: string, params: CommonParams & CardanoGetAddressMethodParams): Response<CardanoAddress>;
|
|
1367
1377
|
declare function cardanoGetAddress(connectId: string, deviceId: string, params: CommonParams & {
|
|
@@ -2027,4 +2037,4 @@ declare class DataManager {
|
|
|
2027
2037
|
|
|
2028
2038
|
declare const HardwareSdk: ({ init, call, dispose, eventEmitter, uiResponse, cancel, }: InjectApi) => CoreApi;
|
|
2029
2039
|
|
|
2030
|
-
export { AccountAddress, AccountAddresses, AlgoAddress, AlgoGetAddressParams, AlgoSignTransactionParams, AlgoSignedTx, AptosAddress, AptosGetAddressParams, AptosGetPublicKeyParams, AptosMessageSignature, AptosPublicKey, AptosSignMessageParams, AptosSignTransactionParams, AptosSignedTx, AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCSignTransactionParams, BTCVerifyMessageParams, BleReleaseInfoEvent, BleReleaseInfoPayload, CORE_EVENT, CallMethod, CallMethodAnyResponse, CallMethodKeys, CallMethodPayload, CallMethodResponse, CallMethodUnion, CipheredKeyValue, CipheredKeyValueParams, CommonParams, ConfluxAddress, ConfluxGetAddressParams, ConfluxSignMessageCIP23Params, ConfluxSignMessageParams, ConfluxSignTransactionParams, ConfluxSignedTx, ConfluxTransaction, ConnectSettings, Core, CoreApi, CoreMessage, CosmosAddress, CosmosGetAddressParams, CosmosGetPublicKeyParams, CosmosPublicKey, CosmosSignTransactionParams, CosmosSignedTx, DEFAULT_PRIORITY, DEVICE, DEVICE_EVENT, DataManager, Device$1 as Device, DeviceButtonRequest, DeviceButtonRequestPayload, DeviceChangePinParams, DeviceConnnectRequest, DeviceDisconnnectRequest, DeviceEvent, DeviceEventListenerFn, DeviceEventMessage, DeviceFeaturesPayload, DeviceFirmwareRange, DeviceFlagsParams, DeviceMode, DeviceRecoveryParams, DeviceResetParams, DeviceSendFeatures, DeviceSendSupportFeatures, DeviceSettingsParams, DeviceStatus, DeviceSupportFeatures, DeviceSupportFeaturesPayload, DeviceTypeMap, DeviceUploadResourceParams, DeviceVerifyParams, DeviceVerifySignature, EVMAccessList, EVMAddress, EVMGetAddressParams, EVMGetPublicKeyParams, EVMPublicKey, EVMSignMessageEIP712Params, EVMSignMessageParams, EVMSignTransactionParams, EVMSignTypedDataParams, EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMVerifyMessageParams, EthereumSignTypedDataMessage, EthereumSignTypedDataTypeProperty, EthereumSignTypedDataTypes, FIRMWARE, FIRMWARE_EVENT, Features, FirmwareEvent, FirmwareMessage, FirmwareProgress, FirmwareRange, FirmwareRelease$1 as FirmwareRelease, FirmwareTip, FirmwareUpdateBinaryParams, FirmwareUpdateParams, IBLEFirmwareReleaseInfo, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IDeviceModel, IDeviceType, IFRAME, IFirmwareReleaseInfo, IFrameBridge, IFrameCallMessage, IFrameCancelMessage, IFrameEvent, IFrameEventMessage, IFrameInit, ILocale, ITransportStatus, IVersionArray, KnownDevice, LOG, LOG_EVENT, LogEvent, LogEventMessage, LogOutput, LoggerNames, MajorVersion, MethodResponseMessage, NEMAddress, NEMAggregateModificationTransaction, NEMGetAddressParams, NEMImportanceTransaction, NEMMosaic, NEMMosaicCreationTransaction, NEMMultisigTransaction, NEMProvisionNamespaceTransaction, NEMSignTransactionParams, NEMSupplyChangeTransaction, NEMTransaction, NEMTransferTransaction, NearAddress, NearGetAddressParams, NearSignTransactionParams, Params, PostMessageEvent, RESPONSE_EVENT, RefTransaction, ReleaseInfo, ReleaseInfoEvent, ReleaseInfoPayload, RemoteConfigResponse, Response, SearchDevice, SignedTransaction, SolanaAddress, SolanaGetAddressParams, SolanaSignTransactionParams, SolanaSignedTx, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, StellarAddress, StellarAsset, StellarGetAddressParams, StellarOperation, StellarSignTransactionParams, StellarTransaction, StrictFeatures, Success, SuiAddress, SuiGetAddressParams, SuiGetPublicKeyParams, SuiPublicKey, SuiSignTransactionParams, SuiSignedTx, SupportFeatureType, SupportFeatures, TransactionOptions, TransportReleaseStatus, TronAddress, TronGetAddressParams, TronSignMessageParams, TronSignTransactionParams, TronTransaction, TronTransactionContract, TronTransferContract, TronTriggerSmartContract, UI_EVENT, UI_REQUEST, UI_RESPONSE, UiEvent, UiEventMessage, UiPromise, UiPromiseResponse, UiRequestButton, UiRequestDeviceAction, UiRequestPassphrase, UiRequestPassphraseOnDevice, UiRequestWithoutPayload, UiResponseEvent, UiResponseMessage, UiResponsePassphrase, UiResponsePin, UnavailableCapabilities, UnavailableCapability, Unsuccessful, VersionArray, corsValidator, createDeviceMessage, createErrorMessage, createFirmwareMessage, createIFrameMessage, createLogMessage, createResponseMessage, createUiMessage, createUiResponse, HardwareSdk as default, enableLog, getDeviceLabel, getDeviceType, getDeviceTypeByBleName, getDeviceTypeByDeviceId, getDeviceUUID, getEnv, getHDPath, getLog, getLogger, getSDKVersion, getScriptType, getTimeStamp, httpRequest, init as initCore, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, patchFeatures, safeThrowError, setLoggerPostMessage, versionCompare, versionSplit, wait };
|
|
2040
|
+
export { AccountAddress, AccountAddresses, AlgoAddress, AlgoGetAddressParams, AlgoSignTransactionParams, AlgoSignedTx, AptosAddress, AptosGetAddressParams, AptosGetPublicKeyParams, AptosMessageSignature, AptosPublicKey, AptosSignMessageParams, AptosSignTransactionParams, AptosSignedTx, AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCSignTransactionParams, BTCVerifyMessageParams, BleReleaseInfoEvent, BleReleaseInfoPayload, CORE_EVENT, CallMethod, CallMethodAnyResponse, CallMethodKeys, CallMethodPayload, CallMethodResponse, CallMethodUnion, CardanoAddress, CardanoGetAddressMethodParams, CardanoGetAddressParams, CardanoSignTransaction, CardanoSignedTxData, CipheredKeyValue, CipheredKeyValueParams, CommonParams, ConfluxAddress, ConfluxGetAddressParams, ConfluxSignMessageCIP23Params, ConfluxSignMessageParams, ConfluxSignTransactionParams, ConfluxSignedTx, ConfluxTransaction, ConnectSettings, Core, CoreApi, CoreMessage, CosmosAddress, CosmosGetAddressParams, CosmosGetPublicKeyParams, CosmosPublicKey, CosmosSignTransactionParams, CosmosSignedTx, DEFAULT_PRIORITY, DEVICE, DEVICE_EVENT, DataManager, Device$1 as Device, DeviceButtonRequest, DeviceButtonRequestPayload, DeviceChangePinParams, DeviceConnnectRequest, DeviceDisconnnectRequest, DeviceEvent, DeviceEventListenerFn, DeviceEventMessage, DeviceFeaturesPayload, DeviceFirmwareRange, DeviceFlagsParams, DeviceMode, DeviceRecoveryParams, DeviceResetParams, DeviceSendFeatures, DeviceSendSupportFeatures, DeviceSettingsParams, DeviceStatus, DeviceSupportFeatures, DeviceSupportFeaturesPayload, DeviceTypeMap, DeviceUploadResourceParams, DeviceVerifyParams, DeviceVerifySignature, EVMAccessList, EVMAddress, EVMGetAddressParams, EVMGetPublicKeyParams, EVMPublicKey, EVMSignMessageEIP712Params, EVMSignMessageParams, EVMSignTransactionParams, EVMSignTypedDataParams, EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMVerifyMessageParams, EthereumSignTypedDataMessage, EthereumSignTypedDataTypeProperty, EthereumSignTypedDataTypes, FIRMWARE, FIRMWARE_EVENT, Features, FirmwareEvent, FirmwareMessage, FirmwareProgress, FirmwareRange, FirmwareRelease$1 as FirmwareRelease, FirmwareTip, FirmwareUpdateBinaryParams, FirmwareUpdateParams, IBLEFirmwareReleaseInfo, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IDeviceModel, IDeviceType, IFRAME, IFirmwareReleaseInfo, IFrameBridge, IFrameCallMessage, IFrameCancelMessage, IFrameEvent, IFrameEventMessage, IFrameInit, ILocale, ITransportStatus, IVersionArray, KnownDevice, LOG, LOG_EVENT, LogEvent, LogEventMessage, LogOutput, LoggerNames, MajorVersion, MethodResponseMessage, NEMAddress, NEMAggregateModificationTransaction, NEMGetAddressParams, NEMImportanceTransaction, NEMMosaic, NEMMosaicCreationTransaction, NEMMultisigTransaction, NEMProvisionNamespaceTransaction, NEMSignTransactionParams, NEMSupplyChangeTransaction, NEMTransaction, NEMTransferTransaction, NearAddress, NearGetAddressParams, NearSignTransactionParams, Params, PostMessageEvent, RESPONSE_EVENT, RefTransaction, ReleaseInfo, ReleaseInfoEvent, ReleaseInfoPayload, RemoteConfigResponse, Response, SearchDevice, SignedTransaction, SolanaAddress, SolanaGetAddressParams, SolanaSignTransactionParams, SolanaSignedTx, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, StellarAddress, StellarAsset, StellarGetAddressParams, StellarOperation, StellarSignTransactionParams, StellarTransaction, StrictFeatures, Success, SuiAddress, SuiGetAddressParams, SuiGetPublicKeyParams, SuiPublicKey, SuiSignTransactionParams, SuiSignedTx, SupportFeatureType, SupportFeatures, TransactionOptions, TransportReleaseStatus, TronAddress, TronGetAddressParams, TronSignMessageParams, TronSignTransactionParams, TronTransaction, TronTransactionContract, TronTransferContract, TronTriggerSmartContract, UI_EVENT, UI_REQUEST, UI_RESPONSE, UiEvent, UiEventMessage, UiPromise, UiPromiseResponse, UiRequestButton, UiRequestDeviceAction, UiRequestPassphrase, UiRequestPassphraseOnDevice, UiRequestWithoutPayload, UiResponseEvent, UiResponseMessage, UiResponsePassphrase, UiResponsePin, UnavailableCapabilities, UnavailableCapability, Unsuccessful, VersionArray, corsValidator, createDeviceMessage, createErrorMessage, createFirmwareMessage, createIFrameMessage, createLogMessage, createResponseMessage, createUiMessage, createUiResponse, HardwareSdk as default, enableLog, getDeviceLabel, getDeviceType, getDeviceTypeByBleName, getDeviceTypeByDeviceId, getDeviceUUID, getEnv, getHDPath, getLog, getLogger, getSDKVersion, getScriptType, getTimeStamp, httpRequest, init as initCore, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, patchFeatures, safeThrowError, setLoggerPostMessage, versionCompare, versionSplit, wait };
|
package/dist/index.js
CHANGED
|
@@ -16594,10 +16594,11 @@ const modifyAddressParametersForBackwardsCompatibility = (address_parameters) =>
|
|
|
16594
16594
|
|
|
16595
16595
|
class CardanoGetAddress extends BaseMethod {
|
|
16596
16596
|
init() {
|
|
16597
|
-
var _a;
|
|
16597
|
+
var _a, _b;
|
|
16598
16598
|
this.checkDeviceId = true;
|
|
16599
16599
|
this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
|
|
16600
16600
|
this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
|
|
16601
|
+
this.isCheck = !!((_b = this.payload) === null || _b === void 0 ? void 0 : _b.isCheck);
|
|
16601
16602
|
const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
|
|
16602
16603
|
this.params = payload.bundle.map((batch) => {
|
|
16603
16604
|
validateParams(batch, [
|
|
@@ -16606,7 +16607,7 @@ class CardanoGetAddress extends BaseMethod {
|
|
|
16606
16607
|
{ name: 'protocolMagic', type: 'number', required: true },
|
|
16607
16608
|
{ name: 'derivationType', type: 'number' },
|
|
16608
16609
|
{ name: 'address', type: 'string' },
|
|
16609
|
-
{ name: '
|
|
16610
|
+
{ name: 'showOnOneKey', type: 'boolean' },
|
|
16610
16611
|
]);
|
|
16611
16612
|
validateAddressParameters(batch.addressParameters);
|
|
16612
16613
|
return {
|
|
@@ -16617,7 +16618,7 @@ class CardanoGetAddress extends BaseMethod {
|
|
|
16617
16618
|
derivation_type: typeof batch.derivationType !== 'undefined'
|
|
16618
16619
|
? batch.derivationType
|
|
16619
16620
|
: hdTransport.Messages.CardanoDerivationType.ICARUS_TREZOR,
|
|
16620
|
-
show_display: typeof batch.showOnOneKey === 'boolean' ? !!batch.
|
|
16621
|
+
show_display: typeof batch.showOnOneKey === 'boolean' ? !!batch.showOnOneKey : true,
|
|
16621
16622
|
};
|
|
16622
16623
|
});
|
|
16623
16624
|
}
|
|
@@ -16633,11 +16634,28 @@ class CardanoGetAddress extends BaseMethod {
|
|
|
16633
16634
|
derivation_type,
|
|
16634
16635
|
show_display,
|
|
16635
16636
|
});
|
|
16636
|
-
|
|
16637
|
-
|
|
16638
|
-
|
|
16639
|
-
|
|
16640
|
-
|
|
16637
|
+
let xpub;
|
|
16638
|
+
let stakeAddress;
|
|
16639
|
+
if (address_parameters.address_type === hdTransport.Messages.CardanoAddressType.BASE && !this.isCheck) {
|
|
16640
|
+
const publicKeyRes = yield this.device.commands.typedCall('CardanoGetPublicKey', 'CardanoPublicKey', {
|
|
16641
|
+
address_n: address_parameters.address_n.slice(0, 3),
|
|
16642
|
+
derivation_type,
|
|
16643
|
+
show_display,
|
|
16644
|
+
});
|
|
16645
|
+
xpub = publicKeyRes.message.xpub;
|
|
16646
|
+
const stakeAddressRes = yield this.device.commands.typedCall('CardanoGetAddress', 'CardanoAddress', {
|
|
16647
|
+
address_parameters: {
|
|
16648
|
+
address_type: hdTransport.Messages.CardanoAddressType.REWARD,
|
|
16649
|
+
address_n: [],
|
|
16650
|
+
address_n_staking: address_parameters.address_n_staking,
|
|
16651
|
+
},
|
|
16652
|
+
protocol_magic,
|
|
16653
|
+
network_id,
|
|
16654
|
+
derivation_type,
|
|
16655
|
+
show_display,
|
|
16656
|
+
});
|
|
16657
|
+
stakeAddress = stakeAddressRes.message.address;
|
|
16658
|
+
}
|
|
16641
16659
|
responses.push({
|
|
16642
16660
|
addressParameters: addressParametersFromProto(batch.address_parameters),
|
|
16643
16661
|
protocolMagic: batch.protocol_magic,
|
|
@@ -16645,7 +16663,8 @@ class CardanoGetAddress extends BaseMethod {
|
|
|
16645
16663
|
serializedPath: serializedPath(batch.address_parameters.address_n),
|
|
16646
16664
|
serializedStakingPath: serializedPath(batch.address_parameters.address_n_staking),
|
|
16647
16665
|
address: response.message.address,
|
|
16648
|
-
xpub
|
|
16666
|
+
xpub,
|
|
16667
|
+
stakeAddress,
|
|
16649
16668
|
});
|
|
16650
16669
|
}
|
|
16651
16670
|
return this.hasBundle ? responses : responses[0];
|
|
@@ -6,7 +6,8 @@ export declare type CardanoGetAddressMethodParams = {
|
|
|
6
6
|
networkId: number;
|
|
7
7
|
protocolMagic: number;
|
|
8
8
|
derivationType: number;
|
|
9
|
-
address
|
|
9
|
+
address?: string;
|
|
10
|
+
isCheck?: boolean;
|
|
10
11
|
showOnOneKey: boolean;
|
|
11
12
|
};
|
|
12
13
|
export declare type CardanoGetAddressParams = {
|
|
@@ -24,7 +25,8 @@ export declare type CardanoAddress = {
|
|
|
24
25
|
serializedPath: string;
|
|
25
26
|
serializedStakingPath: string;
|
|
26
27
|
address: string;
|
|
27
|
-
xpub
|
|
28
|
+
xpub?: string;
|
|
29
|
+
stakeAddress?: string;
|
|
28
30
|
};
|
|
29
31
|
export declare function cardanoGetAddress(connectId: string, deviceId: string, params: CommonParams & CardanoGetAddressMethodParams): Response<CardanoAddress>;
|
|
30
32
|
export declare function cardanoGetAddress(connectId: string, deviceId: string, params: CommonParams & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cardanoGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/cardanoGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,oBAAY,6BAA6B,GAAG;IAC1C,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,SAAS,EAAE,MAAM,CAAC;IAKlB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"cardanoGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/cardanoGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE1D,oBAAY,6BAA6B,GAAG;IAC1C,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,SAAS,EAAE,MAAM,CAAC;IAKlB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,oBAAY,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,4BAA4B,CAAC;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,6BAA6B,GACnD,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,6BAA6B,EAAE,CAAA;CAAE,GAClE,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC"}
|
|
@@ -52,4 +52,6 @@ export type { CosmosSignedTx, CosmosSignTransactionParams } from './cosmosSignTr
|
|
|
52
52
|
export type { SuiAddress, SuiGetAddressParams } from './suiGetAddress';
|
|
53
53
|
export type { SuiPublicKey, SuiGetPublicKeyParams } from './suiGetPublicKey';
|
|
54
54
|
export type { SuiSignedTx, SuiSignTransactionParams } from './suiSignTransaction';
|
|
55
|
+
export type { CardanoGetAddressMethodParams, CardanoAddress, CardanoGetAddressParams, } from './cardanoGetAddress';
|
|
56
|
+
export type { CardanoSignTransaction, CardanoSignedTxData } from './cardano';
|
|
55
57
|
//# sourceMappingURL=export.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.10",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"author": "OneKey",
|
|
6
6
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@onekeyfe/hd-shared": "^0.2.
|
|
28
|
-
"@onekeyfe/hd-transport": "^0.2.
|
|
27
|
+
"@onekeyfe/hd-shared": "^0.2.10",
|
|
28
|
+
"@onekeyfe/hd-transport": "^0.2.10",
|
|
29
29
|
"axios": "^0.27.2",
|
|
30
30
|
"bignumber.js": "^9.0.2",
|
|
31
31
|
"jszip": "^3.10.1",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"@types/semver": "^7.3.9",
|
|
43
43
|
"ripple-keypairs": "^1.1.4"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "02e8b4a394794b3e5365b5bd9d29f7b596920fc5"
|
|
46
46
|
}
|
|
@@ -13,11 +13,14 @@ import { CardanoGetAddressParams, CardanoAddress } from '../../types/api/cardano
|
|
|
13
13
|
export default class CardanoGetAddress extends BaseMethod<CardanoGetAddressParams[]> {
|
|
14
14
|
hasBundle?: boolean;
|
|
15
15
|
|
|
16
|
+
isCheck?: boolean;
|
|
17
|
+
|
|
16
18
|
init() {
|
|
17
19
|
this.checkDeviceId = true;
|
|
18
20
|
this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
|
|
19
21
|
|
|
20
22
|
this.hasBundle = !!this.payload?.bundle;
|
|
23
|
+
this.isCheck = !!this.payload?.isCheck;
|
|
21
24
|
const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
|
|
22
25
|
|
|
23
26
|
this.params = payload.bundle.map((batch: any) => {
|
|
@@ -28,7 +31,7 @@ export default class CardanoGetAddress extends BaseMethod<CardanoGetAddressParam
|
|
|
28
31
|
{ name: 'protocolMagic', type: 'number', required: true },
|
|
29
32
|
{ name: 'derivationType', type: 'number' },
|
|
30
33
|
{ name: 'address', type: 'string' },
|
|
31
|
-
{ name: '
|
|
34
|
+
{ name: 'showOnOneKey', type: 'boolean' },
|
|
32
35
|
]);
|
|
33
36
|
|
|
34
37
|
validateAddressParameters(batch.addressParameters);
|
|
@@ -42,7 +45,7 @@ export default class CardanoGetAddress extends BaseMethod<CardanoGetAddressParam
|
|
|
42
45
|
typeof batch.derivationType !== 'undefined'
|
|
43
46
|
? batch.derivationType
|
|
44
47
|
: PROTO.CardanoDerivationType.ICARUS_TREZOR,
|
|
45
|
-
show_display: typeof batch.showOnOneKey === 'boolean' ? !!batch.
|
|
48
|
+
show_display: typeof batch.showOnOneKey === 'boolean' ? !!batch.showOnOneKey : true,
|
|
46
49
|
};
|
|
47
50
|
});
|
|
48
51
|
}
|
|
@@ -61,15 +64,38 @@ export default class CardanoGetAddress extends BaseMethod<CardanoGetAddressParam
|
|
|
61
64
|
show_display,
|
|
62
65
|
});
|
|
63
66
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
67
|
+
let xpub;
|
|
68
|
+
let stakeAddress;
|
|
69
|
+
if (address_parameters.address_type === PROTO.CardanoAddressType.BASE && !this.isCheck) {
|
|
70
|
+
const publicKeyRes = await this.device.commands.typedCall(
|
|
71
|
+
'CardanoGetPublicKey',
|
|
72
|
+
'CardanoPublicKey',
|
|
73
|
+
{
|
|
74
|
+
address_n: address_parameters.address_n.slice(0, 3),
|
|
75
|
+
derivation_type,
|
|
76
|
+
show_display,
|
|
77
|
+
}
|
|
78
|
+
);
|
|
79
|
+
xpub = publicKeyRes.message.xpub;
|
|
80
|
+
|
|
81
|
+
const stakeAddressRes = await this.device.commands.typedCall(
|
|
82
|
+
'CardanoGetAddress',
|
|
83
|
+
'CardanoAddress',
|
|
84
|
+
{
|
|
85
|
+
address_parameters: {
|
|
86
|
+
address_type: PROTO.CardanoAddressType.REWARD,
|
|
87
|
+
address_n: [],
|
|
88
|
+
address_n_staking: address_parameters.address_n_staking,
|
|
89
|
+
},
|
|
90
|
+
protocol_magic,
|
|
91
|
+
network_id,
|
|
92
|
+
derivation_type,
|
|
93
|
+
show_display,
|
|
94
|
+
}
|
|
95
|
+
);
|
|
96
|
+
|
|
97
|
+
stakeAddress = stakeAddressRes.message.address;
|
|
98
|
+
}
|
|
73
99
|
|
|
74
100
|
responses.push({
|
|
75
101
|
addressParameters: addressParametersFromProto(batch.address_parameters),
|
|
@@ -78,7 +104,8 @@ export default class CardanoGetAddress extends BaseMethod<CardanoGetAddressParam
|
|
|
78
104
|
serializedPath: serializedPath(batch.address_parameters.address_n),
|
|
79
105
|
serializedStakingPath: serializedPath(batch.address_parameters.address_n_staking),
|
|
80
106
|
address: response.message.address,
|
|
81
|
-
xpub
|
|
107
|
+
xpub,
|
|
108
|
+
stakeAddress,
|
|
82
109
|
});
|
|
83
110
|
}
|
|
84
111
|
|
|
@@ -11,7 +11,8 @@ export type CardanoGetAddressMethodParams = {
|
|
|
11
11
|
*/
|
|
12
12
|
protocolMagic: number;
|
|
13
13
|
derivationType: number;
|
|
14
|
-
address
|
|
14
|
+
address?: string;
|
|
15
|
+
isCheck?: boolean;
|
|
15
16
|
showOnOneKey: boolean;
|
|
16
17
|
};
|
|
17
18
|
|
|
@@ -31,7 +32,8 @@ export type CardanoAddress = {
|
|
|
31
32
|
serializedPath: string;
|
|
32
33
|
serializedStakingPath: string;
|
|
33
34
|
address: string;
|
|
34
|
-
xpub
|
|
35
|
+
xpub?: string;
|
|
36
|
+
stakeAddress?: string;
|
|
35
37
|
};
|
|
36
38
|
|
|
37
39
|
export declare function cardanoGetAddress(
|
package/src/types/api/export.ts
CHANGED
|
@@ -110,3 +110,11 @@ export type { CosmosSignedTx, CosmosSignTransactionParams } from './cosmosSignTr
|
|
|
110
110
|
export type { SuiAddress, SuiGetAddressParams } from './suiGetAddress';
|
|
111
111
|
export type { SuiPublicKey, SuiGetPublicKeyParams } from './suiGetPublicKey';
|
|
112
112
|
export type { SuiSignedTx, SuiSignTransactionParams } from './suiSignTransaction';
|
|
113
|
+
|
|
114
|
+
export type {
|
|
115
|
+
CardanoGetAddressMethodParams,
|
|
116
|
+
CardanoAddress,
|
|
117
|
+
CardanoGetAddressParams,
|
|
118
|
+
} from './cardanoGetAddress';
|
|
119
|
+
|
|
120
|
+
export type { CardanoSignTransaction, CardanoSignedTxData } from './cardano';
|