@ledgerhq/coin-canton 0.7.0 → 0.8.0-nightly.1

package/src/network/gateway.ts

@@ -11,7 +11,7 @@ import {
 } from "../types/onboard";
 import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
-type OnboardingPrepareResponse = {
+export type OnboardingPrepareResponse = {
   party_id: string;
   party_name: string;
   public_key_fingerprint: string;
@@ -75,9 +75,17 @@ type TransactionSubmitRequest = {
 
 type TransactionSubmitResponse = { update_id: string };
 
+export type GetBalanceResponse =
+  | {
+      at_round: number;
+      balances: InstrumentBalance[];
+    }
+  // temporary backwards compatibility
+  | InstrumentBalance[];
+
 export type InstrumentBalance = {
   instrument_id: string;
-  amount: number;
+  amount: string;
   locked: boolean;
 };
 
@@ -274,7 +282,7 @@ export type OperationInfo =
 
 const getGatewayUrl = (currency: CryptoCurrency) => coinConfig.getCoinConfig(currency).gatewayUrl;
 const getNodeId = (currency: CryptoCurrency) =>
-  coinConfig.getCoinConfig(currency).nodeId || "ledger-devnet-stg";
+  coinConfig.getCoinConfig(currency).nodeId || "ledger-live-devnet";
 const getNetworkType = (currency: CryptoCurrency) => coinConfig.getCoinConfig(currency).networkType;
 
 const gatewayNetwork = <T, U = unknown>(req: LiveNetworkRequest<U>) => {
@@ -288,11 +296,7 @@ const gatewayNetwork = <T, U = unknown>(req: LiveNetworkRequest<U>) => {
   });
 };
 
-export async function prepareOnboarding(
-  currency: CryptoCurrency,
-  pubKey: string,
-  pubKeyType: string,
-): Promise<OnboardingPrepareResponse> {
+export async function prepareOnboarding(currency: CryptoCurrency, pubKey: string) {
   const gatewayUrl = getGatewayUrl(currency);
   const nodeId = getNodeId(currency);
   const fullUrl = `${gatewayUrl}/v1/node/${nodeId}/onboarding/prepare`;
@@ -302,29 +306,54 @@ export async function prepareOnboarding(
     url: fullUrl,
     data: {
       public_key: pubKey,
-      public_key_type: pubKeyType,
+      public_key_type: "ed25519",
     },
   });
 
   return data;
 }
 
+type OnboardingSubmitError409 = {
+  partyId: string;
+  status: 409;
+  type: "PARTY_ALREADY_EXISTS";
+  message: string;
+};
+
 export async function submitOnboarding(
   currency: CryptoCurrency,
-  prepareRequest: OnboardingPrepareRequest,
+  publicKey: string,
   prepareResponse: OnboardingPrepareResponse,
   signature: string,
 ) {
-  const { data } = await gatewayNetwork<OnboardingSubmitResponse, OnboardingSubmitRequest>({
-    method: "POST",
-    url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/onboarding/submit`,
-    data: {
-      prepare_request: prepareRequest,
-      prepare_response: prepareResponse,
-      signature,
-    },
-  });
-  return data;
+  try {
+    const { data } = await gatewayNetwork<OnboardingSubmitResponse, OnboardingSubmitRequest>({
+      method: "POST",
+      url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/onboarding/submit`,
+      data: {
+        prepare_request: {
+          public_key: publicKey,
+          public_key_type: "ed25519",
+        },
+        prepare_response: prepareResponse,
+        signature,
+      },
+    });
+    return data;
+  } catch (e) {
+    if (e instanceof Error && "type" in e && e.type === "PARTY_ALREADY_EXISTS") {
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      const { partyId } = e as unknown as OnboardingSubmitError409;
+      return {
+        party: {
+          party_id: partyId,
+          public_key: publicKey,
+        },
+      };
+    }
+
+    throw e;
+  }
 }
 
 export async function submit(
@@ -344,15 +373,12 @@ export async function submit(
   return data;
 }
 
-export async function getBalance(
-  currency: CryptoCurrency,
-  partyId: string,
-): Promise<InstrumentBalance[]> {
-  const { data } = await gatewayNetwork<InstrumentBalance[]>({
+export async function getBalance(currency: CryptoCurrency, partyId: string) {
+  const { data } = await gatewayNetwork<GetBalanceResponse>({
     method: "GET",
     url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/party/${partyId}/balance`,
   });
-  return data;
+  return Array.isArray(data) ? data : data.balances;
 }
 
 export async function getPartyById(currency: CryptoCurrency, partyId: string): Promise<PartyInfo> {
@@ -421,7 +447,7 @@ enum TransactionType {
 export async function prepareTapRequest(
   currency: CryptoCurrency,
   { partyId, amount = 1000000 }: PrepareTapRequest,
-): Promise<PrepareTapResponse> {
+) {
   if (getNetworkType(currency) === "mainnet") {
     return {
       serialized: "",
@@ -429,11 +455,11 @@ export async function prepareTapRequest(
       hash: "",
     };
   }
-  const { data } = await gatewayNetwork<PrepareTapResponse, { amount: number; type: string }>({
+  const { data } = await gatewayNetwork<PrepareTapResponse, { amount: string; type: string }>({
     method: "POST",
     url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/party/${partyId}/transaction/prepare`,
     data: {
-      amount: parseInt(amount.toString(), 10), // Convert to integer to avoid scientific notation
+      amount: amount.toString(),
       type: TransactionType.TAP_REQUEST,
     },
   });
@@ -454,7 +480,7 @@ type SubmitTapRequestResponse = {
 export async function submitTapRequest(
   currency: CryptoCurrency,
   { partyId, serialized, signature }: SubmitTapRequestRequest,
-): Promise<SubmitTapRequestResponse> {
+) {
   const { data } = await gatewayNetwork<
     SubmitTapRequestResponse,
     Omit<SubmitTapRequestRequest, "partyId">
@@ -473,7 +499,7 @@ export async function prepareTransferRequest(
   currency: CryptoCurrency,
   partyId: string,
   params: PrepareTransferRequest,
-): Promise<PrepareTransferResponse> {
+) {
   const { data } = await gatewayNetwork<PrepareTransferResponse, PrepareTransferRequest>({
     method: "POST",
     url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/party/${partyId}/transaction/prepare`,
@@ -490,10 +516,7 @@ export async function getLedgerEnd(currency: CryptoCurrency): Promise<number> {
   return data;
 }
 
-export async function preparePreApprovalTransaction(
-  currency: CryptoCurrency,
-  partyId: string,
-): Promise<PrepareTransactionResponse> {
+export async function preparePreApprovalTransaction(currency: CryptoCurrency, partyId: string) {
   const { data } = await gatewayNetwork<PrepareTransactionResponse, PrepareTransactionRequest>({
     method: "POST",
     url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/party/${partyId}/transaction/prepare`,
@@ -510,7 +533,7 @@ export async function submitPreApprovalTransaction(
   partyId: string,
   { serialized }: PrepareTransactionResponse,
   signature: string,
-): Promise<PreApprovalResult> {
+) {
   const { data } = await gatewayNetwork<SubmitTransactionResponse, SubmitTransactionRequest>({
     method: "POST",
     url: `${getGatewayUrl(currency)}/v1/node/${getNodeId(currency)}/party/${partyId}/transaction/submit`,
@@ -524,5 +547,5 @@ export async function submitPreApprovalTransaction(
     isApproved: true,
     submissionId: data.submission_id,
     updateId: data.update_id,
-  };
+  } satisfies PreApprovalResult;
 }

package/src/types/bridge.ts

@@ -9,26 +9,26 @@ import type {
   TransactionStatusCommon,
   TransactionStatusCommonRaw,
 } from "@ledgerhq/types-live";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import type {
   CantonOnboardProgress,
   CantonOnboardResult,
-  CantonPreApprovalProgress,
-  CantonPreApprovalResult,
+  CantonAuthorizeProgress,
+  CantonAuthorizeResult,
 } from "./onboard";
-import type { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 export interface CantonCurrencyBridge extends CurrencyBridge {
   onboardAccount: (
     currency: CryptoCurrency,
     deviceId: string,
-    derivationPath: string,
+    creatableAccount: Account,
   ) => Observable<CantonOnboardProgress | CantonOnboardResult>;
   authorizePreapproval: (
     currency: CryptoCurrency,
     deviceId: string,
-    derivationPath: string,
+    creatableAccount: Account,
     partyId: string,
-  ) => Observable<CantonPreApprovalProgress | CantonPreApprovalResult>;
+  ) => Observable<CantonAuthorizeProgress | CantonAuthorizeResult>;
 }
 
 export type NetworkInfo = {
@@ -60,16 +60,5 @@ export type TransactionRaw = TransactionCommonRaw & {
 export type TransactionStatus = TransactionStatusCommon;
 export type TransactionStatusRaw = TransactionStatusCommonRaw;
 
-export type CantonResources = {
-  partyId: string;
-};
-export type CantonResourcesRaw = {
-  partyId: string;
-};
-
-export type CantonAccount = Account & {
-  cantonResources?: CantonResources;
-};
-export type CantonAccountRaw = AccountRaw & {
-  cantonResources: CantonResourcesRaw;
-};
+export type CantonAccount = Account;
+export type CantonAccountRaw = AccountRaw;

package/src/types/onboard.ts

@@ -9,7 +9,7 @@ export enum OnboardStatus {
   ERROR,
 }
 
-export enum PreApprovalStatus {
+export enum AuthorizeStatus {
   INIT,
   PREPARE,
   SIGN,
@@ -24,14 +24,14 @@ export type CantonOnboardProgress = {
 
 export type CantonOnboardResult = {
   partyId: string;
-  account: Partial<Account>;
+  account: Account;
 };
 
-export type CantonPreApprovalProgress = {
-  status: PreApprovalStatus;
+export type CantonAuthorizeProgress = {
+  status: AuthorizeStatus;
 };
 
-export type CantonPreApprovalResult = {
+export type CantonAuthorizeResult = {
   isApproved: boolean;
 };
 

package/lib/bridge/serialization.d.ts

@@ -1,4 +0,0 @@
-import type { Account, AccountRaw } from "@ledgerhq/types-live";
-export declare function assignToAccountRaw(account: Account, accountRaw: AccountRaw): void;
-export declare function assignFromAccountRaw(accountRaw: AccountRaw, account: Account): void;
-//# sourceMappingURL=serialization.d.ts.map

package/lib/bridge/serialization.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAqBhE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}

package/lib/bridge/serialization.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignToAccountRaw = assignToAccountRaw;
-exports.assignFromAccountRaw = assignFromAccountRaw;
-function toResourcesRaw(r) {
-    const { partyId } = r;
-    return {
-        partyId,
-    };
-}
-function fromResourcesRaw(r) {
-    const { partyId } = r;
-    return {
-        partyId,
-    };
-}
-function assignToAccountRaw(account, accountRaw) {
-    const cantonAccount = account;
-    const cantonAccountRaw = accountRaw;
-    if (cantonAccount.cantonResources) {
-        cantonAccountRaw.cantonResources = toResourcesRaw(cantonAccount.cantonResources);
-    }
-}
-function assignFromAccountRaw(accountRaw, account) {
-    const cantonResourcesRaw = accountRaw.cantonResources;
-    const cantonAccount = account;
-    if (cantonResourcesRaw) {
-        cantonAccount.cantonResources = fromResourcesRaw(cantonResourcesRaw);
-    }
-}
-//# sourceMappingURL=serialization.js.map

package/lib/bridge/serialization.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":";;AAqBA,gDAMC;AAED,oDAMC;AA3BD,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AACD,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,MAAM,aAAa,GAAG,OAAwB,CAAC;IAC/C,MAAM,gBAAgB,GAAG,UAA8B,CAAC;IACxD,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;QAClC,gBAAgB,CAAC,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,MAAM,kBAAkB,GAAI,UAA+B,CAAC,eAAe,CAAC;IAC5E,MAAM,aAAa,GAAG,OAAwB,CAAC;IAC/C,IAAI,kBAAkB,EAAE,CAAC;QACvB,aAAa,CAAC,eAAe,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACvE,CAAC;AACH,CAAC"}

package/lib-es/bridge/serialization.d.ts

@@ -1,4 +0,0 @@
-import type { Account, AccountRaw } from "@ledgerhq/types-live";
-export declare function assignToAccountRaw(account: Account, accountRaw: AccountRaw): void;
-export declare function assignFromAccountRaw(accountRaw: AccountRaw, account: Account): void;
-//# sourceMappingURL=serialization.d.ts.map

package/lib-es/bridge/serialization.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"serialization.d.ts","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAqBhE,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMjF;AAED,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAMnF"}

package/lib-es/bridge/serialization.js

@@ -1,27 +0,0 @@
-function toResourcesRaw(r) {
-    const { partyId } = r;
-    return {
-        partyId,
-    };
-}
-function fromResourcesRaw(r) {
-    const { partyId } = r;
-    return {
-        partyId,
-    };
-}
-export function assignToAccountRaw(account, accountRaw) {
-    const cantonAccount = account;
-    const cantonAccountRaw = accountRaw;
-    if (cantonAccount.cantonResources) {
-        cantonAccountRaw.cantonResources = toResourcesRaw(cantonAccount.cantonResources);
-    }
-}
-export function assignFromAccountRaw(accountRaw, account) {
-    const cantonResourcesRaw = accountRaw.cantonResources;
-    const cantonAccount = account;
-    if (cantonResourcesRaw) {
-        cantonAccount.cantonResources = fromResourcesRaw(cantonResourcesRaw);
-    }
-}
-//# sourceMappingURL=serialization.js.map

package/lib-es/bridge/serialization.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../src/bridge/serialization.ts"],"names":[],"mappings":"AAQA,SAAS,cAAc,CAAC,CAAkB;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AACD,SAAS,gBAAgB,CAAC,CAAqB;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACtB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IACzE,MAAM,aAAa,GAAG,OAAwB,CAAC;IAC/C,MAAM,gBAAgB,GAAG,UAA8B,CAAC;IACxD,IAAI,aAAa,CAAC,eAAe,EAAE,CAAC;QAClC,gBAAgB,CAAC,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,UAAsB,EAAE,OAAgB;IAC3E,MAAM,kBAAkB,GAAI,UAA+B,CAAC,eAAe,CAAC;IAC5E,MAAM,aAAa,GAAG,OAAwB,CAAC;IAC/C,IAAI,kBAAkB,EAAE,CAAC;QACvB,aAAa,CAAC,eAAe,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACvE,CAAC;AACH,CAAC"}

package/src/bridge/serialization.ts

@@ -1,36 +0,0 @@
-import type { Account, AccountRaw } from "@ledgerhq/types-live";
-import type {
-  CantonAccount,
-  CantonAccountRaw,
-  CantonResources,
-  CantonResourcesRaw,
-} from "../types";
-
-function toResourcesRaw(r: CantonResources): CantonResourcesRaw {
-  const { partyId } = r;
-  return {
-    partyId,
-  };
-}
-function fromResourcesRaw(r: CantonResourcesRaw): CantonResources {
-  const { partyId } = r;
-  return {
-    partyId,
-  };
-}
-
-export function assignToAccountRaw(account: Account, accountRaw: AccountRaw): void {
-  const cantonAccount = account as CantonAccount;
-  const cantonAccountRaw = accountRaw as CantonAccountRaw;
-  if (cantonAccount.cantonResources) {
-    cantonAccountRaw.cantonResources = toResourcesRaw(cantonAccount.cantonResources);
-  }
-}
-
-export function assignFromAccountRaw(accountRaw: AccountRaw, account: Account): void {
-  const cantonResourcesRaw = (accountRaw as CantonAccountRaw).cantonResources;
-  const cantonAccount = account as CantonAccount;
-  if (cantonResourcesRaw) {
-    cantonAccount.cantonResources = fromResourcesRaw(cantonResourcesRaw);
-  }
-}