feat: clean-up AccountIdentifier string

dfinity · Feb 12, 2024 · ad49e16 · ad49e16
1 parent de9835b
commit ad49e16
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/packages/nns/src/canisters/governance/request.converters.ts b/packages/nns/src/canisters/governance/request.converters.ts
@@ -1,4 +1,7 @@
-import type { AccountIdentifier as AccountIdentifierClass } from "@dfinity/ledger-icp";
+import type {
+  AccountIdentifier as AccountIdentifierClass,
+  AccountIdentifierHex,
+} from "@dfinity/ledger-icp";
 import { accountIdentifierToBytes } from "@dfinity/ledger-icp";
 import { Principal } from "@dfinity/principal";
 import { arrayBufferToUint8Array, toNullable } from "@dfinity/utils";
@@ -37,7 +40,7 @@ import type {
 } from "../../../candid/governance";
 import type { Vote } from "../../enums/governance.enums";
 import { UnsupportedValueError } from "../../errors/governance.errors";
-import type { AccountIdentifier, E8s, NeuronId } from "../../types/common";
+import type { E8s, NeuronId } from "../../types/common";
 import type {
   Action,
   By,
@@ -845,7 +848,7 @@ const fromAmount = (amount: E8s): Amount => ({
 });
 
 const fromAccountIdentifier = (
-  accountIdentifier: AccountIdentifier,
+  accountIdentifier: AccountIdentifierHex,
 ): RawAccountIdentifier => ({
   hash: accountIdentifierToBytes(accountIdentifier),
 });

diff --git a/packages/nns/src/canisters/governance/response.converters.ts b/packages/nns/src/canisters/governance/response.converters.ts
@@ -1,3 +1,4 @@
+import type { AccountIdentifierHex } from "@dfinity/ledger-icp";
 import {
   AccountIdentifier,
   accountIdentifierFromBytes,
@@ -64,12 +65,7 @@ import type {
 } from "../../../candid/governance";
 import { NeuronState, type NeuronType } from "../../enums/governance.enums";
 import { UnsupportedValueError } from "../../errors/governance.errors";
-import type {
-  AccountIdentifier as AccountIdentifierString,
-  CanisterIdString,
-  E8s,
-  NeuronId,
-} from "../../types/common";
+import type { CanisterIdString, E8s, NeuronId } from "../../types/common";
 import type {
   Action,
   Ballot,
@@ -760,7 +756,7 @@ const toAmount = (amount: RawAmount): E8s => {
 
 const toAccountIdentifier = (
   accountIdentifier: RawAccountIdentifier,
-): AccountIdentifierString =>
+): AccountIdentifierHex =>
   accountIdentifierFromBytes(new Uint8Array(accountIdentifier.hash));
 
 const toRewardMode = (rewardMode: RawRewardMode): RewardMode => {

diff --git a/packages/nns/src/types/governance_converters.ts b/packages/nns/src/types/governance_converters.ts
@@ -1,4 +1,5 @@
 import type { DerEncodedPublicKey } from "@dfinity/agent";
+import type { AccountIdentifierHex } from "@dfinity/ledger-icp";
 import type { Principal } from "@dfinity/principal";
 import type {
   NeuronState,
@@ -9,7 +10,6 @@ import type {
   Vote,
 } from "../enums/governance.enums";
 import type {
-  AccountIdentifier,
   CanisterIdString,
   E8s,
   NeuronId,
@@ -88,7 +88,7 @@ export interface Configure {
   operation: Option<Operation>;
 }
 export interface Disburse {
-  toAccountId: Option<AccountIdentifier>;
+  toAccountId: Option<AccountIdentifierHex>;
   amount: Option<E8s>;
 }
 export interface DisburseResponse {
@@ -273,7 +273,7 @@ export interface Neuron {
   spawnAtTimesSeconds: Option<bigint>;
   neuronFees: E8s;
   hotKeys: Array<PrincipalString>;
-  accountIdentifier: AccountIdentifier;
+  accountIdentifier: AccountIdentifierHex;
   joinedCommunityFundTimestampSeconds: Option<bigint>;
   dissolveState: Option<DissolveState>;
   followees: Array<Followees>;
@@ -297,7 +297,7 @@ export interface NeuronInfo {
 
 export interface NodeProvider {
   id: Option<PrincipalString>;
-  rewardAccount: Option<AccountIdentifier>;
+  rewardAccount: Option<AccountIdentifierHex>;
 }
 export type Operation =
   | { RemoveHotKey: RemoveHotKey }
@@ -350,7 +350,7 @@ export type RewardNodeProviders = {
   rewards: Array<RewardNodeProvider>;
 };
 export interface RewardToAccount {
-  toAccount: Option<AccountIdentifier>;
+  toAccount: Option<AccountIdentifierHex>;
 }
 export interface RewardToNeuron {
   dissolveDelaySeconds: bigint;
@@ -433,7 +433,7 @@ export interface SplitRequest {
 
 export interface DisburseRequest {
   neuronId: NeuronId;
-  toAccountId?: AccountIdentifier;
+  toAccountId?: AccountIdentifierHex;
   amount?: E8s;
 }