Mirrors/trezor-suite
2
0
Fork 0
mirror of https://github.com/trezor/trezor-suite.git synced 2026-03-23 15:47:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: naming for asDeviceUniquePath

Browse Source
This commit is contained in:
Peter Sanderson
2025-09-29 15:31:21 +02:00
committed by Peter Sanderson
parent 3daae1dd86
commit e400f6e24f
10 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/connect/src/device/DeviceList.ts
View File

@@ -16,7 +16,7 @@ import {
import { ERRORS } from '../constants';
import { DEVICE, DecodedTrezorPushNotification, TransportError, TransportInfo } from '../events';
import { Device } from './Device';
import { ConnectSettings, DeviceUniquePath, StaticSessionId } from '../types';
import { ConnectSettings, DeviceUniquePath, StaticSessionId, asDeviceUniquePath } from '../types';
import { createTransportList } from './TransportList';
import { TransportManager } from './TransportManager';
import { initLog } from '../utils/debug';
@@ -144,7 +144,7 @@ export class DeviceList extends TypedEmitter<DeviceListEvents> implements IDevic
private async onDeviceConnected(descriptor: Descriptor, transport: Transport) {
const id = (this.deviceCounter++).toString(16).slice(-8);
const device = new Device({ id: DeviceUniquePath(id), transport, descriptor });
const device = new Device({ id: asDeviceUniquePath(id), transport, descriptor });
const penalty = this.authPenaltyManager.get();
const stillConnected = await this.handshakeLock(() =>

4
packages/connect/src/types/api/__tests__/bitcoin.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, TrezorConnect } from '../../..';
import { TrezorConnect, asDeviceUniquePath } from '../../..';
export const getAddress = async (api: TrezorConnect) => {
// regular
@@ -29,7 +29,7 @@ export const getAddress = async (api: TrezorConnect) => {
// with all possible params
api.getAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

4
packages/connect/src/types/api/__tests__/cardano.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, PROTO, TrezorConnect } from '../../..';
import { PROTO, TrezorConnect, asDeviceUniquePath } from '../../..';
const {
CardanoAddressType,
@@ -122,7 +122,7 @@ export const cardanoGetAddress = async (api: TrezorConnect) => {
// with all possible params
api.cardanoGetAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

4
packages/connect/src/types/api/__tests__/ethereum.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, TrezorConnect } from '../../..';
import { TrezorConnect, asDeviceUniquePath } from '../../..';
export const ethereumGetAddress = async (api: TrezorConnect) => {
// regular
@@ -30,7 +30,7 @@ export const ethereumGetAddress = async (api: TrezorConnect) => {
// with all possible params
api.ethereumGetAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

4
packages/connect/src/types/api/__tests__/nem.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, NEM, TrezorConnect } from '../../..';
import { NEM, TrezorConnect, asDeviceUniquePath } from '../../..';
export const nemGetAddress = async (api: TrezorConnect) => {
// regular
@@ -33,7 +33,7 @@ export const nemGetAddress = async (api: TrezorConnect) => {
// with all possible params
api.nemGetAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

4
packages/connect/src/types/api/__tests__/ripple.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, TrezorConnect } from '../../..';
import { TrezorConnect, asDeviceUniquePath } from '../../..';
export const rippleGetAddress = async (api: TrezorConnect) => {
// regular
@@ -31,7 +31,7 @@ export const rippleGetAddress = async (api: TrezorConnect) => {
// with all possible params
api.rippleGetAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

4
packages/connect/src/types/api/__tests__/stellar.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, TrezorConnect } from '../../..';
import { TrezorConnect, asDeviceUniquePath } from '../../..';
export const stellarGetAddress = async (api: TrezorConnect) => {
// regular
@@ -29,7 +29,7 @@ export const stellarGetAddress = async (api: TrezorConnect) => {
// with all possible params
api.stellarGetAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

4
packages/connect/src/types/api/__tests__/tezos.ts
View File

@@ -1,4 +1,4 @@
import { DeviceUniquePath, TrezorConnect } from '../../..';
import { TrezorConnect, asDeviceUniquePath } from '../../..';
export const tezosGetAddress = async (api: TrezorConnect) => {
// regular
@@ -29,7 +29,7 @@ export const tezosGetAddress = async (api: TrezorConnect) => {
// with all possible params
api.tezosGetAddress({
device: {
path: DeviceUniquePath('1'),
path: asDeviceUniquePath('1'),
instance: 1,
state: 'state@device-id:1',
},

9
packages/connect/src/types/device.ts
View File

@@ -77,8 +77,15 @@ export type FirmwareHashCheckResult =
errorPayload?: unknown;
};
/**
* The Unique Device Identifier per Suite run & Connected Device.
* When Suite is restarted or the Device is reconnected this will change.
*
* The main reason for this identifier is to reference device which is unacquired
* and therefore has no `id` yet. Typical use case is THP pairing
*/
export type DeviceUniquePath = string & Branded<'DeviceUniquePath'>;
export const DeviceUniquePath = (id: string) => id as DeviceUniquePath;
export const asDeviceUniquePath = (id: string) => id as DeviceUniquePath;
type BaseDevice = {
path: DeviceUniquePath;

3
suite-common/test-utils/src/mocks.ts
View File

@@ -22,6 +22,7 @@ import {
Features,
FirmwareType,
TrezorConnect,
asDeviceUniquePath,
} from '@trezor/connect';
import { DeviceModelInternal } from '@trezor/device-utils';
@@ -160,7 +161,7 @@ type StringPath<T extends { path: DeviceUniquePath }> = Omit<T, 'path'> & { path
* @returns {Device}
*/
const getConnectDevice = (dev?: Partial<StringPath<Device>>, feat?: Partial<Features>): Device => {
const path = DeviceUniquePath(dev?.path ?? '1');
const path = asDeviceUniquePath(dev?.path ?? '1');
if (dev && typeof dev.type === 'string' && dev.type === 'unreadable') {
return {