From b6000242167649e4321230dd0b2fc37d06dd1dfb Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Fri, 19 Sep 2025 07:46:07 +0200 Subject: [PATCH] chore: use type JsonnableEd25519KeyIdentity which is now exposed by dfinity/identity --- src/configs/cli.config.ts | 2 +- src/services/auth/login.services.ts | 2 +- src/types/cli.config.ts | 2 +- src/types/identity.ts | 4 ---- src/utils/auth.utils.ts | 2 +- src/utils/process.utils.ts | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 src/types/identity.ts diff --git a/src/configs/cli.config.ts b/src/configs/cli.config.ts index b83c2dd3..6c999d18 100644 --- a/src/configs/cli.config.ts +++ b/src/configs/cli.config.ts @@ -1,10 +1,10 @@ +import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity'; import {assertNonNullish, nonNullish} from '@dfinity/utils'; import type Conf from 'conf'; import {red, yellow} from 'kleur'; import {askForPassword} from '../services/cli.settings.services'; import {getSettingsStore} from '../stores/settings.store'; import type {CliConfig, CliOrbiterConfig, CliSatelliteConfig} from '../types/cli.config'; -import type {JsonnableEd25519KeyIdentity} from '../types/identity'; import {loadConfig} from '../utils/config.utils'; // Save in https://github.com/sindresorhus/env-paths#pathsconfig diff --git a/src/services/auth/login.services.ts b/src/services/auth/login.services.ts index 2ff2cbb6..8968b2ce 100644 --- a/src/services/auth/login.services.ts +++ b/src/services/auth/login.services.ts @@ -1,3 +1,4 @@ +import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity'; import {nextArg} from '@junobuild/cli-tools'; import {bold, green, underline} from 'kleur'; import {randomBytes} from 'node:crypto'; @@ -8,7 +9,6 @@ import path, {dirname} from 'node:path'; import {fileURLToPath} from 'node:url'; import util from 'node:util'; import {saveCliConfig} from '../../configs/cli.config'; -import type {JsonnableEd25519KeyIdentity} from '../../types/identity'; import {authUrl, generateToken, requestUrl} from '../../utils/auth.utils'; import {openUrl} from '../../utils/open.utils'; import {getPort} from '../../utils/port.utils'; diff --git a/src/types/cli.config.ts b/src/types/cli.config.ts index 7cfd89c4..47df98b8 100644 --- a/src/types/cli.config.ts +++ b/src/types/cli.config.ts @@ -1,5 +1,5 @@ +import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity'; import type {PrincipalText} from '@dfinity/zod-schemas'; -import type {JsonnableEd25519KeyIdentity} from './identity'; export interface CliConfig { token: JsonnableEd25519KeyIdentity; diff --git a/src/types/identity.ts b/src/types/identity.ts deleted file mode 100644 index db88db04..00000000 --- a/src/types/identity.ts +++ /dev/null @@ -1,4 +0,0 @@ -// TODO: duplicate AgentJS type until https://github.com/dfinity/icp-js-core/issues/1140 is resolved. -type PublicKeyHex = string; -type SecretKeyHex = string; -export type JsonnableEd25519KeyIdentity = [PublicKeyHex, SecretKeyHex]; diff --git a/src/utils/auth.utils.ts b/src/utils/auth.utils.ts index 1bf6f3d2..e0487119 100644 --- a/src/utils/auth.utils.ts +++ b/src/utils/auth.utils.ts @@ -1,9 +1,9 @@ +import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity'; import {Ed25519KeyIdentity} from '@dfinity/identity'; import {nonNullish} from '@dfinity/utils'; import type {PrincipalText} from '@dfinity/zod-schemas'; import {REDIRECT_URL} from '../constants/constants'; import {ENV} from '../env'; -import type {JsonnableEd25519KeyIdentity} from '../types/identity'; export const generateToken = (): {principal: PrincipalText; token: JsonnableEd25519KeyIdentity} => { const key = Ed25519KeyIdentity.generate(); diff --git a/src/utils/process.utils.ts b/src/utils/process.utils.ts index 627f6feb..b842b155 100644 --- a/src/utils/process.utils.ts +++ b/src/utils/process.utils.ts @@ -1,5 +1,5 @@ +import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity'; import {hasArgs} from '@junobuild/cli-tools'; -import {type JsonnableEd25519KeyIdentity} from '../types/identity'; export const getProcessToken = (): JsonnableEd25519KeyIdentity | undefined => { const envToken = process.env.JUNO_TOKEN;