@ledgerhq/coin-canton 0.5.0-nightly.3 → 0.5.0-nightly.4

package/src/bridge/sync.ts

@@ -1,14 +1,14 @@
 import BigNumber from "bignumber.js";
 import { Operation } from "@ledgerhq/types-live";
-import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
+import { decodeAccountId, encodeAccountId } from "@ledgerhq/coin-framework/account/index";
 import { GetAccountShape, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-import { getBalance, getLedgerEnd, getOperations, type OperationInfo } from "../network/gateway";
-
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
+import { getBalance, getLedgerEnd, getOperations, type OperationInfo } from "../network/gateway";
+import { CantonAccount } from "../types";
 import coinConfig from "../config";
 
 const txInfoToOperationAdapter =
-  (accountId: string, address: string) =>
+  (accountId: string, partyId: string) =>
   (txInfo: OperationInfo): Operation => {
     const {
       transaction_hash,
@@ -20,7 +20,7 @@ const txInfoToOperationAdapter =
       fee: { value: fee },
       transfers: [{ value: transferValue }],
     } = txInfo;
-    const type = senders.includes(address) ? "OUT" : "IN";
+    const type = senders.includes(partyId) ? "OUT" : "IN";
     const value = new BigNumber(transferValue);
     const feeValue = new BigNumber(fee);
 
@@ -48,24 +48,31 @@ const txInfoToOperationAdapter =
 const filterOperations = (
   transactions: OperationInfo[],
   accountId: string,
-  address: string,
+  partyId: string,
 ): Operation[] => {
   return transactions
     .filter(tx => tx.type === "Receive" || tx.type === "Send")
-    .map(txInfoToOperationAdapter(accountId, address));
+    .map(txInfoToOperationAdapter(accountId, partyId));
 };
 
-export const getAccountShape: GetAccountShape = async info => {
-  const { address, initialAccount, currency, derivationMode } = info;
-  // TODO: we need better solution ?
-  const xpubOrAddress = address?.replace(/:/g, "_") || "";
+export const getAccountShape: GetAccountShape<CantonAccount> = async info => {
+  const { address, initialAccount, currency, derivationMode, derivationPath, rest } = info;
+
+  const xpubOrAddress = (
+    (initialAccount && initialAccount.id && decodeAccountId(initialAccount.id).xpubOrAddress) ||
+    ""
+  ).replace(/:/g, "_");
+  const partyId =
+    rest?.cantonResources?.partyId ||
+    initialAccount?.cantonResources?.partyId ||
+    xpubOrAddress.replace(/_/g, ":");
 
   const accountId = encodeAccountId({
     type: "js",
     version: "2",
     currencyId: currency.id,
     xpubOrAddress,
-    derivationMode: "",
+    derivationMode,
   });
 
   // blockheight retrieval
@@ -73,7 +80,7 @@ export const getAccountShape: GetAccountShape = async info => {
 
   // Account info retrieval + spendable balance calculation
   // const accountInfo = await getAccountInfo(address);
-  const balances = await getBalance(address);
+  const balances = await getBalance(partyId);
 
   // TODO change to balance.instrument_id === "Amulet" after update on backend
   const balanceData = balances.find(balance => balance.instrument_id.includes("Amulet")) || {
@@ -93,16 +100,12 @@ export const getAccountShape: GetAccountShape = async info => {
   // Tx history fetching
   const oldOperations = initialAccount?.operations || [];
   const startAt = oldOperations.length ? (oldOperations[0].blockHeight || 0) + 1 : 0;
-  const transactionData = await getOperations(address, {
+  const transactionData = await getOperations(partyId, {
     cursor: startAt,
     limit: 100,
   });
 
-  const newOperations = filterOperations(
-    transactionData.operations,
-    accountId,
-    address.replace(/_/g, ":"),
-  );
+  const newOperations = filterOperations(transactionData.operations, accountId, partyId);
   const operations = mergeOps(oldOperations, newOperations);
 
   // We return the new account shape
@@ -114,6 +117,11 @@ export const getAccountShape: GetAccountShape = async info => {
     spendableBalance,
     operations,
     operationsCount: operations.length,
+    freshAddress: address,
+    freshAddressPath: derivationPath,
+    cantonResources: {
+      partyId,
+    },
   };
 
   return shape;

package/src/common-logic/transaction/estimateFees.ts

@@ -1,4 +1,8 @@
+import coinConfig from "../../config";
+
+const feeValue = () => coinConfig.getCoinConfig().fee ?? 10_000;
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function estimateFees(serializedTransaction: string): Promise<bigint> {
-  return Promise.resolve(BigInt(10_000)); // TODO replace with real implementation
+  return Promise.resolve(BigInt(feeValue())); // TODO replace with real implementation
 }

package/src/config.ts

@@ -10,6 +10,7 @@ export type CantonConfig = {
   networkType: "mainnet" | "devnet" | "localnet";
   useGateway?: boolean;
   nativeInstrumentId?: string;
+  fee?: number;
 };
 
 export type CantonCoinConfig = CurrencyConfig & CantonConfig;

package/src/network/gateway.integ.test.ts

@@ -58,7 +58,8 @@ describe("gateway (devnet)", () => {
       expect(response).toHaveProperty("public_key_fingerprint");
       expect(response).toHaveProperty("transactions");
       expect(response.transactions).toHaveProperty("combined_hash");
-      expect(response.party_name).toBe(keyPair.publicKeyHex);
+      expect(response.party_name).toBeDefined();
+      expect(typeof response.party_name).toBe("string");
 
       expect(response.public_key_fingerprint).toBe(keyPair.fingerprint);
     }, 30000);

package/src/network/gateway.ts

@@ -54,16 +54,6 @@ export type PrepareTransferRequest = {
   reason?: string;
 };
 
-export type PrepareTapRequest = {
-  type: "tap-request";
-  amount: number;
-};
-
-export type PreparePreapprovalRequest = {
-  type: "transfer-pre-approval-proposal";
-  receiver: string;
-};
-
 type OnboardingSubmitRequest = {
   prepare_request: OnboardingPrepareRequest;
   prepare_response: OnboardingPrepareResponse;
@@ -274,6 +264,7 @@ export type OperationInfo =
 
 const getGatewayUrl = () => coinConfig.getCoinConfig().gatewayUrl;
 const getNodeId = () => coinConfig.getCoinConfig().nodeId || "ledger-devnet-stg";
+const getNetworkType = () => coinConfig.getCoinConfig().networkType;
 
 const gatewayNetwork = <T, U = unknown>(req: LiveNetworkRequest<U>) => {
   const API_KEY = getEnv("CANTON_API_KEY");
@@ -338,8 +329,7 @@ export async function submit(partyId: string, serialized: string, signature: str
 export async function getBalance(partyId: string): Promise<InstrumentBalance[]> {
   const { data } = await gatewayNetwork<InstrumentBalance[]>({
     method: "GET",
-    // TODO: we need better solution ?
-    url: `${getGatewayUrl()}/v1/node/${getNodeId()}/party/${partyId.replace(/_/g, ":")}/balance`,
+    url: `${getGatewayUrl()}/v1/node/${getNodeId()}/party/${partyId}/balance`,
   });
   return data;
 }
@@ -377,21 +367,21 @@ export async function getOperations(
     operations: OperationInfo[];
   }>({
     method: "GET",
-    url: `${getGatewayUrl()}/v1/node/${getNodeId()}/party/${partyId.replace(/_/g, ":")}/operations`,
+    url: `${getGatewayUrl()}/v1/node/${getNodeId()}/party/${partyId}/operations`,
     params: options,
   });
   return data;
 }
 
-type PrepareTapRequestRequest = {
+type PrepareTapRequest = {
   partyId: string;
   amount?: number;
 };
 
-type PrepareTapRequestResponse = {
-  serialized: "string";
+type PrepareTapResponse = {
+  serialized: string;
   json: null;
-  hash: "string";
+  hash: string;
 };
 
 enum TransactionType {
@@ -402,11 +392,15 @@ enum TransactionType {
 export async function prepareTapRequest({
   partyId,
   amount = 1000000,
-}: PrepareTapRequestRequest): Promise<PrepareTapRequestResponse> {
-  const { data } = await gatewayNetwork<
-    PrepareTapRequestResponse,
-    { amount: number; type: string }
-  >({
+}: PrepareTapRequest): Promise<PrepareTapResponse> {
+  if (getNetworkType() === "mainnet") {
+    return {
+      serialized: "",
+      json: null,
+      hash: "",
+    };
+  }
+  const { data } = await gatewayNetwork<PrepareTapResponse, { amount: number; type: string }>({
     method: "POST",
     url: `${getGatewayUrl()}/v1/node/${getNodeId()}/party/${partyId}/transaction/prepare`,
     data: {
@@ -451,7 +445,7 @@ export async function prepareTransferRequest(
   partyId: string,
   params: PrepareTransferRequest,
 ): Promise<PrepareTransferResponse> {
-  const { data } = await network<PrepareTransferResponse>({
+  const { data } = await gatewayNetwork<PrepareTransferResponse, PrepareTransferRequest>({
     method: "POST",
     url: `${getGatewayUrl()}/v1/node/${getNodeId()}/party/${partyId}/transaction/prepare`,
     data: params,

package/src/signer/getAddress.ts

@@ -1,17 +1,19 @@
 import { GetAddressOptions } from "@ledgerhq/coin-framework/derivation";
 import { GetAddressFn } from "@ledgerhq/coin-framework/bridge/getAddressWrapper";
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { CantonSigner } from "../types";
+import { CantonSigner, CantonAddress } from "../types";
 
 const getAddress = (signerContext: SignerContext<CantonSigner>): GetAddressFn => {
-  return async (deviceId: string, { path }: GetAddressOptions) => {
-    const { address, publicKey } = await signerContext(deviceId, signer => signer.getAddress(path));
+  return async (deviceId: string, { path, verify }: GetAddressOptions) => {
+    const { address, publicKey } = await signerContext(deviceId, signer =>
+      signer.getAddress(path, verify),
+    );
 
     return {
       path,
       address,
       publicKey,
-    };
+    } satisfies CantonAddress;
   };
 };
 

package/src/types/bridge.ts

@@ -1,6 +1,8 @@
 import type { BigNumber } from "bignumber.js";
 import type { Observable } from "rxjs";
 import type {
+  Account,
+  AccountRaw,
   CurrencyBridge,
   TransactionCommon,
   TransactionCommonRaw,
@@ -50,3 +52,17 @@ 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;
+};

package/src/types/onboard.ts

@@ -1,3 +1,5 @@
+import { Account } from "@ledgerhq/types-live";
+
 export enum OnboardStatus {
   INIT,
   PREPARE,
@@ -22,6 +24,7 @@ export type CantonOnboardProgress = {
 
 export type CantonOnboardResult = {
   partyId: string;
+  account: Partial<Account>;
 };
 
 export type CantonPreApprovalProgress = {

package/src/types/signer.ts

@@ -1,11 +1,12 @@
 export type CantonAddress = {
   publicKey: string;
   address: string;
+  path: string; // TODO: check if necessary
 };
 
 export type CantonSignature = string; // `0x${string}`
 
 export interface CantonSigner {
-  getAddress(path: string): Promise<CantonAddress>;
+  getAddress(path: string, display?: boolean): Promise<CantonAddress>;
   signTransaction(path: string, rawTx: string): Promise<CantonSignature>;
 }