@onekeyfe/hd-core 0.1.58 → 0.1.59

package/dist/index.js

@@ -94,7 +94,12 @@ const inject = ({ call, cancel, dispose, eventEmitter, init, uiResponse, }) => {
         nearSignTransaction: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'nearSignTransaction' })),
         aptosGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'aptosGetAddress' })),
         aptosGetPublicKey: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'aptosGetPublicKey' })),
+        aptosSignMessage: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'aptosSignMessage' })),
         aptosSignTransaction: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'aptosSignTransaction' })),
+        algoGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'algoGetAddress' })),
+        algoSignTransaction: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'algoSignTransaction' })),
+        cosmosGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'cosmosGetAddress' })),
+        cosmosSignTransaction: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'cosmosSignTransaction' })),
     };
     return api;
 };
@@ -850,6 +855,56 @@ const supportBatchPublicKey = (features) => {
 };
 
 var nested = {
+	AlgorandGetAddress: {
+		fields: {
+			address_n: {
+				rule: "repeated",
+				type: "uint32",
+				id: 1,
+				options: {
+					packed: false
+				}
+			},
+			show_display: {
+				type: "bool",
+				id: 3
+			}
+		}
+	},
+	AlgorandAddress: {
+		fields: {
+			address: {
+				type: "string",
+				id: 1
+			}
+		}
+	},
+	AlgorandSignTx: {
+		fields: {
+			address_n: {
+				rule: "repeated",
+				type: "uint32",
+				id: 1,
+				options: {
+					packed: false
+				}
+			},
+			raw_tx: {
+				rule: "required",
+				type: "bytes",
+				id: 2
+			}
+		}
+	},
+	AlgorandSignedTx: {
+		fields: {
+			signature: {
+				rule: "required",
+				type: "bytes",
+				id: 1
+			}
+		}
+	},
 	AptosGetAddress: {
 		fields: {
 			address_n: {
@@ -905,6 +960,65 @@ var nested = {
 			}
 		}
 	},
+	AptosSignMessage: {
+		fields: {
+			address_n: {
+				rule: "repeated",
+				type: "uint32",
+				id: 1,
+				options: {
+					packed: false
+				}
+			},
+			payload: {
+				rule: "required",
+				type: "AptosMessagePayload",
+				id: 2
+			}
+		},
+		nested: {
+			AptosMessagePayload: {
+				fields: {
+					address: {
+						type: "string",
+						id: 2
+					},
+					chain_id: {
+						type: "string",
+						id: 3
+					},
+					application: {
+						type: "string",
+						id: 4
+					},
+					nonce: {
+						rule: "required",
+						type: "string",
+						id: 5
+					},
+					message: {
+						rule: "required",
+						type: "string",
+						id: 6
+					}
+				}
+			}
+		}
+	},
+	AptosMessageSignature: {
+		fields: {
+			signature: {
+				rule: "required",
+				type: "bytes",
+				id: 1
+			},
+			address: {
+				rule: "required",
+				type: "string",
+				id: 2
+			}
+		}
+	},
 	BinanceGetAddress: {
 		fields: {
 			address_n: {
@@ -3685,6 +3799,60 @@ var nested = {
 			}
 		}
 	},
+	CosmosGetAddress: {
+		fields: {
+			address_n: {
+				rule: "repeated",
+				type: "uint32",
+				id: 1,
+				options: {
+					packed: false
+				}
+			},
+			hrp: {
+				type: "string",
+				id: 2
+			},
+			show_display: {
+				type: "bool",
+				id: 3
+			}
+		}
+	},
+	CosmosAddress: {
+		fields: {
+			address: {
+				type: "string",
+				id: 1
+			}
+		}
+	},
+	CosmosSignTx: {
+		fields: {
+			address_n: {
+				rule: "repeated",
+				type: "uint32",
+				id: 1,
+				options: {
+					packed: false
+				}
+			},
+			raw_tx: {
+				rule: "required",
+				type: "bytes",
+				id: 2
+			}
+		}
+	},
+	CosmosSignedTx: {
+		fields: {
+			signature: {
+				rule: "required",
+				type: "bytes",
+				id: 1
+			}
+		}
+	},
 	CipherKeyValue: {
 		fields: {
 			address_n: {
@@ -9396,6 +9564,8 @@ var nested = {
 			MessageType_AptosAddress: 10601,
 			MessageType_AptosSignTx: 10602,
 			MessageType_AptosSignedTx: 10603,
+			MessageType_AptosSignMessage: 10604,
+			MessageType_AptosMessageSignature: 10605,
 			MessageType_WebAuthnListResidentCredentials: 800,
 			MessageType_WebAuthnCredentials: 801,
 			MessageType_WebAuthnAddResidentCredential: 802,
@@ -9436,6 +9606,14 @@ var nested = {
 			MessageType_NearAddress: 10702,
 			MessageType_NearSignTx: 10703,
 			MessageType_NearSignedTx: 10704,
+			MessageType_CosmosGetAddress: 10800,
+			MessageType_CosmosAddress: 10801,
+			MessageType_CosmosSignTx: 10802,
+			MessageType_CosmosSignedTx: 10803,
+			MessageType_AlgorandGetAddress: 10900,
+			MessageType_AlgorandAddress: 10901,
+			MessageType_AlgorandSignTx: 10902,
+			MessageType_AlgorandSignedTx: 10903,
 			MessageType_DeviceBackToBoot: 903,
 			MessageType_DeviceInfoSettings: 10001,
 			MessageType_GetDeviceInfo: 10002,
@@ -10546,7 +10724,7 @@ DataManager.getFirmwareStatus = (features) => {
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
 };
-DataManager.getSysResourcesLatestRelease = (features) => {
+DataManager.getSysResourcesLatestRelease = (features, forcedUpdateRes) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
@@ -10554,7 +10732,9 @@ DataManager.getSysResourcesLatestRelease = (features) => {
         return undefined;
     const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.firmware) !== null && _c !== void 0 ? _c : [];
     const currentVersion = deviceFirmwareVersion.join('.');
-    const targetDeviceConfig = targetDeviceConfigList.filter(item => semver__default["default"].gt(item.version.join('.'), currentVersion) && !!item.resource);
+    const targetDeviceConfig = targetDeviceConfigList.filter(item => forcedUpdateRes
+        ? !!item.resource
+        : semver__default["default"].gt(item.version.join('.'), currentVersion) && !!item.resource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.resource;
 };
 DataManager.getFirmwareChangelog = (features) => {
@@ -12657,11 +12837,12 @@ class FirmwareUpdate extends BaseMethod {
         validateParams(payload, [
             { name: 'version', type: 'array' },
             { name: 'binary', type: 'buffer' },
+            { name: 'forcedUpdateRes', type: 'boolean' },
         ]);
         if (!payload.updateType) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'updateType is required');
         }
-        this.params = { updateType: payload.updateType };
+        this.params = { updateType: payload.updateType, forcedUpdateRes: payload.forcedUpdateRes };
         if ('version' in payload) {
             this.params = Object.assign(Object.assign({}, this.params), { version: payload.version });
         }
@@ -12732,7 +12913,7 @@ class FirmwareUpdate extends BaseMethod {
                 }
                 if (features && this.isSupportResourceUpdate(features, params.updateType)) {
                     this.postTipMessage('CheckLatestUiResource');
-                    const resourceUrl = DataManager.getSysResourcesLatestRelease(features);
+                    const resourceUrl = DataManager.getSysResourcesLatestRelease(features, params.forcedUpdateRes);
                     if (resourceUrl) {
                         this.postTipMessage('DownloadLatestUiResource');
                         const resource = yield getSysResourceBinary(resourceUrl);
@@ -15487,6 +15668,245 @@ class AptosSignTransaction extends BaseMethod {
     }
 }
 
+class AptosSignMessage extends BaseMethod {
+    init() {
+        this.checkDeviceId = true;
+        this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
+        validateParams(this.payload, [
+            { name: 'path', required: true },
+            { name: 'payload', type: 'object', required: true },
+        ]);
+        const { path, payload } = this.payload;
+        const addressN = validatePath(path, 3);
+        validateParams(payload, [
+            { name: 'address', type: 'string' },
+            { name: 'chainId', type: 'string' },
+            { name: 'application', type: 'string' },
+            { name: 'nonce', type: 'string', required: true },
+            { name: 'message', type: 'string', required: true },
+        ]);
+        this.params = {
+            address_n: addressN,
+            payload: {
+                address: payload.address,
+                chain_id: payload.chainId,
+                application: payload.application,
+                nonce: payload.nonce,
+                message: payload.message,
+            },
+        };
+    }
+    getVersionRange() {
+        return {
+            model_mini: {
+                min: '2.6.0',
+            },
+        };
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let fullMessage = 'APTOS\n';
+            if (this.params.payload.address) {
+                fullMessage += `address: ${this.params.payload.address}\n`;
+            }
+            if (this.params.payload.application) {
+                fullMessage += `application: ${this.params.payload.application}\n`;
+            }
+            if (this.params.payload.chain_id) {
+                fullMessage += `chainId: ${this.params.payload.chain_id}\n`;
+            }
+            fullMessage += `message: ${this.params.payload.message}\n`;
+            fullMessage += `nonce: ${this.params.payload.nonce}`;
+            const res = yield this.device.commands.typedCall('AptosSignMessage', 'AptosMessageSignature', Object.assign({}, this.params));
+            const { address, signature } = res.message;
+            return Promise.resolve({
+                path: serializedPath(this.params.address_n),
+                address,
+                signature,
+                fullMessage,
+            });
+        });
+    }
+}
+
+class AlgoGetAddress extends BaseMethod {
+    constructor() {
+        super(...arguments);
+        this.hasBundle = false;
+    }
+    init() {
+        var _a;
+        this.checkDeviceId = true;
+        this.allowDeviceMode = [...this.allowDeviceMode];
+        this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
+        const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
+        validateParams(payload, [{ name: 'bundle', type: 'array' }]);
+        this.params = [];
+        payload.bundle.forEach((batch) => {
+            var _a;
+            const addressN = validatePath(batch.path, 3);
+            validateParams(batch, [
+                { name: 'path', required: true },
+                { name: 'showOnOneKey', type: 'boolean' },
+            ]);
+            const showOnOneKey = (_a = batch.showOnOneKey) !== null && _a !== void 0 ? _a : true;
+            this.params.push({
+                address_n: addressN,
+                show_display: showOnOneKey,
+            });
+        });
+    }
+    getVersionRange() {
+        return {
+            model_mini: {
+                min: '2.6.0',
+            },
+        };
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const responses = [];
+            for (let i = 0; i < this.params.length; i++) {
+                const param = this.params[i];
+                const res = yield this.device.commands.typedCall('AlgorandGetAddress', 'AlgorandAddress', Object.assign({}, param));
+                const { address } = res.message;
+                responses.push({
+                    path: serializedPath(param.address_n),
+                    address,
+                });
+            }
+            return Promise.resolve(this.hasBundle ? responses : responses[0]);
+        });
+    }
+}
+
+class AlgoSignTransaction extends BaseMethod {
+    constructor() {
+        super(...arguments);
+        this.hasBundle = false;
+    }
+    init() {
+        this.checkDeviceId = true;
+        this.allowDeviceMode = [...this.allowDeviceMode];
+        validateParams(this.payload, [
+            { name: 'path', required: true },
+            { name: 'rawTx', type: 'hexString', required: true },
+        ]);
+        const { path, rawTx } = this.payload;
+        const addressN = validatePath(path, 3);
+        this.params = {
+            address_n: addressN,
+            raw_tx: formatAnyHex(rawTx),
+        };
+    }
+    getVersionRange() {
+        return {
+            model_mini: {
+                min: '2.6.0',
+            },
+        };
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this.device.commands.typedCall('AlgorandSignTx', 'AlgorandSignedTx', Object.assign({}, this.params));
+            const { signature } = res.message;
+            return {
+                path: serializedPath(this.params.address_n),
+                signature,
+            };
+        });
+    }
+}
+
+class CosmosGetAddress extends BaseMethod {
+    constructor() {
+        super(...arguments);
+        this.hasBundle = false;
+    }
+    init() {
+        var _a;
+        this.checkDeviceId = true;
+        this.allowDeviceMode = [...this.allowDeviceMode];
+        this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
+        const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
+        validateParams(payload, [{ name: 'bundle', type: 'array' }]);
+        this.params = [];
+        payload.bundle.forEach((batch) => {
+            var _a;
+            const addressN = validatePath(batch.path, 3);
+            validateParams(batch, [
+                { name: 'path', required: true },
+                { name: 'showOnOneKey', type: 'boolean' },
+            ]);
+            const showOnOneKey = (_a = batch.showOnOneKey) !== null && _a !== void 0 ? _a : true;
+            this.params.push({
+                address_n: addressN,
+                show_display: showOnOneKey,
+            });
+        });
+    }
+    getVersionRange() {
+        return {
+            model_mini: {
+                min: '2.6.0',
+            },
+        };
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const responses = [];
+            for (let i = 0; i < this.params.length; i++) {
+                const param = this.params[i];
+                const res = yield this.device.commands.typedCall('CosmosGetAddress', 'CosmosAddress', Object.assign({}, param));
+                const { address } = res.message;
+                responses.push({
+                    path: serializedPath(param.address_n),
+                    address,
+                });
+            }
+            return Promise.resolve(this.hasBundle ? responses : responses[0]);
+        });
+    }
+}
+
+class CosmosSignTransaction extends BaseMethod {
+    constructor() {
+        super(...arguments);
+        this.hasBundle = false;
+    }
+    init() {
+        this.checkDeviceId = true;
+        this.allowDeviceMode = [...this.allowDeviceMode];
+        validateParams(this.payload, [
+            { name: 'path', required: true },
+            { name: 'rawTx', type: 'hexString', required: true },
+        ]);
+        const { path, rawTx } = this.payload;
+        const addressN = validatePath(path, 3);
+        this.params = {
+            address_n: addressN,
+            raw_tx: formatAnyHex(rawTx),
+        };
+    }
+    getVersionRange() {
+        return {
+            model_mini: {
+                min: '2.6.0',
+            },
+        };
+    }
+    run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield this.device.commands.typedCall('CosmosSignTx', 'CosmosSignedTx', Object.assign({}, this.params));
+            const { signature } = res.message;
+            return {
+                path: serializedPath(this.params.address_n),
+                signature,
+            };
+        });
+    }
+}
+
 var ApiMethods = /*#__PURE__*/Object.freeze({
     __proto__: null,
     searchDevices: SearchDevices,
@@ -15547,7 +15967,12 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
     nearSignTransaction: NearSignTransaction,
     aptosGetAddress: AptosGetAddress,
     aptosGetPublicKey: AptosGetPublicKey,
-    aptosSignTransaction: AptosSignTransaction
+    aptosSignTransaction: AptosSignTransaction,
+    aptosSignMessage: AptosSignMessage,
+    algoGetAddress: AlgoGetAddress,
+    algoSignTransaction: AlgoSignTransaction,
+    cosmosGetAddress: CosmosGetAddress,
+    cosmosSignTransaction: CosmosSignTransaction
 });
 
 function findMethod(message) {

package/dist/inject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,MAAM,+DAOhB,SAAS,KAAG,OAiKd,CAAC"}
+{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,MAAM,+DAOhB,SAAS,KAAG,OA6Kd,CAAC"}

package/dist/types/api/algoGetAddress.d.ts

@@ -0,0 +1,14 @@
+import { AlgorandAddress as HardwareAlgoGetAddress } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+export declare type AlgoAddress = {
+    path: string;
+} & HardwareAlgoGetAddress;
+export declare type AlgoGetAddressParams = {
+    path: string | number[];
+    showOnOneKey?: boolean;
+};
+export declare function algoGetAddress(connectId: string, deviceId: string, params: CommonParams & AlgoGetAddressParams): Response<AlgoAddress>;
+export declare function algoGetAddress(connectId: string, deviceId: string, params: CommonParams & {
+    bundle?: AlgoGetAddressParams[];
+}): Response<Array<AlgoAddress>>;
+//# sourceMappingURL=algoGetAddress.d.ts.map

package/dist/types/api/algoGetAddress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"algoGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/algoGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC;AAE3B,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,oBAAoB,GAC1C,QAAQ,CAAC,WAAW,CAAC,CAAC;AAEzB,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,oBAAoB,EAAE,CAAA;CAAE,GACzD,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC"}

package/dist/types/api/algoSignTransaction.d.ts

@@ -0,0 +1,11 @@
+import { AlgorandSignedTx as HardwareAlgorandSignedTx } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+export declare type AlgoSignedTx = {
+    path: string;
+} & HardwareAlgorandSignedTx;
+export declare type AlgoSignTransactionParams = {
+    path: string | number[];
+    rawTx?: string;
+};
+export declare function algoSignTransaction(connectId: string, deviceId: string, params: CommonParams & AlgoSignTransactionParams): Response<AlgoSignedTx>;
+//# sourceMappingURL=algoSignTransaction.d.ts.map

package/dist/types/api/algoSignTransaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"algoSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/algoSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,wBAAwB,CAAC;AAE7B,oBAAY,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,yBAAyB,GAC/C,QAAQ,CAAC,YAAY,CAAC,CAAC"}

package/dist/types/api/aptosSignMessage.d.ts

@@ -0,0 +1,20 @@
+import { AptosMessageSignature as HardwareAptosMessageSignature } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+export declare type AptosMessageSignature = {
+    path: string;
+    fullMessage: string;
+} & HardwareAptosMessageSignature;
+declare type AptosMessagePayload = {
+    address?: string;
+    chainId?: string;
+    application?: string;
+    nonce: string;
+    message: string;
+};
+export declare type AptosSignMessageParams = {
+    path: string | number[];
+    payload: AptosMessagePayload;
+};
+export declare function aptosSignMessage(connectId: string, deviceId: string, params: CommonParams & AptosSignMessageParams): Response<AptosMessageSignature>;
+export {};
+//# sourceMappingURL=aptosSignMessage.d.ts.map

package/dist/types/api/aptosSignMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aptosSignMessage.d.ts","sourceRoot":"","sources":["../../../src/types/api/aptosSignMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,IAAI,6BAA6B,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,6BAA6B,CAAC;AAElC,OAAO,MAAM,mBAAmB,GAAG;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,OAAO,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,sBAAsB,GAC5C,QAAQ,CAAC,qBAAqB,CAAC,CAAC"}

package/dist/types/api/cosmosGetAddress.d.ts

@@ -0,0 +1,14 @@
+import { CosmosAddress as HardwareCosmosAddress } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+export declare type CosmosAddress = {
+    path: string;
+} & HardwareCosmosAddress;
+export declare type CosmosGetAddressParams = {
+    path: string | number[];
+    showOnOneKey?: boolean;
+};
+export declare function cosmosGetAddress(connectId: string, deviceId: string, params: CommonParams & CosmosGetAddressParams): Response<CosmosAddress>;
+export declare function cosmosGetAddress(connectId: string, deviceId: string, params: CommonParams & {
+    bundle?: CosmosGetAddressParams[];
+}): Response<Array<CosmosAddress>>;
+//# sourceMappingURL=cosmosGetAddress.d.ts.map

package/dist/types/api/cosmosGetAddress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cosmosGetAddress.d.ts","sourceRoot":"","sources":["../../../src/types/api/cosmosGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,qBAAqB,CAAC;AAE1B,oBAAY,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,sBAAsB,GAC5C,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,sBAAsB,EAAE,CAAA;CAAE,GAC3D,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC"}

package/dist/types/api/cosmosSignTransaction.d.ts

@@ -0,0 +1,11 @@
+import { CosmosSignedTx as HardwareCosmosSignedTx } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+export declare type CosmosSignedTx = {
+    path: string;
+} & HardwareCosmosSignedTx;
+export declare type CosmosSignTransactionParams = {
+    path: string | number[];
+    rawTx?: string;
+};
+export declare function cosmosSignTransaction(connectId: string, deviceId: string, params: CommonParams & CosmosSignTransactionParams): Response<CosmosSignedTx>;
+//# sourceMappingURL=cosmosSignTransaction.d.ts.map

package/dist/types/api/cosmosSignTransaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cosmosSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/cosmosSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,sBAAsB,CAAC;AAE3B,oBAAY,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,2BAA2B,GACjD,QAAQ,CAAC,cAAc,CAAC,CAAC"}

package/dist/types/api/export.d.ts

@@ -42,5 +42,10 @@ export type { NearAddress, NearGetAddressParams } from './nearGetAddress';
 export type { NearSignTransactionParams } from './nearSignTransaction';
 export type { AptosAddress, AptosGetAddressParams } from './aptosGetAddress';
 export type { AptosPublicKey, AptosGetPublicKeyParams } from './aptosGetPublicKey';
+export type { AptosMessageSignature, AptosSignMessageParams } from './aptosSignMessage';
 export type { AptosSignedTx, AptosSignTransactionParams } from './aptosSignTransaction';
+export type { AlgoAddress, AlgoGetAddressParams } from './algoGetAddress';
+export type { AlgoSignedTx, AlgoSignTransactionParams } from './algoSignTransaction';
+export type { CosmosAddress, CosmosGetAddressParams } from './cosmosGetAddress';
+export type { CosmosSignedTx, CosmosSignTransactionParams } from './cosmosSignTransaction';
 //# sourceMappingURL=export.d.ts.map

package/dist/types/api/export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"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"}

package/dist/types/api/firmwareUpdate.d.ts

@@ -7,6 +7,7 @@ export interface FirmwareUpdateParams {
     version?: number[];
     btcOnly?: boolean;
     updateType: 'firmware' | 'ble';
+    forcedUpdateRes?: boolean;
 }
 export declare function firmwareUpdate(connectId: string | undefined, params: Params<FirmwareUpdateParams>): Response<PROTO.Success>;
 export declare function firmwareUpdate(connectId: string | undefined, params: Params<FirmwareUpdateBinaryParams>): Response<PROTO.Success>;

package/dist/types/api/firmwareUpdate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firmwareUpdate.d.ts","sourceRoot":"","sources":["../../../src/types/api/firmwareUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;CAChC;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,GACnC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,0BAA0B,CAAC,GACzC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"firmwareUpdate.d.ts","sourceRoot":"","sources":["../../../src/types/api/firmwareUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAElD,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,GACnC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,0BAA0B,CAAC,GACzC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC"}