@onekeyfe/hd-core 1.2.2-alpha.14 → 1.2.2-alpha.17

package/__tests__/device-lifecycle-events.test.ts

@@ -6,9 +6,9 @@ import {
   initConnector,
   initCore,
   isMissingDetectedProtocolV2Error,
-  isProtocolV2PeerRemovedPairingError,
   isRetryableBleConnectionError,
   isRetryableBleProtocolV2ProbeError,
+  isTerminalBleStaleBondError,
   resolveBleConnectProtocol,
 } from '../src/core';
 import { DataManager } from '../src/data-manager';
@@ -378,22 +378,28 @@ describe('public device lifecycle events', () => {
     expect(isRetryableBleConnectionError(method, error)).toBe(expected);
   });
 
+  test('does not retry the desktop acquire deadline fallback', () => {
+    const method = { payload: { connectProtocol: 'V2' } } as never;
+    const error = {
+      errorCode: HardwareErrorCode.BleTimeoutError,
+      params: { acquireDeadlineExceeded: true },
+    };
+
+    expect(isRetryableBleConnectionError(method, error)).toBe(false);
+  });
+
   test.each([
-    ['V2', HardwareErrorCode.BlePeerRemovedPairingInformation, true],
-    ['V2', HardwareErrorCode.BleBondInvalid, true],
-    ['V1', HardwareErrorCode.BleBondInvalid, false],
-    [undefined, HardwareErrorCode.BleBondInvalid, false],
-  ] as const)(
-    'treats stale pairing as terminal for Protocol %s with error code %s: %s',
-    (connectProtocol, errorCode, expected) => {
-      const method = { payload: { connectProtocol } } as never;
-      const error = {
-        errorCode,
-      };
+    [HardwareErrorCode.BleDeviceBondError, true],
+    [HardwareErrorCode.BlePeerRemovedPairingInformation, true],
+    [HardwareErrorCode.BleBondInvalid, true],
+    [HardwareErrorCode.DeviceNotFound, false],
+  ] as const)('treats BLE stale-bond error code %s as terminal: %s', (errorCode, expected) => {
+    const error = {
+      errorCode,
+    };
 
-      expect(isProtocolV2PeerRemovedPairingError(method, error)).toBe(expected);
-    }
-  );
+    expect(isTerminalBleStaleBondError(error)).toBe(expected);
+  });
 
   test('converts an internal transport disconnect into a public KnownDevice snapshot', () => {
     jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);

package/__tests__/protocol-v2.test.ts

@@ -555,7 +555,9 @@ describe('UploadPortfolio', () => {
     method.init();
     await method.run();
 
+    expect(method.unlockPolicy).toBe('none');
     expect(method.protocolV2UiMode).toBe('auto');
+    expect(method.protocolV2UiInteraction).toBeUndefined();
     expect(method.payload.emitProgress).toBe(true);
     expect(method.postMessage).toHaveBeenCalledWith({
       event: 'UI_EVENT',

package/__tests__/sol-sign-offchain-message.test.ts

@@ -0,0 +1,73 @@
+import { SolanaOffChainMessageFormat, SolanaOffChainMessageVersion } from '@onekeyfe/hd-transport';
+
+import SolSignOffchainMessage from '../src/api/solana/SolSignOffchainMessage';
+
+import type { Device } from '../src/device/Device';
+
+jest.mock('../src/data/config', () => ({
+  getSDKVersion: jest.fn(() => '1.0.0'),
+  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
+}));
+
+const signerA = '11'.repeat(32);
+const signerB = '22'.repeat(32);
+
+const createMethod = (overrides: Record<string, unknown> = {}) =>
+  new SolSignOffchainMessage({
+    id: 1,
+    payload: {
+      method: 'solSignOffchainMessage',
+      path: "m/44'/501'/0'/0'",
+      messageHex: '48656c6c6f',
+      messageVersion: SolanaOffChainMessageVersion.MESSAGE_VERSION_1,
+      messageFormat: SolanaOffChainMessageFormat.V0_LIMITED_UTF8,
+      applicationDomainHex: `0x${'aa'.repeat(32)}`,
+      sourceFingerprint: 0x12345678,
+      requiredSigners: [`0x${signerA.toUpperCase()}`, signerB],
+      ...overrides,
+    },
+  });
+
+describe('SolSignOffchainMessage', () => {
+  test('maps V1 public parameters to Protocol V2 fields', async () => {
+    const method = createMethod();
+    method.init();
+
+    const typedCall = jest.fn().mockResolvedValue({
+      message: { signature: 'signature', public_key: signerA },
+    });
+    method.device = { commands: { typedCall } } as unknown as Device;
+
+    await expect(method.run()).resolves.toEqual({ signature: 'signature', pub: signerA });
+    expect(typedCall).toHaveBeenCalledWith('SolanaSignOffChainMessage', 'SolanaMessageSignature', {
+      address_n: [2147483692, 2147484149, 2147483648, 2147483648],
+      message: '48656c6c6f',
+      message_version: SolanaOffChainMessageVersion.MESSAGE_VERSION_1,
+      message_format: SolanaOffChainMessageFormat.V0_LIMITED_UTF8,
+      application_domain: 'aa'.repeat(32),
+      source_fingerprint: 0x12345678,
+      required_signers: [signerA, signerB],
+    });
+  });
+
+  test.each([
+    { requiredSigners: ['11'], error: '32-byte hex public key' },
+    { requiredSigners: [signerB, signerA], error: 'strictly sorted and unique' },
+    { requiredSigners: [signerA, signerA], error: 'strictly sorted and unique' },
+    {
+      requiredSigners: Array.from({ length: 11 }, (_, index) =>
+        index.toString(16).padStart(64, '0')
+      ),
+      error: 'at most 10 entries',
+    },
+  ])('rejects invalid required signers: $error', ({ requiredSigners, error }) => {
+    expect(() => createMethod({ requiredSigners }).init()).toThrow(error);
+  });
+
+  test.each([-1, 0x100000000, 1.5])(
+    'rejects an invalid source fingerprint: %s',
+    sourceFingerprint => {
+      expect(() => createMethod({ sourceFingerprint }).init()).toThrow('uint32');
+    }
+  );
+});

package/dist/api/UploadPortfolio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAChC,CAAC;AAQF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,IAAI;IAuBE,GAAG;;;;;;;;CAsBV"}
+{"version":3,"file":"UploadPortfolio.d.ts","sourceRoot":"","sources":["../../src/api/UploadPortfolio.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;CAChC,CAAC;AAQF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,SAAS;IACpD,IAAI;IAuBE,GAAG;;;;;;;;CAsBV"}

package/dist/api/solana/SolSignOffchainMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolSignOffchainMessage.d.ts","sourceRoot":"","sources":["../../../src/api/solana/SolSignOffchainMessage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,yBAAyB,IAAI,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AAE1G,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;IAC5F,qBAAqB;IAIrB,IAAI;IA2BJ,eAAe;;;;;;;;;;;IAcT,GAAG;;;;CAcV"}
+{"version":3,"file":"SolSignOffchainMessage.d.ts","sourceRoot":"","sources":["../../../src/api/solana/SolSignOffchainMessage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EAAE,yBAAyB,IAAI,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AAmC1G,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;IAC5F,qBAAqB;IAIrB,IAAI;IAqDJ,eAAe;;;;;;;;;;;IAcT,GAAG;;;;CAcV"}

package/dist/core/index.d.ts

@@ -11,7 +11,7 @@ export declare const callAPI: (context: CoreContext, message: CoreMessage) => Pr
 export declare function isRetryableBleProtocolV2ProbeError(method: BaseMethod, error: unknown): boolean;
 export declare function isRetryableBleConnectionError(method: BaseMethod, error: unknown): boolean;
 export declare function isMissingDetectedProtocolV2Error(method: BaseMethod, error: unknown): boolean;
-export declare function isProtocolV2PeerRemovedPairingError(method: BaseMethod, error: unknown): boolean;
+export declare function isTerminalBleStaleBondError(error: unknown): boolean;
 export declare function resolveBleConnectProtocol(method: BaseMethod): ProtocolType | undefined;
 export declare const cancel: (context: CoreContext, connectId?: string) => void;
 export declare const onDeviceButtonHandler: (__0_0: Device, __0_1: import("../events").DeviceButtonRequestPayload) => void;

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,YAAY,EAIlB,MAAM,wBAAwB,CAAC;AA+BhC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAWpD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA0E7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AAyqBF,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAWpF;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAW/E;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAQlF;AAED,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAOrF;AA6JD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,CAMtF;AAwLD,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA4G9D,CAAC;AA8GF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAiLF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,sBAAsB,CAAoC;IAElE,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IA6BhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAEL,KAAK,6BAA6B,EAElC,KAAK,YAAY,EAIlB,MAAM,wBAAwB,CAAC;AAgChC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAWpD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AA0E7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AAyqBF,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAWpF;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAoB/E;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,WAQlF;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,WAEzD;AA8JD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS,CAMtF;AAwLD,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA4G9D,CAAC;AA8GF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAiLF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,sBAAsB,CAAoC;IAElE,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IA6BhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/index.d.ts

@@ -1116,6 +1116,7 @@ declare const switchTransport: ({ env, Transport, plugin, }: {
 type UploadPortfolioParams = {
     packageBase64: string;
     timeoutMs?: number | string;
+    /** Controls transfer progress UI events. Defaults to `silent`. */
     uiMode?: 'silent' | 'progress';
 };
 
@@ -2476,6 +2477,9 @@ type SolSignOffchainMessageParams = {
     messageVersion?: SolanaOffChainMessageVersion;
     messageFormat?: SolanaOffChainMessageFormat;
     applicationDomainHex?: string;
+    sourceFingerprint?: number;
+    /** 32-byte public keys encoded as hex, strictly sorted and unique. */
+    requiredSigners?: string[];
 };
 declare function solSignOffchainMessage(connectId: string, deviceId: string, params: CommonParams & SolSignOffchainMessageParams): Response<SolSignOffchainMessageResponse>;
 

package/dist/index.js

@@ -13203,7 +13203,8 @@ var nested$2 = {
 	},
 	SolanaOffChainMessageVersion: {
 		values: {
-			MESSAGE_VERSION_0: 0
+			MESSAGE_VERSION_0: 0,
+			MESSAGE_VERSION_1: 1
 		}
 	},
 	SolanaOffChainMessageFormat: {
@@ -13236,14 +13237,16 @@ var nested$2 = {
 			},
 			message_format: {
 				type: "SolanaOffChainMessageFormat",
-				id: 4,
-				options: {
-					"default": "V0_RESTRICTED_ASCII"
-				}
+				id: 4
 			},
 			application_domain: {
 				type: "bytes",
 				id: 5
+			},
+			required_signers: {
+				rule: "repeated",
+				type: "bytes",
+				id: 7
 			}
 		}
 	},
@@ -36027,7 +36030,8 @@ var nested = {
 	},
 	SolanaOffChainMessageVersion: {
 		values: {
-			MESSAGE_VERSION_0: 0
+			MESSAGE_VERSION_0: 0,
+			MESSAGE_VERSION_1: 1
 		}
 	},
 	SolanaOffChainMessageFormat: {
@@ -36115,10 +36119,7 @@ var nested = {
 			},
 			message_format: {
 				type: "SolanaOffChainMessageFormat",
-				id: 4,
-				options: {
-					"default": "V0_RESTRICTED_ASCII"
-				}
+				id: 4
 			},
 			application_domain: {
 				type: "bytes",
@@ -36127,6 +36128,11 @@ var nested = {
 			source_fingerprint: {
 				type: "uint32",
 				id: 6
+			},
+			required_signers: {
+				rule: "repeated",
+				type: "bytes",
+				id: 7
 			}
 		}
 	},
@@ -59463,6 +59469,29 @@ class SolSignTransaction extends BaseMethod {
     }
 }
 
+const SOLANA_PUBLIC_KEY_LENGTH = 32;
+const SOLANA_APPLICATION_DOMAIN_LENGTH = 32;
+const MAX_REQUIRED_SIGNERS = 10;
+const normalizeRequiredSigners = (requiredSigners) => {
+    if (!requiredSigners)
+        return undefined;
+    if (requiredSigners.length > MAX_REQUIRED_SIGNERS) {
+        throw invalidParameter(`Parameter [requiredSigners] supports at most ${MAX_REQUIRED_SIGNERS} entries.`);
+    }
+    const normalized = requiredSigners.map((signer, index) => {
+        if (typeof signer !== 'string' ||
+            !isHexString(addHexPrefix(signer), SOLANA_PUBLIC_KEY_LENGTH)) {
+            throw invalidParameter(`Parameter [requiredSigners][${index}] must be a ${SOLANA_PUBLIC_KEY_LENGTH}-byte hex public key.`);
+        }
+        return stripHexPrefix(signer).toLowerCase();
+    });
+    for (let index = 1; index < normalized.length; index += 1) {
+        if (normalized[index - 1] >= normalized[index]) {
+            throw invalidParameter('Parameter [requiredSigners] must be strictly sorted and unique.');
+        }
+    }
+    return normalized;
+};
 class SolSignOffchainMessage extends BaseMethod {
     getSupportedProtocols() {
         return ['V1', 'V2'];
@@ -59477,15 +59506,29 @@ class SolSignOffchainMessage extends BaseMethod {
             { name: 'messageVersion', type: 'number', required: false },
             { name: 'messageFormat', type: 'number', required: false },
             { name: 'applicationDomainHex', type: 'hexString', required: false },
+            { name: 'sourceFingerprint', type: 'number', required: false },
+            { name: 'requiredSigners', type: 'array', required: false, allowEmpty: true },
         ]);
-        const { path, messageHex, messageVersion, messageFormat, applicationDomainHex } = this.payload;
+        const { path, messageHex, messageVersion, messageFormat, applicationDomainHex, sourceFingerprint, requiredSigners, } = this.payload;
         const addressN = validatePath(path, 3);
+        if (sourceFingerprint !== undefined &&
+            (!Number.isInteger(sourceFingerprint) ||
+                sourceFingerprint < 0 ||
+                sourceFingerprint > 0xffffffff)) {
+            throw invalidParameter('Parameter [sourceFingerprint] must be a uint32 number.');
+        }
+        if (applicationDomainHex !== undefined &&
+            !isHexString(addHexPrefix(applicationDomainHex), SOLANA_APPLICATION_DOMAIN_LENGTH)) {
+            throw invalidParameter('Parameter [applicationDomainHex] must be 32 bytes.');
+        }
         this.params = {
             address_n: addressN,
             message: stripHexPrefix(messageHex),
             message_version: messageVersion !== null && messageVersion !== void 0 ? messageVersion : undefined,
             message_format: messageFormat !== null && messageFormat !== void 0 ? messageFormat : undefined,
-            application_domain: applicationDomainHex !== null && applicationDomainHex !== void 0 ? applicationDomainHex : undefined,
+            application_domain: applicationDomainHex ? stripHexPrefix(applicationDomainHex) : undefined,
+            source_fingerprint: sourceFingerprint !== null && sourceFingerprint !== void 0 ? sourceFingerprint : undefined,
+            required_signers: normalizeRequiredSigners(requiredSigners),
         };
     }
     getVersionRange() {
@@ -66329,11 +66372,15 @@ function isRetryableBleProtocolV2ProbeError(method, error) {
         message.includes('did not respond to expected protocol'));
 }
 function isRetryableBleConnectionError(method, error) {
-    var _a;
+    var _a, _b;
     if ((_a = method.device) === null || _a === void 0 ? void 0 : _a.wasInterruptedByUser()) {
         return false;
     }
     const typedError = error;
+    if ((typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError &&
+        ((_b = typedError.params) === null || _b === void 0 ? void 0 : _b.acquireDeadlineExceeded) === true) {
+        return false;
+    }
     return ((typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError ||
         (typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.BleConnectedError ||
         isRetryableBleProtocolV2ProbeError(method, error) ||
@@ -66346,11 +66393,8 @@ function isMissingDetectedProtocolV2Error(method, error) {
         typeof typedError.message === 'string' &&
         typedError.message.includes('Device protocol has not been detected'));
 }
-function isProtocolV2PeerRemovedPairingError(method, error) {
-    const errorCode = error === null || error === void 0 ? void 0 : error.errorCode;
-    return (method.payload.connectProtocol === 'V2' &&
-        (errorCode === hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation ||
-            errorCode === hdShared.HardwareErrorCode.BleBondInvalid));
+function isTerminalBleStaleBondError(error) {
+    return hdShared.isBleStaleBondHardwareError(error);
 }
 const BLE_ACQUIRE_DEADLINE_MS = 60 * 1000;
 function raceBleAcquire(acquirePromise, abortSignal) {
@@ -66365,7 +66409,7 @@ function raceBleAcquire(acquirePromise, abortSignal) {
             fn();
         };
         const onAbort = () => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled)));
-        const deadline = setTimeout(() => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`))), BLE_ACQUIRE_DEADLINE_MS);
+        const deadline = setTimeout(() => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`, { acquireDeadlineExceeded: true }))), BLE_ACQUIRE_DEADLINE_MS);
         acquirePromise.then(value => settle(() => resolve(value)), error => settle(() => reject(error)));
         if (abortSignal) {
             if (abortSignal.aborted) {
@@ -66582,7 +66626,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     hdShared.HardwareErrorCode.DeviceInterruptedFromUser,
                     hdShared.HardwareErrorCode.CallQueueActionCancelled,
                 ].includes(error.errorCode) ||
-                    isProtocolV2PeerRemovedPairingError(method, error)) {
+                    isTerminalBleStaleBondError(error)) {
                     reject(error);
                     return;
                 }

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

@@ -10,6 +10,8 @@ export type SolSignOffchainMessageParams = {
     messageVersion?: SolanaOffChainMessageVersion;
     messageFormat?: SolanaOffChainMessageFormat;
     applicationDomainHex?: string;
+    sourceFingerprint?: number;
+    requiredSigners?: string[];
 };
 export declare function solSignOffchainMessage(connectId: string, deviceId: string, params: CommonParams & SolSignOffchainMessageParams): Response<SolSignOffchainMessageResponse>;
 //# sourceMappingURL=solSignOffchainMessage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solSignOffchainMessage.d.ts","sourceRoot":"","sources":["../../../src/types/api/solSignOffchainMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C,aAAa,CAAC,EAAE,2BAA2B,CAAC;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,4BAA4B,GAClD,QAAQ,CAAC,8BAA8B,CAAC,CAAC"}
+{"version":3,"file":"solSignOffchainMessage.d.ts","sourceRoot":"","sources":["../../../src/types/api/solSignOffchainMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,4BAA4B,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,4BAA4B,CAAC;IAC9C,aAAa,CAAC,EAAE,2BAA2B,CAAC;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,4BAA4B,GAClD,QAAQ,CAAC,8BAA8B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.14",
+  "version": "1.2.2-alpha.17",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.2-alpha.14",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.14",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.17",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.17",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "1b3bf0576a53bedbc5f4a82308c48e11ffc00b16"
+  "gitHead": "b6c48b842d1c325dcd5ce42c03a07ee4377002dd"
 }

package/src/api/UploadPortfolio.ts

@@ -7,6 +7,7 @@ import FileWrite from './FileWrite';
 export type UploadPortfolioParams = {
   packageBase64: string;
   timeoutMs?: number | string;
+  /** Controls transfer progress UI events. Defaults to `silent`. */
   uiMode?: 'silent' | 'progress';
 };
 

package/src/api/solana/SolSignOffchainMessage.ts

@@ -1,11 +1,44 @@
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
-import { validateParams } from '../helpers/paramsValidator';
-import { stripHexPrefix } from '../helpers/hexUtils';
+import { invalidParameter, validateParams } from '../helpers/paramsValidator';
+import { addHexPrefix, isHexString, stripHexPrefix } from '../helpers/hexUtils';
 
 import type { SolanaSignOffChainMessage as HardwareSolSignOffChainMessage } from '@onekeyfe/hd-transport';
 
+const SOLANA_PUBLIC_KEY_LENGTH = 32;
+const SOLANA_APPLICATION_DOMAIN_LENGTH = 32;
+const MAX_REQUIRED_SIGNERS = 10;
+
+const normalizeRequiredSigners = (requiredSigners?: unknown[]): string[] | undefined => {
+  if (!requiredSigners) return undefined;
+  if (requiredSigners.length > MAX_REQUIRED_SIGNERS) {
+    throw invalidParameter(
+      `Parameter [requiredSigners] supports at most ${MAX_REQUIRED_SIGNERS} entries.`
+    );
+  }
+
+  const normalized = requiredSigners.map((signer, index) => {
+    if (
+      typeof signer !== 'string' ||
+      !isHexString(addHexPrefix(signer), SOLANA_PUBLIC_KEY_LENGTH)
+    ) {
+      throw invalidParameter(
+        `Parameter [requiredSigners][${index}] must be a ${SOLANA_PUBLIC_KEY_LENGTH}-byte hex public key.`
+      );
+    }
+    return stripHexPrefix(signer).toLowerCase();
+  });
+
+  for (let index = 1; index < normalized.length; index += 1) {
+    if (normalized[index - 1] >= normalized[index]) {
+      throw invalidParameter('Parameter [requiredSigners] must be strictly sorted and unique.');
+    }
+  }
+
+  return normalized;
+};
+
 export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOffChainMessage> {
   getSupportedProtocols() {
     return ['V1', 'V2'] as const;
@@ -23,10 +56,34 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
       { name: 'messageVersion', type: 'number', required: false },
       { name: 'messageFormat', type: 'number', required: false },
       { name: 'applicationDomainHex', type: 'hexString', required: false },
+      { name: 'sourceFingerprint', type: 'number', required: false },
+      { name: 'requiredSigners', type: 'array', required: false, allowEmpty: true },
     ]);
 
-    const { path, messageHex, messageVersion, messageFormat, applicationDomainHex } = this.payload;
+    const {
+      path,
+      messageHex,
+      messageVersion,
+      messageFormat,
+      applicationDomainHex,
+      sourceFingerprint,
+      requiredSigners,
+    } = this.payload;
     const addressN = validatePath(path, 3);
+    if (
+      sourceFingerprint !== undefined &&
+      (!Number.isInteger(sourceFingerprint) ||
+        sourceFingerprint < 0 ||
+        sourceFingerprint > 0xffffffff)
+    ) {
+      throw invalidParameter('Parameter [sourceFingerprint] must be a uint32 number.');
+    }
+    if (
+      applicationDomainHex !== undefined &&
+      !isHexString(addHexPrefix(applicationDomainHex), SOLANA_APPLICATION_DOMAIN_LENGTH)
+    ) {
+      throw invalidParameter('Parameter [applicationDomainHex] must be 32 bytes.');
+    }
 
     // init params
     this.params = {
@@ -34,7 +91,9 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
       message: stripHexPrefix(messageHex),
       message_version: messageVersion ?? undefined,
       message_format: messageFormat ?? undefined,
-      application_domain: applicationDomainHex ?? undefined,
+      application_domain: applicationDomainHex ? stripHexPrefix(applicationDomainHex) : undefined,
+      source_fingerprint: sourceFingerprint ?? undefined,
+      required_signers: normalizeRequiredSigners(requiredSigners),
     };
   }
 

package/src/core/index.ts

@@ -22,6 +22,7 @@ import {
   createNeedUpgradeFirmwareHardwareError,
   createNewFirmwareForceUpdateHardwareError,
   createNewFirmwareUnReleaseHardwareError,
+  isBleStaleBondHardwareError,
 } from '@onekeyfe/hd-shared';
 
 import { LoggerNames, enableLog, getLogger, setLoggerPostMessage, wait } from '../utils';
@@ -945,7 +946,16 @@ export function isRetryableBleConnectionError(method: BaseMethod, error: unknown
   if (method.device?.wasInterruptedByUser()) {
     return false;
   }
-  const typedError = error as { errorCode?: unknown };
+  const typedError = error as {
+    errorCode?: unknown;
+    params?: { acquireDeadlineExceeded?: unknown };
+  };
+  if (
+    typedError?.errorCode === HardwareErrorCode.BleTimeoutError &&
+    typedError.params?.acquireDeadlineExceeded === true
+  ) {
+    return false;
+  }
   return (
     typedError?.errorCode === HardwareErrorCode.BleTimeoutError ||
     typedError?.errorCode === HardwareErrorCode.BleConnectedError ||
@@ -964,13 +974,8 @@ export function isMissingDetectedProtocolV2Error(method: BaseMethod, error: unkn
   );
 }
 
-export function isProtocolV2PeerRemovedPairingError(method: BaseMethod, error: unknown) {
-  const errorCode = (error as { errorCode?: unknown })?.errorCode;
-  return (
-    method.payload.connectProtocol === 'V2' &&
-    (errorCode === HardwareErrorCode.BlePeerRemovedPairingInformation ||
-      errorCode === HardwareErrorCode.BleBondInvalid)
-  );
+export function isTerminalBleStaleBondError(error: unknown) {
+  return isBleStaleBondHardwareError(error);
 }
 
 /**
@@ -1002,7 +1007,8 @@ function raceBleAcquire<T>(acquirePromise: Promise<T>, abortSignal?: AbortSignal
           reject(
             ERRORS.TypedError(
               HardwareErrorCode.BleTimeoutError,
-              `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`
+              `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`,
+              { acquireDeadlineExceeded: true }
             )
           )
         ),
@@ -1284,7 +1290,7 @@ const ensureConnected = async (
             HardwareErrorCode.DeviceInterruptedFromUser,
             HardwareErrorCode.CallQueueActionCancelled,
           ].includes(error.errorCode) ||
-          isProtocolV2PeerRemovedPairingError(method, error)
+          isTerminalBleStaleBondError(error)
         ) {
           reject(error);
           return;

package/src/data/messages/messages-protocol-v2.json

@@ -8968,7 +8968,8 @@
     },
     "SolanaOffChainMessageVersion": {
       "values": {
-        "MESSAGE_VERSION_0": 0
+        "MESSAGE_VERSION_0": 0,
+        "MESSAGE_VERSION_1": 1
       }
     },
     "SolanaOffChainMessageFormat": {
@@ -9056,10 +9057,7 @@
         },
         "message_format": {
           "type": "SolanaOffChainMessageFormat",
-          "id": 4,
-          "options": {
-            "default": "V0_RESTRICTED_ASCII"
-          }
+          "id": 4
         },
         "application_domain": {
           "type": "bytes",
@@ -9068,6 +9066,11 @@
         "source_fingerprint": {
           "type": "uint32",
           "id": 6
+        },
+        "required_signers": {
+          "rule": "repeated",
+          "type": "bytes",
+          "id": 7
         }
       }
     },

package/src/data/messages/messages.json

@@ -10243,7 +10243,8 @@
     },
     "SolanaOffChainMessageVersion": {
       "values": {
-        "MESSAGE_VERSION_0": 0
+        "MESSAGE_VERSION_0": 0,
+        "MESSAGE_VERSION_1": 1
       }
     },
     "SolanaOffChainMessageFormat": {
@@ -10276,14 +10277,16 @@
         },
         "message_format": {
           "type": "SolanaOffChainMessageFormat",
-          "id": 4,
-          "options": {
-            "default": "V0_RESTRICTED_ASCII"
-          }
+          "id": 4
         },
         "application_domain": {
           "type": "bytes",
           "id": 5
+        },
+        "required_signers": {
+          "rule": "repeated",
+          "type": "bytes",
+          "id": 7
         }
       }
     },

package/src/types/api/solSignOffchainMessage.ts

@@ -15,6 +15,9 @@ export type SolSignOffchainMessageParams = {
   messageVersion?: SolanaOffChainMessageVersion;
   messageFormat?: SolanaOffChainMessageFormat;
   applicationDomainHex?: string;
+  sourceFingerprint?: number;
+  /** 32-byte public keys encoded as hex, strictly sorted and unique. */
+  requiredSigners?: string[];
 };
 
 export declare function solSignOffchainMessage(