@onekeyfe/hd-core 1.2.2-alpha.1 → 1.2.2-alpha.100

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

@@ -446,9 +446,6 @@
         "MessageType_DeviceCertificateSignature": 60423,
         "MessageType_DeviceCertificateSign": 60424,
         "MessageType_DeviceMiscUsbMscControl": 60440,
-        "MessageType_DeviceFindMyTokenState": 60450,
-        "MessageType_DeviceFindMyTokenUpdate": 60451,
-        "MessageType_DeviceFindMyTokenStateGet": 60452,
         "MessageType_DeviceInfoGet": 60600,
         "MessageType_DeviceInfo": 60601,
         "MessageType_DeviceStatusGet": 60602,
@@ -5407,10 +5404,6 @@
         "request_id": {
           "type": "bytes",
           "id": 5
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 6
         }
       }
     },
@@ -5546,14 +5539,6 @@
         "tx_type": {
           "type": "uint32",
           "id": 10
-        },
-        "expected_address": {
-          "type": "bytes",
-          "id": 12
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 13
         }
       }
     },
@@ -5634,14 +5619,6 @@
           "rule": "repeated",
           "type": "EthereumAccessListOneKey",
           "id": 11
-        },
-        "expected_address": {
-          "type": "bytes",
-          "id": 12
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 13
         }
       }
     },
@@ -5818,10 +5795,6 @@
         "chain_id": {
           "type": "uint64",
           "id": 3
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 4
         }
       }
     },
@@ -9501,10 +9474,6 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 3
         }
       }
     },
@@ -9549,10 +9518,6 @@
         "application_domain": {
           "type": "bytes",
           "id": 5
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 6
         }
       }
     },
@@ -9570,10 +9535,6 @@
           "rule": "required",
           "type": "bytes",
           "id": 2
-        },
-        "source_fingerprint": {
-          "type": "uint32",
-          "id": 3
         }
       }
     },
@@ -11803,27 +11764,6 @@
         }
       }
     },
-    "DeviceFindMyTokenUpdate": {
-      "fields": {
-        "token": {
-          "rule": "required",
-          "type": "bytes",
-          "id": 1
-        }
-      }
-    },
-    "DeviceFindMyTokenStateGet": {
-      "fields": {}
-    },
-    "DeviceFindMyTokenState": {
-      "fields": {
-        "burned": {
-          "rule": "required",
-          "type": "bool",
-          "id": 1
-        }
-      }
-    },
     "DeviceFactoryAck": {
       "values": {
         "FACTORY_ACK_SUCCESS": 0,
@@ -11953,13 +11893,6 @@
         "FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS": 10
       }
     },
-    "DeviceFirmwareUpdatePhase": {
-      "values": {
-        "FW_MGMT_UPDATER_PHASE_PREPARE": 0,
-        "FW_MGMT_UPDATER_PHASE_INSTALL": 1,
-        "FW_MGMT_UPDATER_PHASE_VERIFY": 2
-      }
-    },
     "DeviceFirmwareTarget": {
       "fields": {
         "target_id": {
@@ -11984,26 +11917,7 @@
       }
     },
     "DeviceFirmwareUpdateRequest": {
-      "fields": {
-        "reboot_after_update": {
-          "type": "bool",
-          "id": 1
-        }
-      }
-    },
-    "DeviceFirmwareUpdatePhaseInfo": {
-      "fields": {
-        "phase": {
-          "rule": "required",
-          "type": "DeviceFirmwareUpdatePhase",
-          "id": 1
-        },
-        "progress_percent": {
-          "rule": "required",
-          "type": "uint32",
-          "id": 2
-        }
-      }
+      "fields": {}
     },
     "DeviceFirmwareUpdateRecord": {
       "fields": {
@@ -12016,14 +11930,6 @@
           "type": "DeviceFirmwareUpdateTaskStatus",
           "id": 10
         },
-        "progress_percent": {
-          "type": "uint32",
-          "id": 11
-        },
-        "phase_info": {
-          "type": "DeviceFirmwareUpdatePhaseInfo",
-          "id": 12
-        },
         "payload_version": {
           "type": "uint32",
           "id": 20
@@ -12040,14 +11946,6 @@
           "type": "bool",
           "id": 10
         },
-        "progress_percent": {
-          "type": "bool",
-          "id": 11
-        },
-        "phase_info": {
-          "type": "bool",
-          "id": 12
-        },
         "payload_version": {
           "type": "bool",
           "id": 20
@@ -12815,10 +12713,6 @@
         "text_id": {
           "type": "uint32",
           "id": 3
-        },
-        "text_arg": {
-          "type": "string",
-          "id": 4
         }
       }
     },
@@ -12886,10 +12780,6 @@
         "title_id": {
           "type": "uint32",
           "id": 8
-        },
-        "title_arg": {
-          "type": "string",
-          "id": 9
         }
       }
     },

package/src/device/Device.ts

@@ -2005,8 +2005,7 @@ export class Device extends EventEmitter {
     passphraseState?: string,
     useEmptyPassphrase?: boolean,
     skipPassphraseCheck?: boolean,
-    deriveCardano?: boolean,
-    mainPinSelected?: boolean
+    deriveCardano?: boolean
   ) {
     if (this.isUnacquired()) return false;
 
@@ -2017,7 +2016,6 @@ export class Device extends EventEmitter {
         onlyMainPin: useEmptyPassphrase,
         deriveCardano,
         rejectAttachPinForMainWallet: useEmptyPassphrase === true,
-        mainPinSelected,
       });
 
     // Main wallet and unlock Attach Pin, throw safe error

package/src/device/DeviceConnector.ts

@@ -96,8 +96,7 @@ export default class DeviceConnector {
     forceCleanRunPromise?: boolean,
     expectedProtocol?: HardwareConnectProtocol,
     protocolHint?: HardwareConnectProtocol,
-    forceProtocolDetection?: boolean,
-    skipProtocolProbe?: boolean
+    forceProtocolDetection?: boolean
   ) {
     Log.debug('acquire', path, session, expectedProtocol, protocolHint);
     const env = DataManager.getSettings('env');
@@ -105,15 +104,13 @@ export default class DeviceConnector {
       const transport = this.getActiveTransport();
       let res;
       if (DataManager.isBleConnect(env)) {
-        const acquireInput: Parameters<Transport['acquire']>[0] = {
+        res = await transport.acquire({
           uuid: path,
           forceCleanRunPromise,
           expectedProtocol,
           protocolHint,
           forceProtocolDetection,
-          skipProtocolProbe,
-        };
-        res = await transport.acquire(acquireInput);
+        });
       } else {
         res = await transport.acquire({
           path,
@@ -121,7 +118,6 @@ export default class DeviceConnector {
           expectedProtocol,
           protocolHint,
           forceProtocolDetection,
-          skipProtocolProbe,
         });
       }
       if (expectedProtocol) {

package/src/events/ui-request.ts

@@ -189,9 +189,6 @@ export interface FirmwareProgress {
     totalBytes?: number;
     rateBytesPerSecond?: number;
     elapsedMs?: number;
-    installTargetId?: number;
-    installPhase?: 'prepare' | 'install' | 'verify';
-    installPhaseProgress?: number;
   };
 }
 

package/src/protocols/protocol-v2/resources.ts

@@ -59,15 +59,7 @@ export function isProtocolV2ResourceArchiveEntryName(entryName: string): boolean
   return (
     fileName.length > 0 &&
     !fileName.startsWith('.') &&
-    !parts.some(
-      part =>
-        !part ||
-        part === '.' ||
-        part === '..' ||
-        part === '.DS_Store' ||
-        part.startsWith('._') ||
-        part.toUpperCase() === '__MACOSX'
-    )
+    !parts.some(part => part === '__MACOSX' || part === '.' || part === '..' || part === '')
   );
 }
 

package/src/protocols/protocol-v2/unlockPolicyRunner.ts

@@ -14,14 +14,10 @@ const Log = getLogger(LoggerNames.Core);
 
 export type ProtocolV2UnlockContext = {
   preflightCompleted: boolean;
-  preflightStatusRefreshed?: boolean;
-  preflightMainPinSelected?: boolean;
 };
 
 export const createProtocolV2UnlockContext = (): ProtocolV2UnlockContext => ({
   preflightCompleted: false,
-  preflightStatusRefreshed: false,
-  preflightMainPinSelected: false,
 });
 
 type RunnableMethod = Pick<
@@ -104,12 +100,11 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
     await afterStatusBeforeUnlock?.();
 
     if (!status.unlocked) {
-      const preUnlockPinType = resolvePreUnlockPinType(method);
       const unlockInteraction: HardwareUiInteractionMeta | undefined = shouldCoordinateUi
         ? uiCoordinator.enterUnlockInteraction(method.name)
         : undefined;
       const unlockedStatus = await device.unlockDevice(
-        preUnlockPinType,
+        resolvePreUnlockPinType(method),
         shouldCoordinateUi
           ? { emitUiEvent: false, interaction: unlockInteraction }
           : {
@@ -125,11 +120,9 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
           'Protocol V2 device remained locked after the unlock flow.'
         );
       }
-      context.preflightMainPinSelected = preUnlockPinType === DeviceSessionPinType.Main;
       Log.debug('Protocol V2 pre-unlock completed', { method: method.name });
     }
 
-    context.preflightStatusRefreshed = true;
     context.preflightCompleted = true;
   }
 

package/src/protocols/protocol-v2/walletSession.ts

@@ -83,21 +83,15 @@ const buildDeviceSessionGetRequest = ({
         ],
 });
 
-const askDevicePassphrase = async (
-  device: Device,
-  requestPayload: DeviceSessionAskPassphrase,
-  onStatusRefreshed?: () => void
-) => {
+const askDevicePassphrase = async (device: Device, requestPayload: DeviceSessionAskPassphrase) => {
   await device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
   await refreshProtocolV2DeviceStatus(device);
-  onStatusRefreshed?.();
 };
 
 const selectDeviceSession = async (
   device: Device,
   expectedPassphraseState?: string,
-  deriveCardano?: boolean,
-  onStatusRefreshed?: () => void
+  deriveCardano?: boolean
 ) => {
   const existsAttachPinUser = device.features?.attachToPinEnabled === true;
   const metadata = {
@@ -159,19 +153,14 @@ const selectDeviceSession = async (
       emitUiEvent: false,
       interaction: attachPinInteraction,
     });
-    onStatusRefreshed?.();
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
   if (hasHostPassphrase) {
-    await askDevicePassphrase(
-      device,
-      {
-        passphrase: hostPassphrase,
-        on_device: false,
-      },
-      onStatusRefreshed
-    );
+    await askDevicePassphrase(device, {
+      passphrase: hostPassphrase,
+      on_device: false,
+    });
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
@@ -183,7 +172,7 @@ const selectDeviceSession = async (
     ...metadata,
     ...(passphraseOnDeviceInteraction ? { interaction: passphraseOnDeviceInteraction } : {}),
   });
-  await askDevicePassphrase(device, { on_device: true }, onStatusRefreshed);
+  await askDevicePassphrase(device, { on_device: true });
   return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
 };
 
@@ -202,8 +191,6 @@ export async function getProtocolV2WalletSession(
     deriveCardano?: boolean;
     /** Read the wallet already selected by Attach PIN without reopening wallet selection. */
     readCurrentAttachPinSession?: boolean;
-    /** The current call already selected the Main PIN during its unlock preflight. */
-    mainPinSelected?: boolean;
   }
 ) {
   const forceWalletSelection =
@@ -240,16 +227,10 @@ export async function getProtocolV2WalletSession(
       : undefined;
   let response;
   let resumed = false;
-  let walletStatusRefreshed = false;
-  const markWalletStatusRefreshed = () => {
-    walletStatusRefreshed = true;
-  };
-  let mainPinAuthenticated =
-    options?.mainPinSelected === true ||
-    (options?.onlyMainPin === true &&
-      device.features?.unlocked === true &&
-      device.features?.unlockedAttachPin === false);
-  let standardWalletSelected = options?.mainPinSelected === true;
+  let mainPinSelected =
+    options?.onlyMainPin === true &&
+    device.features?.unlocked === true &&
+    device.features?.unlockedAttachPin === false;
 
   const clearCurrentWalletSession = () => {
     if (options?.onlyMainPin) {
@@ -261,7 +242,6 @@ export async function getProtocolV2WalletSession(
 
   const rejectMismatchedAttachPinWallet = async () => {
     const features = await refreshProtocolV2DeviceStatus(device);
-    markWalletStatusRefreshed();
     if (features.unlockedAttachPin !== true) {
       return;
     }
@@ -285,42 +265,30 @@ export async function getProtocolV2WalletSession(
   }
 
   const selectMainPin = async (force = false) => {
-    if (force || !mainPinAuthenticated) {
+    if (force || !mainPinSelected) {
       await device.unlockDevice(DeviceSessionPinType.Main, {
         source: 'wallet-session-coordinator',
         reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
         deviceOnly: true,
       });
-      markWalletStatusRefreshed();
-      mainPinAuthenticated = true;
-      standardWalletSelected = true;
+      mainPinSelected = true;
     }
   };
 
   const selectStandardWallet = async () => {
+    // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
+    await selectMainPin();
     if (device.features?.passphraseProtection === true) {
-      // Main PIN authenticates the device; an empty host passphrase selects the standard derivation.
-      await selectMainPin();
-      await askDevicePassphrase(
-        device,
-        {
-          passphrase: '',
-          on_device: false,
-        },
-        markWalletStatusRefreshed
-      );
-      standardWalletSelected = true;
-    } else if (!standardWalletSelected) {
-      // Without passphrase protection there is no empty-passphrase selector.
-      // Main PIN selection is the only authoritative switch back to the standard wallet.
-      await selectMainPin(true);
+      await askDevicePassphrase(device, {
+        passphrase: '',
+        on_device: false,
+      });
     }
   };
 
   if (readCurrentAttachPinSession) {
     const status = await requestProtocolV2DeviceStatus(device);
     device.updateProtocolV2Status(status);
-    markWalletStatusRefreshed();
     if (
       status.unlocked !== true ||
       status.passphrase_enabled !== true ||
@@ -404,12 +372,7 @@ export async function getProtocolV2WalletSession(
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.WalletSessionInvalid);
     }
-    response = await selectDeviceSession(
-      device,
-      expectedPassphraseState,
-      options?.deriveCardano,
-      markWalletStatusRefreshed
-    );
+    response = await selectDeviceSession(device, expectedPassphraseState, options?.deriveCardano);
   }
 
   let { message } = response;
@@ -439,12 +402,7 @@ export async function getProtocolV2WalletSession(
       );
     } else {
       device.clearInternalState();
-      response = await selectDeviceSession(
-        device,
-        expectedPassphraseState,
-        options?.deriveCardano,
-        markWalletStatusRefreshed
-      );
+      response = await selectDeviceSession(device, expectedPassphraseState, options?.deriveCardano);
     }
     message = response.message;
     try {
@@ -480,7 +438,7 @@ export async function getProtocolV2WalletSession(
   let unlockedAttachPin: boolean | undefined;
   if (readCurrentAttachPinSession) {
     unlockedAttachPin = true;
-  } else if (mainPinAuthenticated) {
+  } else if (mainPinSelected) {
     unlockedAttachPin = false;
   }
 
@@ -489,7 +447,6 @@ export async function getProtocolV2WalletSession(
     newSession: message.session_id,
     unlockedAttachPin,
     resumed,
-    walletStatusRefreshed,
   };
 }
 

package/src/types/settings.ts

@@ -77,8 +77,7 @@ export type IProtocolV2Resources = {
 /** STM32 firmware config */
 export type IFirmwareReleaseInfo = {
   required: boolean;
-  /** Legacy release artifact URL. Protocol V2 releases use component URLs. */
-  url?: string;
+  url: string;
   /**
    * Firmware type (bitcoinonly or universal)
    * This field is not present in the remote config, but will be inferred from the firmware field name
@@ -107,8 +106,7 @@ export type IFirmwareReleaseInfo = {
   bootloaderChangelog?: {
     [k in ILocale]: string;
   };
-  /** Legacy release artifact SHA-256. Protocol V2 releases use component fingerprints. */
-  fingerprint?: string;
+  fingerprint: string;
   expectedSize?: number;
   version: IVersionArray;
   changelog: {

package/src/utils/deviceFeaturesUtils.ts

@@ -110,7 +110,6 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     initSession?: boolean;
     deriveCardano?: boolean;
     rejectAttachPinForMainWallet?: boolean;
-    mainPinSelected?: boolean;
   }
 ) => {
   if (device.isProtocolV2()) {
@@ -128,7 +127,6 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
       onlyMainPin: options?.onlyMainPin,
       deriveCardano: options?.deriveCardano,
       rejectAttachPinForMainWallet: options?.rejectAttachPinForMainWallet,
-      mainPinSelected: options?.mainPinSelected,
     });
   }
 
@@ -196,7 +194,6 @@ export const getPassphraseState = async (
     initSession?: boolean;
     deriveCardano?: boolean;
     rejectAttachPinForMainWallet?: boolean;
-    mainPinSelected?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
@@ -219,7 +216,6 @@ export const getPassphraseState = async (
       onlyMainPin: options?.onlyMainPin,
       deriveCardano: options?.deriveCardano,
       rejectAttachPinForMainWallet: options?.rejectAttachPinForMainWallet,
-      mainPinSelected: options?.mainPinSelected,
     });
   }
 

package/__tests__/pro2HostAssetPackage.test.ts

@@ -1,58 +0,0 @@
-import { sha3_512 } from '@noble/hashes/sha3';
-
-import {
-  buildPro2HostAssetPackage,
-  supportsPro2HostAssetPackage,
-} from '../src/utils/pro2HostAssetPackage';
-
-describe('Pro2 host asset package', () => {
-  test('builds the unsigned RESOURCE container and LZ4-blocked archive expected by firmware', () => {
-    const raw = new TextEncoder().encode('123456789');
-    const packageData = buildPro2HostAssetPackage([{ name: 'wallpaper.bin', data: raw }]);
-    const headerSize = 0x5f90;
-    const payload = packageData.subarray(headerSize);
-    const packageView = new DataView(
-      packageData.buffer,
-      packageData.byteOffset,
-      packageData.byteLength
-    );
-
-    expect(packageView.getUint32(0, true)).toBe(0x50504b4f);
-    expect(packageView.getUint32(4, true)).toBe(1);
-    expect(packageView.getUint32(8, true)).toBe(0x43534552);
-    expect(packageView.getUint32(0x0c, true)).toBe(headerSize);
-    expect(packageView.getUint32(0x10, true)).toBe(1);
-    expect(packageView.getUint32(0x14, true)).toBe(payload.byteLength);
-    expect(packageData.subarray(0x200, 0x240)).toEqual(sha3_512(payload));
-    expect(packageData.subarray(0x240, 0x280)).toEqual(sha3_512(packageData.subarray(0, 0x240)));
-    expect(packageData[0x400]).toBe(0);
-    expect(packageView.getUint32(0x408, true)).toBe(0x71717171);
-
-    const archiveView = new DataView(payload.buffer, payload.byteOffset, payload.byteLength);
-    expect(archiveView.getUint32(0, true)).toBe(0x52414b4f);
-    expect(archiveView.getUint32(4, true)).toBe(1);
-    expect(archiveView.getUint16(8, true)).toBe(1);
-    expect(new TextDecoder().decode(payload.subarray(43, 56))).toBe('wallpaper.bin');
-    expect(archiveView.getUint32(42 + 0x100, true)).toBe(340);
-    expect(archiveView.getUint32(42 + 0x104, true)).toBe(raw.byteLength);
-    expect(archiveView.getUint32(42 + 0x10c, true)).toBe(0xcbf43926);
-    expect(payload[42 + 0x114]).toBe(1);
-
-    const compressedOffset = archiveView.getUint32(42 + 0x100, true);
-    expect(archiveView.getUint16(compressedOffset, true)).toBe(1);
-    expect(archiveView.getUint16(compressedOffset + 2, true)).toBe(12);
-    expect(archiveView.getUint32(compressedOffset + 4, true)).toBe(0);
-    expect(archiveView.getUint32(compressedOffset + 8, true)).toBe(10);
-    expect(payload.subarray(compressedOffset + 12)).toEqual(new Uint8Array([0x90, ...raw]));
-  });
-
-  test.each([
-    ['1.0.0', false],
-    ['1.0.1-beta.1', false],
-    ['1.0.1', true],
-    ['1.1.0', true],
-    [undefined, false],
-  ])('selects package uploads for firmware %s', (firmwareVersion, expected) => {
-    expect(supportsPro2HostAssetPackage(firmwareVersion)).toBe(expected);
-  });
-});

package/dist/utils/pro2HostAssetPackage.d.ts

@@ -1,8 +0,0 @@
-export declare const PRO2_HOST_ASSET_PACKAGE_MIN_VERSION = "1.0.1";
-export type Pro2HostAssetPackageEntry = {
-    name: string;
-    data: Uint8Array;
-};
-export declare function supportsPro2HostAssetPackage(firmwareVersion: string | undefined): boolean;
-export declare function buildPro2HostAssetPackage(entries: Pro2HostAssetPackageEntry[]): Uint8Array;
-//# sourceMappingURL=pro2HostAssetPackage.d.ts.map

package/dist/utils/pro2HostAssetPackage.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pro2HostAssetPackage.d.ts","sourceRoot":"","sources":["../../src/utils/pro2HostAssetPackage.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,mCAAmC,UAAU,CAAC;AAwB3D,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CAClB,CAAC;AAQF,wBAAgB,4BAA4B,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAMzF;AA2QD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,yBAAyB,EAAE,GAAG,UAAU,CA4B1F"}