@onekeyfe/hd-core 1.2.2-alpha.101 → 1.2.2-alpha.102

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

@@ -25,15 +25,17 @@ const createMethod = (overrides: Record<string, unknown> = {}) =>
       messageVersion: SolanaOffChainMessageVersion.MESSAGE_VERSION_1,
       messageFormat: SolanaOffChainMessageFormat.V0_LIMITED_UTF8,
       applicationDomainHex: `0x${'aa'.repeat(32)}`,
-      sourceFingerprint: 0x12345678,
       requiredSigners,
       ...overrides,
     },
   });
 
 describe('SolSignOffchainMessage', () => {
-  test('maps V1 parameters without imposing a host-side signer count limit', async () => {
-    const method = createMethod();
+  test.each([
+    { description: 'without a host-side signer count limit', requiredSigners },
+    { description: 'with omitted optional signers', requiredSigners: undefined },
+  ])('maps V1 parameters $description', async ({ requiredSigners }) => {
+    const method = createMethod({ requiredSigners });
     method.init();
 
     const typedCall = jest.fn().mockResolvedValue({
@@ -48,8 +50,7 @@ describe('SolSignOffchainMessage', () => {
       message_version: SolanaOffChainMessageVersion.MESSAGE_VERSION_1,
       message_format: SolanaOffChainMessageFormat.V0_LIMITED_UTF8,
       application_domain: 'aa'.repeat(32),
-      source_fingerprint: 0x12345678,
-      required_signers: requiredSigners,
+      required_signers: requiredSigners ?? [],
     });
   });
 
@@ -60,11 +61,4 @@ describe('SolSignOffchainMessage', () => {
   ])('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/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;AA6B1G,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;IAC5F,qBAAqB;IAIrB,IAAI;IAqDJ,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;AA2B1G,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU,CAAC,8BAA8B,CAAC;IAC5F,qBAAqB;IAIrB,IAAI;IA0CJ,eAAe;;;;;;;;;;;IAcT,GAAG;;;;CAcV"}

package/dist/index.d.ts

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

package/dist/index.js

@@ -31502,10 +31502,6 @@ var nested = {
 			request_id: {
 				type: "bytes",
 				id: 5
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 6
 			}
 		}
 	},
@@ -31761,10 +31757,6 @@ var nested = {
 			expected_address: {
 				type: "bytes",
 				id: 12
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 13
 			}
 		}
 	},
@@ -31849,10 +31841,6 @@ var nested = {
 			expected_address: {
 				type: "bytes",
 				id: 12
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 13
 			}
 		}
 	},
@@ -32000,7 +31988,29 @@ var nested = {
 				type: "EthereumAuthorizationSignature",
 				id: 10
 			}
-		}
+		},
+		reserved: [
+			[
+				5,
+				5
+			],
+			[
+				6,
+				6
+			],
+			[
+				7,
+				7
+			],
+			[
+				8,
+				8
+			],
+			[
+				9,
+				9
+			]
+		]
 	},
 	EthereumTxAckOneKey: {
 		fields: {
@@ -32029,10 +32039,6 @@ var nested = {
 			chain_id: {
 				type: "uint64",
 				id: 3
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 4
 			}
 		}
 	},
@@ -36079,10 +36085,6 @@ var nested = {
 				rule: "required",
 				type: "bytes",
 				id: 2
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -36125,14 +36127,10 @@ var nested = {
 				type: "bytes",
 				id: 5
 			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 6
-			},
 			required_signers: {
 				rule: "repeated",
 				type: "bytes",
-				id: 7
+				id: 6
 			}
 		}
 	},
@@ -36150,10 +36148,6 @@ var nested = {
 				rule: "required",
 				type: "bytes",
 				id: 2
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -38969,6 +38963,10 @@ var nested = {
 			manufacture_time: {
 				type: "DeviceFactoryInfoManufactureTime",
 				id: 5
+			},
+			data: {
+				type: "bytes",
+				id: 100
 			}
 		}
 	},
@@ -38978,11 +38976,19 @@ var nested = {
 				rule: "required",
 				type: "DeviceFactoryInfo",
 				id: 1
+			},
+			full_data: {
+				type: "bool",
+				id: 2
 			}
 		}
 	},
 	DeviceFactoryInfoGet: {
 		fields: {
+			full_data: {
+				type: "bool",
+				id: 1
+			}
 		}
 	},
 	DeviceFactoryPermanentLock: {
@@ -59471,9 +59477,7 @@ class SolSignTransaction extends BaseMethod {
 
 const SOLANA_PUBLIC_KEY_LENGTH = 32;
 const SOLANA_APPLICATION_DOMAIN_LENGTH = 32;
-const normalizeRequiredSigners = (requiredSigners) => {
-    if (!requiredSigners)
-        return undefined;
+const normalizeRequiredSigners = (requiredSigners = []) => {
     const normalized = requiredSigners.map((signer, index) => {
         if (typeof signer !== 'string' ||
             !isHexString(addHexPrefix(signer), SOLANA_PUBLIC_KEY_LENGTH)) {
@@ -59502,17 +59506,10 @@ 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, sourceFingerprint, requiredSigners, } = this.payload;
+        const { path, messageHex, messageVersion, messageFormat, applicationDomainHex, 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.');
@@ -59523,7 +59520,6 @@ class SolSignOffchainMessage extends BaseMethod {
             message_version: messageVersion !== null && messageVersion !== void 0 ? messageVersion : undefined,
             message_format: messageFormat !== null && messageFormat !== void 0 ? messageFormat : undefined,
             application_domain: applicationDomainHex ? stripHexPrefix(applicationDomainHex) : undefined,
-            source_fingerprint: sourceFingerprint !== null && sourceFingerprint !== void 0 ? sourceFingerprint : undefined,
             required_signers: normalizeRequiredSigners(requiredSigners),
         };
     }

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

@@ -10,7 +10,6 @@ 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>;

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;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"}
+{"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;IAE9B,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.101",
+  "version": "1.2.2-alpha.102",
   "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.101",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.101",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.102",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.102",
     "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": "b9a5ca0c73e5e2cc979c91c007ace476e442718c"
+  "gitHead": "abddc95e03d794d9c6fce7765d59de1f48a684d0"
 }

package/src/api/solana/SolSignOffchainMessage.ts

@@ -9,9 +9,7 @@ import type { SolanaSignOffChainMessage as HardwareSolSignOffChainMessage } from
 const SOLANA_PUBLIC_KEY_LENGTH = 32;
 const SOLANA_APPLICATION_DOMAIN_LENGTH = 32;
 
-const normalizeRequiredSigners = (requiredSigners?: unknown[]): string[] | undefined => {
-  if (!requiredSigners) return undefined;
-
+const normalizeRequiredSigners = (requiredSigners: unknown[] = []): string[] => {
   const normalized = requiredSigners.map((signer, index) => {
     if (
       typeof signer !== 'string' ||
@@ -50,7 +48,6 @@ 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 },
     ]);
 
@@ -60,18 +57,9 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
       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)
@@ -86,7 +74,6 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
       message_version: messageVersion ?? undefined,
       message_format: messageFormat ?? undefined,
       application_domain: applicationDomainHex ? stripHexPrefix(applicationDomainHex) : undefined,
-      source_fingerprint: sourceFingerprint ?? undefined,
       required_signers: normalizeRequiredSigners(requiredSigners),
     };
   }

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

@@ -4463,10 +4463,6 @@
         "request_id": {
           "type": "bytes",
           "id": 5
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 6
         }
       }
     },
@@ -4722,10 +4718,6 @@
         "expected_address": {
           "type": "bytes",
           "id": 12
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 13
         }
       }
     },
@@ -4810,10 +4802,6 @@
         "expected_address": {
           "type": "bytes",
           "id": 12
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 13
         }
       }
     },
@@ -4961,7 +4949,14 @@
           "type": "EthereumAuthorizationSignature",
           "id": 10
         }
-      }
+      },
+      "reserved": [
+        [5, 5],
+        [6, 6],
+        [7, 7],
+        [8, 8],
+        [9, 9]
+      ]
     },
     "EthereumTxAckOneKey": {
       "fields": {
@@ -4990,10 +4985,6 @@
         "chain_id": {
           "type": "uint64",
           "id": 3
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 4
         }
       }
     },
@@ -9017,10 +9008,6 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 3
         }
       }
     },
@@ -9063,14 +9050,10 @@
           "type": "bytes",
           "id": 5
         },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 6
-        },
         "required_signers": {
           "rule": "repeated",
           "type": "bytes",
-          "id": 7
+          "id": 6
         }
       }
     },
@@ -9088,10 +9071,6 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 3
         }
       }
     },
@@ -11888,6 +11867,10 @@
         "manufacture_time": {
           "type": "DeviceFactoryInfoManufactureTime",
           "id": 5
+        },
+        "data": {
+          "type": "bytes",
+          "id": 100
         }
       }
     },
@@ -11897,11 +11880,20 @@
           "rule": "required",
           "type": "DeviceFactoryInfo",
           "id": 1
+        },
+        "full_data": {
+          "type": "bool",
+          "id": 2
         }
       }
     },
     "DeviceFactoryInfoGet": {
-      "fields": {}
+      "fields": {
+        "full_data": {
+          "type": "bool",
+          "id": 1
+        }
+      }
     },
     "DeviceFactoryPermanentLock": {
       "fields": {

package/src/types/api/solSignOffchainMessage.ts

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