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

package/lib-es/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AAEzB,MAAM,MAAM,4BAA4B,GAAG;IACzC,eAAe,EAAE,SAAS,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC"}

package/lib-es/types/onboard.d.ts

@@ -1,4 +1,3 @@
-import { Account } from "@ledgerhq/types-live";
 export declare enum OnboardStatus {
     INIT = 0,
     PREPARE = 1,
@@ -20,7 +19,6 @@ export type CantonOnboardProgress = {
 };
 export type CantonOnboardResult = {
     partyId: string;
-    account: Partial<Account>;
 };
 export type CantonPreApprovalProgress = {
     status: PreApprovalStatus;

package/lib-es/types/onboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onboard.d.ts","sourceRoot":"","sources":["../../src/types/onboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;GAGG;AAEH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,gCAAgC,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"onboard.d.ts","sourceRoot":"","sources":["../../src/types/onboard.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,KAAK,IAAA;CACN;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;GAGG;AAEH,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,gCAAgC,CAAC;IACvC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,GAAG,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB"}

package/lib-es/types/onboard.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/types/onboard.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,iDAAI,CAAA;IACJ,uDAAO,CAAA;IACP,iDAAI,CAAA;IACJ,qDAAM,CAAA;IACN,uDAAO,CAAA;IACP,mDAAK,CAAA;AACP,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED,MAAM,CAAN,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAC3B,yDAAI,CAAA;IACJ,+DAAO,CAAA;IACP,yDAAI,CAAA;IACJ,6DAAM,CAAA;IACN,+DAAO,CAAA;IACP,2DAAK,CAAA;AACP,CAAC,EAPW,iBAAiB,KAAjB,iBAAiB,QAO5B"}
+{"version":3,"file":"onboard.js","sourceRoot":"","sources":["../../src/types/onboard.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAOX;AAPD,WAAY,aAAa;IACvB,iDAAI,CAAA;IACJ,uDAAO,CAAA;IACP,iDAAI,CAAA;IACJ,qDAAM,CAAA;IACN,uDAAO,CAAA;IACP,mDAAK,CAAA;AACP,CAAC,EAPW,aAAa,KAAb,aAAa,QAOxB;AAED,MAAM,CAAN,IAAY,iBAOX;AAPD,WAAY,iBAAiB;IAC3B,yDAAI,CAAA;IACJ,+DAAO,CAAA;IACP,yDAAI,CAAA;IACJ,6DAAM,CAAA;IACN,+DAAO,CAAA;IACP,2DAAK,CAAA;AACP,CAAC,EAPW,iBAAiB,KAAjB,iBAAiB,QAO5B"}

package/lib-es/types/signer.d.ts

@@ -1,11 +1,10 @@
 export type CantonAddress = {
     publicKey: string;
     address: string;
-    path: string;
 };
 export type CantonSignature = string;
 export interface CantonSigner {
-    getAddress(path: string, display?: boolean): Promise<CantonAddress>;
+    getAddress(path: string): Promise<CantonAddress>;
     signTransaction(path: string, rawTx: string): Promise<CantonSignature>;
 }
 //# sourceMappingURL=signer.d.ts.map

package/lib-es/types/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/types/signer.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AAErC,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACpE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACxE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/types/signer.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AAErC,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACjD,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACxE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-canton",
-  "version": "0.5.0-nightly.4",
+  "version": "0.5.0",
   "description": "Canton coin integration",
   "keywords": [
     "Ledger",
@@ -101,13 +101,13 @@
     "bignumber.js": "^9.1.2",
     "invariant": "^2.2.4",
     "rxjs": "^7.8.1",
-    "@ledgerhq/coin-framework": "^6.4.0-nightly.4",
-    "@ledgerhq/cryptoassets": "^13.28.0-nightly.2",
+    "@ledgerhq/coin-framework": "^6.4.0",
+    "@ledgerhq/cryptoassets": "^13.28.0",
     "@ledgerhq/devices": "8.5.1",
     "@ledgerhq/errors": "^6.25.0",
-    "@ledgerhq/live-env": "^2.16.0-nightly.1",
-    "@ledgerhq/live-network": "^2.0.17-nightly.1",
-    "@ledgerhq/types-live": "^6.84.0-nightly.1"
+    "@ledgerhq/live-env": "^2.16.0",
+    "@ledgerhq/live-network": "^2.0.17",
+    "@ledgerhq/types-live": "^6.84.0"
   },
   "devDependencies": {
     "@types/invariant": "^2.2.37",
@@ -117,7 +117,7 @@
     "jest": "^29.7.0",
     "ts-jest": "^29.1.1",
     "typescript": "^5.4.5",
-    "@ledgerhq/types-cryptoassets": "^7.27.0-nightly.0",
+    "@ledgerhq/types-cryptoassets": "^7.26.0",
     "@ledgerhq/disable-network-setup": "^0.0.0"
   },
   "scripts": {

package/src/api/getBalance.integ.test.ts

@@ -10,7 +10,8 @@ describe("devnet", () => {
       networkType: "devnet",
       gatewayUrl: "https://canton-gateway.api.live.ledger-test.com",
       useGateway: true,
-      nativeInstrumentId: "Amulet",
+      nativeInstrumentId:
+        "6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c:Splice.Amulet:Amulet",
     });
   });
 
@@ -19,13 +20,9 @@ describe("devnet", () => {
       const balance = await api.getBalance(
         "party-4f2e1485107adf5f::122027c6dbbbdbffe0fa3122ae05175f3b9328e879e9ce96b670354deb64a45683c1",
       );
-      expect(balance.length).toBeGreaterThanOrEqual(0);
-      if (balance.length > 0) {
-        const nativeBalance = balance.find(b => b.asset.type === "native");
-        if (nativeBalance) {
-          expect(nativeBalance.value).toBeGreaterThanOrEqual(BigInt(0));
-        }
-      }
+      expect(balance.length).toBeGreaterThanOrEqual(1);
+      const nativeBalance = balance.find(b => b.asset.type === "native");
+      expect(nativeBalance?.value).toBeGreaterThanOrEqual(0);
     });
   });
 });

package/src/api/index.ts

@@ -2,13 +2,13 @@ import {
   AlpacaApi,
   Block,
   BlockInfo,
+  CraftedTransaction,
   Cursor,
   FeeEstimation,
   Page,
   Reward,
   Stake,
   TransactionIntent,
-  CraftedTransaction,
 } from "@ledgerhq/coin-framework/api/index";
 import coinConfig, { type CantonConfig } from "../config";
 import {
@@ -17,6 +17,7 @@ import {
   craftTransaction,
   estimateFees,
   getBalance,
+  getNextValidSequence,
   lastBlock,
   listOperations,
 } from "../common-logic";
@@ -28,8 +29,8 @@ export function createApi(config: CantonConfig): AlpacaApi {
   return {
     broadcast,
     combine,
-    craftTransaction: craft(config.nativeInstrumentId ?? ""),
-    estimateFees: estimate(config.nativeInstrumentId ?? ""),
+    craftTransaction: craft,
+    estimateFees: estimate,
     getBalance,
     lastBlock,
     listOperations,
@@ -48,36 +49,28 @@ export function createApi(config: CantonConfig): AlpacaApi {
   };
 }
 
-const craft =
-  (tokenId: string) =>
-  async (transactionIntent: TransactionIntent): Promise<CraftedTransaction> => {
-    const tx = await craftTransaction(
-      { address: transactionIntent.sender },
-      {
-        recipient: transactionIntent.recipient,
-        amount: new BigNumber(transactionIntent.amount.toString()),
-        tokenId,
-        expireInSeconds: 24 * 60 * 60,
-      },
-    );
-
-    return { transaction: tx.serializedTransaction };
-  };
+async function craft(transactionIntent: TransactionIntent): Promise<CraftedTransaction> {
+  const nextSequenceNumber = await getNextValidSequence(transactionIntent.sender);
+  const tx = await craftTransaction(
+    { address: transactionIntent.sender, nextSequenceNumber },
+    {
+      recipient: transactionIntent.recipient,
+      amount: new BigNumber(transactionIntent.amount.toString()),
+    },
+  );
+  return { transaction: tx.serializedTransaction };
+}
 
-const estimate =
-  (tokenId: string) =>
-  async (transactionIntent: TransactionIntent): Promise<FeeEstimation> => {
-    const { serializedTransaction } = await craftTransaction(
-      { address: transactionIntent.sender },
-      {
-        recipient: transactionIntent.recipient,
-        amount: new BigNumber(transactionIntent.amount.toString()),
-        tokenId,
-        expireInSeconds: 24 * 60 * 60,
-      },
-    );
+async function estimate(transactionIntent: TransactionIntent): Promise<FeeEstimation> {
+  const { serializedTransaction } = await craftTransaction(
+    { address: transactionIntent.sender },
+    {
+      recipient: transactionIntent.recipient,
+      amount: new BigNumber(transactionIntent.amount.toString()),
+    },
+  );
 
-    const value = await estimateFees(serializedTransaction);
+  const value = await estimateFees(serializedTransaction);
 
-    return { value };
-  };
+  return { value };
+}

package/src/bridge/broadcast.ts

@@ -3,8 +3,9 @@ import { patchOperationWithHash } from "@ledgerhq/coin-framework/operation";
 import { broadcast as broadcastLogic } from "../common-logic";
 import { Transaction } from "../types";
 
-export const broadcast: AccountBridge<Transaction>["broadcast"] = async ({ signedOperation }) => {
-  const { operation, signature } = signedOperation;
+export const broadcast: AccountBridge<Transaction>["broadcast"] = async ({
+  signedOperation: { signature, operation },
+}) => {
   const hash = await broadcastLogic(signature);
   return patchOperationWithHash(operation, hash);
 };

package/src/bridge/index.ts

@@ -21,7 +21,6 @@ import { buildSignOperation } from "./signOperation";
 import { getAccountShape } from "./sync";
 import { updateTransaction } from "./updateTransaction";
 import { buildOnboardAccount, buildAuthorizePreapproval } from "./onboard";
-import { assignFromAccountRaw, assignToAccountRaw } from "./serialization";
 
 export function createBridges(
   signerContext: SignerContext<CantonSigner>,
@@ -63,8 +62,6 @@ export function createBridges(
     sync,
     receive,
     signOperation,
-    assignToAccountRaw,
-    assignFromAccountRaw,
     getSerializedAddressParameters,
   };
 

package/src/bridge/onboard.integ.test.ts

@@ -11,7 +11,7 @@ import {
 } from "../types/onboard";
 import coinConfig from "../config";
 
-describe("onboard (devnet)", () => {
+describe("onboard integration tests", () => {
   const mockDeviceId = "test-device-id";
   const mockDerivationPath = "44'/6767'/0'/0'/0'";
 
@@ -90,7 +90,7 @@ describe("onboard (devnet)", () => {
       const result = await isAccountOnboarded(keyPair.publicKeyHex);
 
       // THEN
-      expect(result).toEqual({ isOnboarded: false });
+      expect(result).toBe(false);
     }, 15000);
 
     it("should handle errors gracefully when checking non-existent party", async () => {
@@ -101,7 +101,7 @@ describe("onboard (devnet)", () => {
       const result = await isAccountOnboarded(keyPair.publicKeyHex);
 
       // THEN
-      expect(result).toEqual({ isOnboarded: false });
+      expect(result).toBe(false);
     }, 15000);
   });
 

package/src/bridge/onboard.ts

@@ -1,11 +1,6 @@
 import { Observable } from "rxjs";
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { emptyHistoryCache } from "@ledgerhq/coin-framework/account/index";
-import { getDerivationModesForCurrency } from "@ledgerhq/coin-framework/derivation";
-import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
-import { getAccountShape } from "./sync";
-import { CantonAccount, CantonSigner } from "../types";
-import type { Account } from "@ledgerhq/types-live";
+import { CantonSigner } from "../types/signer";
 import {
   prepareOnboarding,
   submitOnboarding,
@@ -24,9 +19,8 @@ import {
   CantonPreApprovalResult,
   PrepareTransactionResponse,
 } from "../types/onboard";
-import resolver from "../signer";
 
-async function _getKeypair(
+async function getKeypair(
   signerContext: SignerContext<CantonSigner>,
   deviceId: string,
   derivationPath: string,
@@ -37,23 +31,20 @@ async function _getKeypair(
   });
 }
 
-const currency = getCryptoCurrencyById("canton_network");
-const derivationMode = getDerivationModesForCurrency(currency)[0];
-
 export const isAccountOnboarded = async (
   publicKey: string,
-): Promise<{ isOnboarded: boolean; party_id?: string }> => {
+): Promise<false | { party_id: string }> => {
   try {
     const { party_id } = await getPartyByPubKey(publicKey);
 
     if (party_id) {
-      return { isOnboarded: true, party_id };
+      return { party_id };
     } else {
-      return { isOnboarded: false };
+      return false;
     }
   } catch (err) {
     log("[isAccountOnboarded] Error checking party status (likely not onboarded):", err);
-    return { isOnboarded: false };
+    return false;
   }
 };
 
@@ -68,29 +59,22 @@ export const buildOnboardAccount =
         observer.next({
           status: OnboardStatus.INIT,
         });
-        const getAddress = resolver(signerContext);
-        const { address, publicKey } = await getAddress(deviceId, {
-          path: derivationPath,
-          currency,
-          derivationMode: derivationMode || "",
-        });
+        const keypair = await getKeypair(signerContext, deviceId, derivationPath);
 
         observer.next({
           status: OnboardStatus.PREPARE,
         });
 
-        const { party_id: partyId } = await isAccountOnboarded(publicKey);
-        if (partyId) {
-          const account = await createAccount({ address, derivationPath, partyId });
+        const isOnboardedResult = await isAccountOnboarded(keypair.publicKey);
+        if (isOnboardedResult && isOnboardedResult.party_id) {
           observer.next({
-            partyId,
-            account,
+            partyId: isOnboardedResult.party_id,
           });
           observer.complete();
           return;
         }
 
-        const preparedTransaction = await prepareOnboarding(publicKey, "ed25519");
+        const preparedTransaction = await prepareOnboarding(keypair.publicKey, "ed25519");
 
         observer.next({
           status: OnboardStatus.SIGN,
@@ -105,39 +89,26 @@ export const buildOnboardAccount =
         });
 
         const result = await submitOnboarding(
-          { public_key: publicKey, public_key_type: "ed25519" },
+          { public_key: keypair.publicKey, public_key_type: "ed25519" },
           preparedTransaction,
           signature,
-        ).catch(async err => {
+        ).catch(err => {
           if (err.type === "PARTY_ALREADY_EXISTS") {
-            const account = await createAccount({
-              address,
-              derivationPath,
-              partyId: preparedTransaction.party_id,
-            });
             observer.next({
               partyId: preparedTransaction.party_id,
-              account,
             });
             return observer.complete();
           }
           throw err;
         });
 
-        if (result) {
-          observer.next({
-            status: OnboardStatus.SUCCESS,
-          });
-          const account = await createAccount({
-            address,
-            derivationPath,
-            partyId: result.party.party_id,
-          });
-          observer.next({
-            partyId: result.party.party_id,
-            account,
-          });
-        }
+        observer.next({
+          status: OnboardStatus.SUCCESS,
+        });
+
+        observer.next({
+          partyId: result?.party?.party_id || "unknown",
+        });
 
         observer.complete();
       }
@@ -193,35 +164,38 @@ export const buildAuthorizePreapproval =
           isApproved,
         });
 
+        // TODO: remove after demo
         const handleTapRequest = async () => {
           try {
+            observer.next({
+              status: PreApprovalStatus.PREPARE,
+            });
+
             const { serialized, hash } = await prepareTapRequest({
               partyId,
             });
 
-            if (serialized && hash) {
-              observer.next({
-                status: PreApprovalStatus.SIGN,
-              });
-
-              const signature = await signerContext(deviceId, signer =>
-                signer.signTransaction(derivationPath, hash),
-              );
-
-              observer.next({
-                status: PreApprovalStatus.SUBMIT,
-              });
-
-              await submitTapRequest({
-                partyId,
-                serialized,
-                signature,
-              });
-
-              observer.next({
-                status: PreApprovalStatus.SUCCESS,
-              });
-            }
+            observer.next({
+              status: PreApprovalStatus.SIGN,
+            });
+
+            const signature = await signerContext(deviceId, signer =>
+              signer.signTransaction(derivationPath, hash),
+            );
+
+            observer.next({
+              status: PreApprovalStatus.SUBMIT,
+            });
+
+            await submitTapRequest({
+              partyId,
+              serialized,
+              signature,
+            });
+
+            observer.next({
+              status: PreApprovalStatus.SUCCESS,
+            });
           } catch (err) {
             // Tap request failure should not break the pre-approval flow
           }
@@ -240,54 +214,7 @@ export const buildAuthorizePreapproval =
       );
     });
 
-const createAccount = async ({
-  address,
-  partyId,
-  derivationPath,
-  index = 0,
-}: {
-  address: string;
-  derivationPath: string;
-  partyId: string;
-  index?: number;
-}): Promise<Partial<Account>> => {
-  const accountShape = await getAccountShape(
-    {
-      address,
-      currency,
-      derivationMode,
-      derivationPath,
-      index,
-      rest: {
-        cantonResources: {
-          partyId,
-        },
-      },
-    },
-    { paginationConfig: {} },
-  );
-
-  const account: Partial<CantonAccount> = {
-    ...accountShape,
-    type: "Account",
-    xpub: partyId.replace(/:/g, "_"),
-    index,
-    // operations: [],
-    currency,
-    derivationMode,
-    lastSyncDate: new Date(),
-    pendingOperations: [],
-    seedIdentifier: address,
-    balanceHistoryCache: emptyHistoryCache,
-    cantonResources: {
-      partyId,
-    },
-  };
-
-  return account;
-};
-
-const log = (message: string, ...rest: unknown[]) => {
+const log = (message: string, ...rest: any[]) => {
   // eslint-disable-next-line no-console
   console.log(message, ...rest);
 };

package/src/bridge/prepareTransaction.ts

@@ -1,16 +1,25 @@
 import { AccountBridge } from "@ledgerhq/types-live";
 import { Transaction } from "../types";
-import { estimateFees } from "../common-logic";
+import { craftTransaction, estimateFees } from "../common-logic";
+import { getNextSequence } from "../network/node";
 import BigNumber from "bignumber.js";
-import { updateTransaction } from "./updateTransaction";
 
 export const prepareTransaction: AccountBridge<Transaction>["prepareTransaction"] = async (
   account,
   transaction,
 ) => {
-  let fee = transaction.fee;
-  if (!fee || fee.eq(0)) {
-    fee = BigNumber((await estimateFees("")).toString());
+  const seq = await getNextSequence(account.freshAddress);
+
+  const craftedTransaction = await craftTransaction(
+    { address: account.freshAddress, nextSequenceNumber: seq },
+    { amount: transaction.amount, recipient: transaction.recipient },
+  );
+
+  const fee = await estimateFees(craftedTransaction.serializedTransaction);
+
+  if (transaction.fee !== new BigNumber(fee.toString())) {
+    return { ...transaction, fee: new BigNumber(fee.toString()) };
   }
-  return updateTransaction(transaction, { fee });
+
+  return transaction;
 };

package/src/bridge/signOperation.ts

@@ -3,8 +3,8 @@ import { FeeNotLoaded } from "@ledgerhq/errors";
 import { AccountBridge, Operation } from "@ledgerhq/types-live";
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
-import { combine, craftTransaction } from "../common-logic";
-import { Transaction, CantonSigner } from "../types";
+import { combine, craftTransaction, getNextValidSequence } from "../common-logic";
+import { Transaction, CantonSigner, BoilerplateNativeTransaction } from "../types";
 
 export const buildSignOperation =
   (signerContext: SignerContext<CantonSigner>): AccountBridge<Transaction>["signOperation"] =>
@@ -20,24 +20,30 @@ export const buildSignOperation =
             type: "device-signature-requested",
           });
 
+          const nextSequenceNumber = await getNextValidSequence(account.freshAddress);
+
           const signature = await signerContext(deviceId, async signer => {
             const { freshAddressPath: derivationPath } = account;
-            const partyId = account.freshAddress.replace("__", "::");
+            const { publicKey } = await signer.getAddress(derivationPath);
 
-            const { hash, serializedTransaction } = await craftTransaction(
+            const { nativeTransaction, serializedTransaction } = await craftTransaction(
               {
-                address: partyId,
+                address: account.freshAddress,
+                publicKey,
               },
               {
                 recipient: transaction.recipient,
                 amount: transaction.amount,
-                expireInSeconds: 60 * 60,
-                tokenId: "Amulet",
+                fee: fee,
               },
             );
-            const transactionSignature = await signer.signTransaction(derivationPath, hash);
 
-            return combine(serializedTransaction, `${transactionSignature}__PARTY__${partyId}`);
+            const transactionSignature = await signer.signTransaction(
+              derivationPath,
+              serializedTransaction,
+            );
+
+            return combine(serializedTransaction, transactionSignature);
           });
 
           o.next({
@@ -58,6 +64,7 @@ export const buildSignOperation =
             senders: [account.freshAddress],
             recipients: [transaction.recipient],
             date: new Date(),
+            transactionSequenceNumber: nextSequenceNumber,
             extra: {},
           };