@onekeyfe/hd-shared 1.2.0-alpha.65 → 1.2.0-alpha.66

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.
@@ -115,9 +115,9 @@ export declare const HardwareErrorCode: {
115
115
  readonly DeviceSettingsLanguageNotSupport: 826;
116
116
  readonly TooManyInputs: 827;
117
117
  readonly PinMismatch: 828;
118
- readonly KaspaPrevTxIdMismatch: 829;
119
118
  readonly DeviceLocked: 830;
120
119
  readonly WalletSessionInvalid: 831;
120
+ readonly NftStorageLimitReached: 832;
121
121
  readonly LowlevelTrasnportConnectError: 900;
122
122
  readonly WebDeviceNotFoundOrNeedsPermission: 901;
123
123
  readonly WebDevicePromptAccessError: 902;
@@ -1 +1 @@
1
- {"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAsCxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAubpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAmJ7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}
1
+ {"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAsCxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwbpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAoJ7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}
@@ -54,6 +54,7 @@ type BluetoothDeviceIdentity = {
54
54
  export declare const normalizeBleUuid: (uuid?: string | null) => string;
55
55
  export declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<string>;
56
56
  export declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
57
+ export declare const isPro2FindMyAdvertisementName: (value?: string | null) => boolean;
57
58
  export declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
58
59
  export declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
59
60
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,yBAAyB;;;CAG5B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GACjC,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAC;AAE7E,eAAO,MAAM,oBAAoB;;;GAOhC,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAIF,eAAO,MAAM,yBAAyB,eAAgB,wBAAwB,KAAG,OAQhF,CAAC;AAMF,eAAO,MAAM,2BAA2B,mDAS9B,CAAC;AAMX,eAAO,MAAM,8BAA8B,qBAGjC,CAAC;AAGX,oBAAY,qBAAqB;IAE/B,UAAU,uBAAuB;IACjC,iBAAiB,8BAA8B;IAC/C,aAAa,0BAA0B;IACvC,kBAAkB,+BAA+B;IACjD,cAAc,2BAA2B;IACzC,oBAAoB,iCAAiC;IAGrD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IAGrD,aAAa,0BAA0B;IACvC,oBAAoB,iCAAiC;IAGrD,uBAAuB,oCAAoC;IAC3D,sBAAsB,mCAAmC;IAGzD,mBAAmB,gCAAgC;IACnD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IACrD,iBAAiB,8BAA8B;IAC/C,oBAAoB,iCAAiC;IACrD,eAAe,4BAA4B;IAC3C,mBAAmB,gCAAgC;IACnD,qBAAqB,kCAAkC;IACvD,sBAAsB,mCAAmC;IACzD,wBAAwB,qCAAqC;CAC9D;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,gCAAgC,yCAAyC,CAAC;AACvF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AAIxF,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,UAAU,KAAG,OAa1D,CAAC;AAkBF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,OAAO,MAAM,KAAG,OAsBjE,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC;CACxD,CAAC;AAIF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,yBAAyB,SAAU,MAAM,KAAG,YAAY,MAAM,CAc1E,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,MAAM,GAAG,IAAI,GAAG,SAAS,WAC5B,YAAY,MAAM,CAAC,YACgB,CAAC;AAQ/C,eAAO,MAAM,6BAA6B,iBAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,YAIhE,CAAC;AAEJ,eAAO,MAAM,uBAAuB,2CAKjC,uBAAuB,KAAG,OAe5B,CAAC"}
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,yBAAyB;;;CAG5B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GACjC,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAC;AAE7E,eAAO,MAAM,oBAAoB;;;GAOhC,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAIF,eAAO,MAAM,yBAAyB,eAAgB,wBAAwB,KAAG,OAQhF,CAAC;AAMF,eAAO,MAAM,2BAA2B,mDAS9B,CAAC;AAMX,eAAO,MAAM,8BAA8B,qBAGjC,CAAC;AAGX,oBAAY,qBAAqB;IAE/B,UAAU,uBAAuB;IACjC,iBAAiB,8BAA8B;IAC/C,aAAa,0BAA0B;IACvC,kBAAkB,+BAA+B;IACjD,cAAc,2BAA2B;IACzC,oBAAoB,iCAAiC;IAGrD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IAGrD,aAAa,0BAA0B;IACvC,oBAAoB,iCAAiC;IAGrD,uBAAuB,oCAAoC;IAC3D,sBAAsB,mCAAmC;IAGzD,mBAAmB,gCAAgC;IACnD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IACrD,iBAAiB,8BAA8B;IAC/C,oBAAoB,iCAAiC;IACrD,eAAe,4BAA4B;IAC3C,mBAAmB,gCAAgC;IACnD,qBAAqB,kCAAkC;IACvD,sBAAsB,mCAAmC;IACzD,wBAAwB,qCAAqC;CAC9D;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,gCAAgC,yCAAyC,CAAC;AACvF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AAIxF,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,UAAU,KAAG,OAa1D,CAAC;AAkBF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,OAAO,MAAM,KAAG,OAuBjE,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC;CACxD,CAAC;AAIF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,yBAAyB,SAAU,MAAM,KAAG,YAAY,MAAM,CAc1E,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,MAAM,GAAG,IAAI,GAAG,SAAS,WAC5B,YAAY,MAAM,CAAC,YACgB,CAAC;AAK/C,eAAO,MAAM,6BAA6B,WAAY,MAAM,GAAG,IAAI,YAGlE,CAAC;AAEF,eAAO,MAAM,6BAA6B,iBAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,YAIhE,CAAC;AAEJ,eAAO,MAAM,uBAAuB,2CAKjC,uBAAuB,KAAG,OAiB5B,CAAC"}
@@ -6,6 +6,7 @@ export declare enum EDeviceType {
6
6
  Mini = "mini",
7
7
  Touch = "touch",
8
8
  Pro = "pro",
9
- Pro2 = "pro2"
9
+ Pro2 = "pro2",
10
+ Neo = "neo"
10
11
  }
11
12
  //# sourceMappingURL=deviceType.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"deviceType.d.ts","sourceRoot":"","sources":["../src/deviceType.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,IAAI,SAAS;CACd"}
1
+ {"version":3,"file":"deviceType.d.ts","sourceRoot":"","sources":["../src/deviceType.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;CACZ"}
package/dist/index.d.ts CHANGED
@@ -61,6 +61,7 @@ type BluetoothDeviceIdentity = {
61
61
  declare const normalizeBleUuid: (uuid?: string | null) => string;
62
62
  declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<string>;
63
63
  declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
64
+ declare const isPro2FindMyAdvertisementName: (value?: string | null) => boolean;
64
65
  declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
65
66
  declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
66
67
 
@@ -425,10 +426,6 @@ declare const HardwareErrorCode: {
425
426
  * The two PIN entries did not match while setting/changing PIN on device
426
427
  */
427
428
  readonly PinMismatch: 828;
428
- /**
429
- * Device refused to sign: refTxs don't match the spent input's outpoint
430
- */
431
- readonly KaspaPrevTxIdMismatch: 829;
432
429
  /**
433
430
  * Protocol V2 device must be unlocked before the requested operation.
434
431
  * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
@@ -439,6 +436,11 @@ declare const HardwareErrorCode: {
439
436
  * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
440
437
  */
441
438
  readonly WalletSessionInvalid: 831;
439
+ /**
440
+ * Pro2 NFT storage has reached its item limit.
441
+ * @params: { count: number; limit: number }
442
+ */
443
+ readonly NftStorageLimitReached: 832;
442
444
  /**
443
445
  * Lowlevel transport connect error
444
446
  */
@@ -521,7 +523,8 @@ declare enum EDeviceType {
521
523
  Mini = "mini",
522
524
  Touch = "touch",
523
525
  Pro = "pro",
524
- Pro2 = "pro2"
526
+ Pro2 = "pro2",
527
+ Neo = "neo"
525
528
  }
526
529
 
527
- export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, ERROR_CODES_REQUIRE_DISCONNECT, ERROR_CODES_REQUIRE_RELEASE, HARDWARE_CONNECT_PROTOCOL, HardwareConnectProtocol, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, ONEKEY_NOTIFY_CHARACTERISTIC_UUID, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createKnownBleUuidAliases, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, hasOnekeyCommunicationService, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, matchesKnownBleUuid, normalizeBleUuid, serializeError, wait };
530
+ export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, ERROR_CODES_REQUIRE_DISCONNECT, ERROR_CODES_REQUIRE_RELEASE, HARDWARE_CONNECT_PROTOCOL, HardwareConnectProtocol, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, ONEKEY_NOTIFY_CHARACTERISTIC_UUID, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createKnownBleUuidAliases, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, hasOnekeyCommunicationService, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, isPro2FindMyAdvertisementName, matchesKnownBleUuid, normalizeBleUuid, serializeError, wait };
package/dist/index.js CHANGED
@@ -164,9 +164,9 @@ const HardwareErrorCode = {
164
164
  DeviceSettingsLanguageNotSupport: 826,
165
165
  TooManyInputs: 827,
166
166
  PinMismatch: 828,
167
- KaspaPrevTxIdMismatch: 829,
168
167
  DeviceLocked: 830,
169
168
  WalletSessionInvalid: 831,
169
+ NftStorageLimitReached: 832,
170
170
  LowlevelTrasnportConnectError: 900,
171
171
  WebDeviceNotFoundOrNeedsPermission: 901,
172
172
  WebDevicePromptAccessError: 902,
@@ -272,8 +272,8 @@ const HardwareErrorCodeMessage = {
272
272
  [HardwareErrorCode.TooManyInputs]: 'Too many inputs',
273
273
  [HardwareErrorCode.PinMismatch]: 'PIN mismatch',
274
274
  [HardwareErrorCode.DeviceLocked]: 'Device locked',
275
- [HardwareErrorCode.KaspaPrevTxIdMismatch]: 'Kaspa previous transaction id mismatch',
276
275
  [HardwareErrorCode.WalletSessionInvalid]: 'Wallet session is invalid or expired',
276
+ [HardwareErrorCode.NftStorageLimitReached]: 'NFT storage limit reached. Remove an NFT from the device and try again.',
277
277
  [HardwareErrorCode.LowlevelTrasnportConnectError]: 'Lowlevel transport connect error',
278
278
  [HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission]: 'Web-USB or Web-Bluetooth device not found or needs permission',
279
279
  [HardwareErrorCode.WebDevicePromptAccessError]: 'Web-USB or Web-Bluetooth device prompt access error',
@@ -491,7 +491,8 @@ const isOnekeyDevice = (name, id) => {
491
491
  return true;
492
492
  if (normalizedName.startsWith('touch ') ||
493
493
  normalizedName.startsWith('pro ') ||
494
- normalizedName.startsWith('pro2 ')) {
494
+ normalizedName.startsWith('pro2 ') ||
495
+ normalizedName.startsWith('neo ')) {
495
496
  return true;
496
497
  }
497
498
  return isOneKeyShortName(normalizedName);
@@ -514,16 +515,20 @@ const createKnownBleUuidAliases = (uuid) => {
514
515
  const matchesKnownBleUuid = (actualUuid, aliases) => aliases.has(normalizeBleUuid(actualUuid));
515
516
  const ONEKEY_COMMUNICATION_SERVICE_ALIASES = createKnownBleUuidAliases(ONEKEY_SERVICE_UUID);
516
517
  const FIDO_SERVICE_ALIASES = createKnownBleUuidAliases('0000fffd-0000-1000-8000-00805f9b34fb');
517
- const isFindMyAdvertisementName = (value) => { var _a; return /\bfinde?\s+my\b/.test((_a = value === null || value === void 0 ? void 0 : value.trim().toLowerCase()) !== null && _a !== void 0 ? _a : ''); };
518
+ const isPro2FindMyAdvertisementName = (value) => {
519
+ var _a;
520
+ const normalizedName = (_a = value === null || value === void 0 ? void 0 : value.trim().toLowerCase()) !== null && _a !== void 0 ? _a : '';
521
+ return /\bpro\s*2\b/.test(normalizedName) && /\bfinde?\s+my\b/.test(normalizedName);
522
+ };
518
523
  const hasOnekeyCommunicationService = (serviceUuids) => (serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : []).some(uuid => matchesKnownBleUuid(uuid, ONEKEY_COMMUNICATION_SERVICE_ALIASES));
519
524
  const isOnekeyBluetoothDevice = ({ id, name, localName, serviceUuids, }) => {
520
525
  const advertisedServiceUuids = serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : [];
521
- if (isFindMyAdvertisementName(name) || isFindMyAdvertisementName(localName)) {
522
- return false;
523
- }
524
526
  if (hasOnekeyCommunicationService(advertisedServiceUuids)) {
525
527
  return true;
526
528
  }
529
+ if (isPro2FindMyAdvertisementName(name) || isPro2FindMyAdvertisementName(localName)) {
530
+ return false;
531
+ }
527
532
  if (advertisedServiceUuids.some(uuid => matchesKnownBleUuid(uuid, FIDO_SERVICE_ALIASES))) {
528
533
  return false;
529
534
  }
@@ -601,6 +606,7 @@ exports.EDeviceType = void 0;
601
606
  EDeviceType["Touch"] = "touch";
602
607
  EDeviceType["Pro"] = "pro";
603
608
  EDeviceType["Pro2"] = "pro2";
609
+ EDeviceType["Neo"] = "neo";
604
610
  })(exports.EDeviceType || (exports.EDeviceType = {}));
605
611
 
606
612
  exports.CreateErrorByMessage = CreateErrorByMessage;
@@ -630,6 +636,7 @@ exports.isHeaderChunk = isHeaderChunk;
630
636
  exports.isKnownTrezorWebUsbDevice = isKnownTrezorWebUsbDevice;
631
637
  exports.isOnekeyBluetoothDevice = isOnekeyBluetoothDevice;
632
638
  exports.isOnekeyDevice = isOnekeyDevice;
639
+ exports.isPro2FindMyAdvertisementName = isPro2FindMyAdvertisementName;
633
640
  exports.matchesKnownBleUuid = matchesKnownBleUuid;
634
641
  exports.normalizeBleUuid = normalizeBleUuid;
635
642
  exports.serializeError = serializeError;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-shared",
3
- "version": "1.2.0-alpha.65",
3
+ "version": "1.2.0-alpha.66",
4
4
  "description": "Hardware SDK's shared tool library",
5
5
  "keywords": [
6
6
  "Hardware-SDK",
@@ -26,5 +26,5 @@
26
26
  "lint": "eslint .",
27
27
  "lint:fix": "eslint . --fix"
28
28
  },
29
- "gitHead": "2850b5b34935d4e97a1fe8a6459eb5a96a5cf0f6"
29
+ "gitHead": "81629c086665bb92ce4d52087ae47f084976da79"
30
30
  }
@@ -1,8 +1,8 @@
1
1
  import { HardwareErrorCode } from './HardwareError';
2
2
 
3
3
  describe('HardwareErrorCode compatibility', () => {
4
- test('preserves published values when adding Protocol V2 errors', () => {
5
- expect(HardwareErrorCode.KaspaPrevTxIdMismatch).toBe(829);
4
+ test('preserves published Protocol V2 values while leaving code 829 unused', () => {
5
+ expect(HardwareErrorCode).not.toHaveProperty('KaspaPrevTxIdMismatch');
6
6
  expect(HardwareErrorCode.DeviceLocked).toBe(830);
7
7
  expect(HardwareErrorCode.WalletSessionInvalid).toBe(831);
8
8
  });
@@ -484,11 +484,6 @@ export const HardwareErrorCode = {
484
484
  */
485
485
  PinMismatch: 828,
486
486
 
487
- /**
488
- * Device refused to sign: refTxs don't match the spent input's outpoint
489
- */
490
- KaspaPrevTxIdMismatch: 829,
491
-
492
487
  /**
493
488
  * Protocol V2 device must be unlocked before the requested operation.
494
489
  * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
@@ -501,6 +496,12 @@ export const HardwareErrorCode = {
501
496
  */
502
497
  WalletSessionInvalid: 831,
503
498
 
499
+ /**
500
+ * Pro2 NFT storage has reached its item limit.
501
+ * @params: { count: number; limit: number }
502
+ */
503
+ NftStorageLimitReached: 832,
504
+
504
505
  /**
505
506
  * Lowlevel transport connect error
506
507
  */
@@ -653,8 +654,9 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
653
654
  [HardwareErrorCode.TooManyInputs]: 'Too many inputs',
654
655
  [HardwareErrorCode.PinMismatch]: 'PIN mismatch',
655
656
  [HardwareErrorCode.DeviceLocked]: 'Device locked',
656
- [HardwareErrorCode.KaspaPrevTxIdMismatch]: 'Kaspa previous transaction id mismatch',
657
657
  [HardwareErrorCode.WalletSessionInvalid]: 'Wallet session is invalid or expired',
658
+ [HardwareErrorCode.NftStorageLimitReached]:
659
+ 'NFT storage limit reached. Remove an NFT from the device and try again.',
658
660
 
659
661
  /**
660
662
  * Lowlevel transport
@@ -11,6 +11,7 @@ describe('hardware device identity filters', () => {
11
11
  it('accepts known OneKey BLE names', () => {
12
12
  expect(isOnekeyDevice('Touch A1B2')).toBe(true);
13
13
  expect(isOnekeyDevice('Pro A1B2')).toBe(true);
14
+ expect(isOnekeyDevice('Neo A1B2')).toBe(true);
14
15
  expect(isOnekeyDevice('K1234')).toBe(true);
15
16
  expect(isOnekeyDevice('S8')).toBe(true);
16
17
  });
@@ -20,14 +21,14 @@ describe('hardware device identity filters', () => {
20
21
  expect(isOnekeyDevice('Ledger Nano X')).toBe(false);
21
22
  });
22
23
 
23
- it('does not identify an unnamed FFFD or Find My advertisement as OneKey', () => {
24
+ it('does not identify an FFFD-only advertisement as OneKey', () => {
24
25
  expect(isOnekeyBluetoothDevice({ name: 'Find My', serviceUuids: ['fffd'] })).toBe(false);
25
26
  expect(
26
27
  isOnekeyBluetoothDevice({ serviceUuids: ['0000fffd-0000-1000-8000-00805f9b34fb'] })
27
28
  ).toBe(false);
28
29
  });
29
30
 
30
- it('keeps Pro2 communication advertisements and rejects its Find My advertisement', () => {
31
+ it('identifies Pro2 communication advertisements independently of their display name', () => {
31
32
  expect(
32
33
  isOnekeyBluetoothDevice({
33
34
  name: 'Pro2 A1B2',
@@ -37,14 +38,34 @@ describe('hardware device identity filters', () => {
37
38
  expect(
38
39
  isOnekeyBluetoothDevice({
39
40
  localName: 'Pro2 A1B2 - Find My',
40
- serviceUuids: ['fffd'],
41
+ serviceUuids: ['0001', 'fffd'],
41
42
  })
42
- ).toBe(false);
43
+ ).toBe(true);
43
44
  expect(
44
45
  isOnekeyBluetoothDevice({
45
46
  name: 'Pro2 5E9D - Finde My',
46
47
  serviceUuids: ['0001', 'fffd'],
47
48
  })
49
+ ).toBe(true);
50
+ });
51
+
52
+ it('rejects Pro2 Find My entries when the communication service is absent', () => {
53
+ expect(
54
+ isOnekeyBluetoothDevice({
55
+ name: 'Pro2 A1B2 - Find My',
56
+ })
57
+ ).toBe(false);
58
+ expect(
59
+ isOnekeyBluetoothDevice({
60
+ localName: 'OneKey Pro 2 A1B2 - Find My',
61
+ serviceUuids: [],
62
+ })
63
+ ).toBe(false);
64
+ expect(
65
+ isOnekeyBluetoothDevice({
66
+ name: 'Pro2 5E9D - Finde My',
67
+ serviceUuids: ['fffd'],
68
+ })
48
69
  ).toBe(false);
49
70
  });
50
71
 
package/src/constants.ts CHANGED
@@ -148,7 +148,8 @@ export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
148
148
  if (
149
149
  normalizedName.startsWith('touch ') ||
150
150
  normalizedName.startsWith('pro ') ||
151
- normalizedName.startsWith('pro2 ')
151
+ normalizedName.startsWith('pro2 ') ||
152
+ normalizedName.startsWith('neo ')
152
153
  ) {
153
154
  return true;
154
155
  }
@@ -191,8 +192,10 @@ export const matchesKnownBleUuid = (
191
192
  const ONEKEY_COMMUNICATION_SERVICE_ALIASES = createKnownBleUuidAliases(ONEKEY_SERVICE_UUID);
192
193
  const FIDO_SERVICE_ALIASES = createKnownBleUuidAliases('0000fffd-0000-1000-8000-00805f9b34fb');
193
194
 
194
- const isFindMyAdvertisementName = (value?: string | null) =>
195
- /\bfinde?\s+my\b/.test(value?.trim().toLowerCase() ?? '');
195
+ export const isPro2FindMyAdvertisementName = (value?: string | null) => {
196
+ const normalizedName = value?.trim().toLowerCase() ?? '';
197
+ return /\bpro\s*2\b/.test(normalizedName) && /\bfinde?\s+my\b/.test(normalizedName);
198
+ };
196
199
 
197
200
  export const hasOnekeyCommunicationService = (
198
201
  serviceUuids: Array<string | null | undefined> | null | undefined
@@ -208,14 +211,16 @@ export const isOnekeyBluetoothDevice = ({
208
211
  serviceUuids,
209
212
  }: BluetoothDeviceIdentity): boolean => {
210
213
  const advertisedServiceUuids = serviceUuids ?? [];
211
- if (isFindMyAdvertisementName(name) || isFindMyAdvertisementName(localName)) {
212
- return false;
213
- }
214
-
215
214
  if (hasOnekeyCommunicationService(advertisedServiceUuids)) {
216
215
  return true;
217
216
  }
218
217
 
218
+ // Android can return a connected Find My peripheral without its advertised
219
+ // services. Do not let the Pro2-looking name fall through to name discovery.
220
+ if (isPro2FindMyAdvertisementName(name) || isPro2FindMyAdvertisementName(localName)) {
221
+ return false;
222
+ }
223
+
219
224
  if (advertisedServiceUuids.some(uuid => matchesKnownBleUuid(uuid, FIDO_SERVICE_ALIASES))) {
220
225
  return false;
221
226
  }
package/src/deviceType.ts CHANGED
@@ -7,4 +7,5 @@ export enum EDeviceType {
7
7
  Touch = 'touch',
8
8
  Pro = 'pro',
9
9
  Pro2 = 'pro2',
10
+ Neo = 'neo',
10
11
  }