@ledgerhq/live-common 34.3.0-windows-certificate.0 → 35.0.0-next.6

package/src/families/bitcoin/setup.ts

@@ -10,7 +10,7 @@ import type { SignerContext } from "@ledgerhq/coin-bitcoin/signer";
 import makeCliTools from "@ledgerhq/coin-bitcoin/cli-transaction";
 import bitcoinResolver from "@ledgerhq/coin-bitcoin/hw-getAddress";
 import { signMessage } from "@ledgerhq/coin-bitcoin/hw-signMessage";
-import { Transaction } from "@ledgerhq/coin-bitcoin/types";
+import { BitcoinAccount, Transaction, TransactionStatus } from "@ledgerhq/coin-bitcoin/types";
 import { GetAddressOptions, Resolver } from "../../hw/getAddress/types";
 import { withDevice } from "../../hw/deviceAccess";
 import { startSpan } from "../../performance";
@@ -40,7 +40,11 @@ const perfLogger = {
   startSpan,
 };
 
-const bridge: Bridge<Transaction> = createBridges(signerContext, perfLogger, getCurrencyConfig);
+const bridge: Bridge<Transaction, BitcoinAccount, TransactionStatus> = createBridges(
+  signerContext,
+  perfLogger,
+  getCurrencyConfig,
+);
 
 export function createMessageSigner(): SignMessage {
   return (transport, account, messageData) => {

package/src/families/bitcoin/walletApiAdapter.ts

@@ -4,7 +4,7 @@ import {
   ConvertToLiveTransaction,
   GetWalletAPITransactionSignFlowInfos,
 } from "../../wallet-api/types";
-import createTransaction from "@ledgerhq/coin-bitcoin/js-createTransaction";
+import createTransaction from "@ledgerhq/coin-bitcoin/createTransaction";
 import { Transaction } from "@ledgerhq/coin-bitcoin/types";
 
 const CAN_EDIT_FEES = true;
@@ -14,10 +14,10 @@ const areFeesProvided: AreFeesProvided<WalletAPIBitcoinTransaction> = tx => !!tx
 const convertToLiveTransaction: ConvertToLiveTransaction<
   WalletAPIBitcoinTransaction,
   Transaction
-> = ({ walletApiTransaction }) => {
+> = ({ account, walletApiTransaction }) => {
   const hasFeesProvided = areFeesProvided(walletApiTransaction);
 
-  const liveTx: Transaction = createTransaction();
+  const liveTx: Transaction = createTransaction(account);
 
   if (walletApiTransaction.amount) {
     liveTx.amount = walletApiTransaction.amount;

package/src/families/cardano/__snapshots__/bridge.integration.test.ts.snap

@@ -756,7 +756,6 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 1`]
     "freshAddressPath": "1852'/1815'/0'/0/2",
     "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
     "index": 0,
-    "nfts": undefined,
     "operationsCount": 6,
     "pendingOperations": [],
     "seedIdentifier": "bea94629d5cf776b8374a00afa15686f0b0742dd0330f86804c61202",
@@ -1402,7 +1401,6 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 1`]
     "freshAddressPath": "1852'/1815'/1'/0/0",
     "id": "js:2:cardano_testnet:ed5e0d059cb2eed53ea30b9ba84bb3aaa6c2364c6305a0c9a7e8944aa439884a642cc2f06e601808926e14b6e27417be0b0323d5a5149f1eebab8fc4e1fe14d4:cardano",
     "index": 1,
-    "nfts": undefined,
     "operationsCount": 0,
     "pendingOperations": [],
     "seedIdentifier": "bea94629d5cf776b8374a00afa15686f0b0742dd0330f86804c61202",
@@ -1423,20 +1421,16 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "accountId": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
       "blockHash": undefined,
       "blockHeight": 278777,
-      "contract": undefined,
       "extra": {},
       "fee": "172805",
       "hash": "1bc0f281044d852d6390c7977ff6cbf446e315c6b8879e1fa0dcc021372ac5e3",
       "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano-1bc0f281044d852d6390c7977ff6cbf446e315c6b8879e1fa0dcc021372ac5e3-DELEGATE",
-      "operator": undefined,
       "recipients": [
         "addr_test1qrd4usvu5fhsy2u5dwgqh8nqvgqkxx65x792tarksgrphxa4mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smq08uhn5",
       ],
       "senders": [
         "addr_test1qrxusg8ujg7p7rppaksq0wpmzhd8wrk7uhma3ly7w7ls9w44mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqyrw2z3",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "DELEGATE",
       "value": "172805",
     },
@@ -1444,20 +1438,16 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "accountId": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
       "blockHash": undefined,
       "blockHeight": 261953,
-      "contract": undefined,
       "extra": {},
       "fee": "200000",
       "hash": "5a79cec1f369c234d11ce12fd06b39ef60aa32e344be2485033af462cd879034",
       "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano-5a79cec1f369c234d11ce12fd06b39ef60aa32e344be2485033af462cd879034-IN",
-      "operator": undefined,
       "recipients": [
         "addr_test1qzl2j33f6h8hw6urwjsq47s4dphskp6zm5pnp7rgqnrpyq44mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqe83h2u",
       ],
       "senders": [
         "addr_test1vzpwq95z3xyum8vqndgdd9mdnmafh3djcxnc6jemlgdmswcve6tkw",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "10000000000",
     },
@@ -1465,12 +1455,10 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "accountId": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
       "blockHash": undefined,
       "blockHeight": 279040,
-      "contract": undefined,
       "extra": {},
       "fee": "188689",
       "hash": "6c8f2922d87f6d321bac3c6e4987985bdff16a3c840c0f6fab9412420a2df7af",
       "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano-6c8f2922d87f6d321bac3c6e4987985bdff16a3c840c0f6fab9412420a2df7af-IN",
-      "operator": undefined,
       "recipients": [
         "addr_test1qz4dq2sq8dmm65mmsd40kwthmg3vdap08tqqmcsp30ach2d4mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqkx5sjf",
         "addr_test1qp64lq7jlq743x9gg8cxvnuht5g8k94lpmggl9aqkcuxhpmra2x9gp8eakdwsrv4k42ys4ajqy0r7f4k8hwrhcdt6sksyx45r7",
@@ -1478,8 +1466,6 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "senders": [
         "addr_test1qr4qq9s7cf28zse9t4c46l3utj6ajphx654l8ddcv6rhketra2x9gp8eakdwsrv4k42ys4ajqy0r7f4k8hwrhcdt6sksjh37nz",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "1344798",
     },
@@ -1487,12 +1473,10 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "accountId": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
       "blockHash": undefined,
       "blockHeight": 274614,
-      "contract": undefined,
       "extra": {},
       "fee": "168317",
       "hash": "9b5428b372e50265ee588a28e67f547b0b24e5d8c3f191cac7ed6479c53e397a",
       "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano-9b5428b372e50265ee588a28e67f547b0b24e5d8c3f191cac7ed6479c53e397a-IN",
-      "operator": undefined,
       "recipients": [
         "addr_test1qz4dq2sq8dmm65mmsd40kwthmg3vdap08tqqmcsp30ach2d4mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqkx5sjf",
         "addr_test1qp2dhfym0ac3kzx8z0d4f007asday5jx3934sta8nph6da76d3nuxxfhf0vk9f8v9vqnx5nt8n9ked9e9hanh82p975s4xdl2h",
@@ -1500,8 +1484,6 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "senders": [
         "addr_test1qrn4m22gxzjzs5d8qqmmz55rpp5xvuw8wehc8wz760k9p576d3nuxxfhf0vk9f8v9vqnx5nt8n9ked9e9hanh82p975s9ahz2y",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "200000000",
     },
@@ -1509,22 +1491,18 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "accountId": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
       "blockHash": undefined,
       "blockHeight": 274636,
-      "contract": undefined,
       "extra": {
         "deposit": "2 tADA",
       },
       "fee": "174301",
       "hash": "cdfd34431c6345e7dafc3a32f0f90e5805b7d12eb9d1083e837645d7fd682bd6",
       "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano-cdfd34431c6345e7dafc3a32f0f90e5805b7d12eb9d1083e837645d7fd682bd6-DELEGATE",
-      "operator": undefined,
       "recipients": [
         "addr_test1qrxusg8ujg7p7rppaksq0wpmzhd8wrk7uhma3ly7w7ls9w44mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqyrw2z3",
       ],
       "senders": [
         "addr_test1qpwjlccw7ctda5cfx0ak5k8uphnatdy7uduczp3sfc0a6y94mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqwyqhg7",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "DELEGATE",
       "value": "2174301",
     },
@@ -1532,12 +1510,10 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "accountId": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano",
       "blockHash": undefined,
       "blockHeight": 274607,
-      "contract": undefined,
       "extra": {},
       "fee": "168317",
       "hash": "ecde338c38caf74209773ca95be32db75cdeff0c1edf5fc9ddad35f21f4de94e",
       "id": "js:2:cardano_testnet:806499588e0c4a58f4119f7e6e096bf42c3f774a528d2acec9e82ceebf87d1ceb3d4f3622dd2c77c65cc89c123f79337db22cf8a69f122e36dab1bf5083bf82d:cardano-ecde338c38caf74209773ca95be32db75cdeff0c1edf5fc9ddad35f21f4de94e-OUT",
-      "operator": undefined,
       "recipients": [
         "addr_test1qqcqjp0x6y3hhx9w75ltt86wt2nqd209d2uv4uxktzu3uz76d3nuxxfhf0vk9f8v9vqnx5nt8n9ked9e9hanh82p975spw239z",
         "addr_test1qpwjlccw7ctda5cfx0ak5k8uphnatdy7uduczp3sfc0a6y94mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqwyqhg7",
@@ -1545,8 +1521,6 @@ exports[`cardano_testnet currency bridge scanAccounts cardano_testnet seed 1 2`]
       "senders": [
         "addr_test1qzl2j33f6h8hw6urwjsq47s4dphskp6zm5pnp7rgqnrpyq44mcsd3mzvmr9qhfscxkyla3aqnzttwepay9mt3fz84smqe83h2u",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "OUT",
       "value": "100168317",
     },

package/src/families/cardano/bridge/mock.ts

@@ -16,7 +16,7 @@ import {
   RecipientRequired,
 } from "@ledgerhq/errors";
 import { CardanoMinAmountError, CardanoNotEnoughFunds } from "@ledgerhq/coin-cardano/errors";
-import { buildTransaction } from "@ledgerhq/coin-cardano/js-buildTransaction";
+import { buildTransaction } from "@ledgerhq/coin-cardano/buildTransaction";
 import { defaultUpdateTransaction } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import {
   scanAccounts,

package/src/families/cardano/setup.ts

@@ -7,7 +7,12 @@ import type { Bridge } from "@ledgerhq/types-live";
 import { createBridges } from "@ledgerhq/coin-cardano/bridge";
 import makeCliTools from "@ledgerhq/coin-cardano/cli-transaction";
 import cardanoResolver from "@ledgerhq/coin-cardano/hw-getAddress";
-import type { CardanoLikeNetworkParameters, Transaction } from "@ledgerhq/coin-cardano/types";
+import type {
+  CardanoAccount,
+  CardanoLikeNetworkParameters,
+  Transaction,
+  TransactionStatus,
+} from "@ledgerhq/coin-cardano/types";
 import type {
   CardanoAddress,
   CardanoExtendedPublicKey,
@@ -76,7 +81,9 @@ const createSigner: CreateSigner<CardanoSigner> = (transport: Transport) => {
   };
 };
 
-const bridge: Bridge<Transaction> = createBridges(executeWithSigner(createSigner));
+const bridge: Bridge<Transaction, CardanoAccount, TransactionStatus> = createBridges(
+  executeWithSigner(createSigner),
+);
 
 const resolver: Resolver = createResolver(createSigner, cardanoResolver);
 

package/src/families/casper/__snapshots__/bridge.integration.test.ts.snap

@@ -10,7 +10,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 1`] = `
     "freshAddressPath": "44'/506'/0'/0/0",
     "id": "js:2:casper:02038C8cb0f62b4EFcD0C7868c2e749Dda649aFFE30fF0f95fc91CE48EA67F077D16:casper_wallet",
     "index": 0,
-    "nfts": undefined,
     "operationsCount": 2,
     "pendingOperations": [],
     "seedIdentifier": "038c8cb0f62b4efcd0c7868c2e749dda649affe30ff0f95fc91ce48ea67f077d16",
@@ -27,7 +26,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 1`] = `
     "freshAddressPath": "44'/506'/0'/0/1",
     "id": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet",
     "index": 1,
-    "nfts": undefined,
     "operationsCount": 4,
     "pendingOperations": [],
     "seedIdentifier": "038c8cb0f62b4efcd0c7868c2e749dda649affe30ff0f95fc91ce48ea67f077d16",
@@ -44,7 +42,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 1`] = `
     "freshAddressPath": "44'/506'/0'/0/2",
     "id": "js:2:casper:02022AAB9B6ED404f8CFFE76ce493E1995d195B5F141Ee7D5B7fb20FCE60f2A49691:casper_wallet",
     "index": 2,
-    "nfts": undefined,
     "operationsCount": 0,
     "pendingOperations": [],
     "seedIdentifier": "038c8cb0f62b4efcd0c7868c2e749dda649affe30ff0f95fc91ce48ea67f077d16",
@@ -63,7 +60,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "accountId": "js:2:casper:02038C8cb0f62b4EFcD0C7868c2e749Dda649aFFE30fF0f95fc91CE48EA67F077D16:casper_wallet",
       "blockHash": null,
       "blockHeight": 1,
-      "contract": undefined,
       "extra": {
         "transferId": undefined,
       },
@@ -71,15 +67,12 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "hasFailed": false,
       "hash": "17cc9162da13394478f4f00dc7be53cb4406b6762cc2341c60bfdbf9e137a03f",
       "id": "js:2:casper:02038C8cb0f62b4EFcD0C7868c2e749Dda649aFFE30fF0f95fc91CE48EA67F077D16:casper_wallet-17cc9162da13394478f4f00dc7be53cb4406b6762cc2341c60bfdbf9e137a03f-IN",
-      "operator": undefined,
       "recipients": [
         "f74845d90933546a90faec6a605961d078b0fbf1a3b954cee8cd982e43b7c09d",
       ],
       "senders": [
         "79e548dd1aed87e79e797704c1175266eb705757ba52d786784a72655eb53e7f",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "7250000000",
     },
@@ -87,7 +80,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "accountId": "js:2:casper:02038C8cb0f62b4EFcD0C7868c2e749Dda649aFFE30fF0f95fc91CE48EA67F077D16:casper_wallet",
       "blockHash": null,
       "blockHeight": 1,
-      "contract": undefined,
       "extra": {
         "transferId": undefined,
       },
@@ -95,15 +87,12 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "hasFailed": false,
       "hash": "74c9cedc96bdde3e4dba8ceb0dc702e27bf259ad94f5e5e67adef25c388075b8",
       "id": "js:2:casper:02038C8cb0f62b4EFcD0C7868c2e749Dda649aFFE30fF0f95fc91CE48EA67F077D16:casper_wallet-74c9cedc96bdde3e4dba8ceb0dc702e27bf259ad94f5e5e67adef25c388075b8-IN",
-      "operator": undefined,
       "recipients": [
         "f74845d90933546a90faec6a605961d078b0fbf1a3b954cee8cd982e43b7c09d",
       ],
       "senders": [
         "79e548dd1aed87e79e797704c1175266eb705757ba52d786784a72655eb53e7f",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "2500000000",
     },
@@ -113,7 +102,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "accountId": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet",
       "blockHash": null,
       "blockHeight": 1,
-      "contract": undefined,
       "extra": {
         "transferId": undefined,
       },
@@ -121,15 +109,12 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "hasFailed": false,
       "hash": "17cc9162da13394478f4f00dc7be53cb4406b6762cc2341c60bfdbf9e137a03f",
       "id": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet-17cc9162da13394478f4f00dc7be53cb4406b6762cc2341c60bfdbf9e137a03f-OUT",
-      "operator": undefined,
       "recipients": [
         "f74845d90933546a90faec6a605961d078b0fbf1a3b954cee8cd982e43b7c09d",
       ],
       "senders": [
         "79e548dd1aed87e79e797704c1175266eb705757ba52d786784a72655eb53e7f",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "OUT",
       "value": "7350000000",
     },
@@ -137,7 +122,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "accountId": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet",
       "blockHash": null,
       "blockHeight": 1,
-      "contract": undefined,
       "extra": {
         "transferId": "7772882",
       },
@@ -145,15 +129,12 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "hasFailed": false,
       "hash": "6dd86840ad7bcd25f5344128cfc34ae9dcea53f5081eb8c6cbd21e2cf3cbabb8",
       "id": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet-6dd86840ad7bcd25f5344128cfc34ae9dcea53f5081eb8c6cbd21e2cf3cbabb8-IN",
-      "operator": undefined,
       "recipients": [
         "79e548dd1aed87e79e797704c1175266eb705757ba52d786784a72655eb53e7f",
       ],
       "senders": [
         "947cc343545c8215f1612f199b417e6fc1000139bb451c1554e63123ac9fb66e",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "12000000000",
     },
@@ -161,7 +142,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "accountId": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet",
       "blockHash": null,
       "blockHeight": 1,
-      "contract": undefined,
       "extra": {
         "transferId": undefined,
       },
@@ -169,15 +149,12 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "hasFailed": false,
       "hash": "74c9cedc96bdde3e4dba8ceb0dc702e27bf259ad94f5e5e67adef25c388075b8",
       "id": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet-74c9cedc96bdde3e4dba8ceb0dc702e27bf259ad94f5e5e67adef25c388075b8-OUT",
-      "operator": undefined,
       "recipients": [
         "f74845d90933546a90faec6a605961d078b0fbf1a3b954cee8cd982e43b7c09d",
       ],
       "senders": [
         "79e548dd1aed87e79e797704c1175266eb705757ba52d786784a72655eb53e7f",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "OUT",
       "value": "2600000000",
     },
@@ -185,7 +162,6 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "accountId": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet",
       "blockHash": null,
       "blockHeight": 1,
-      "contract": undefined,
       "extra": {
         "transferId": undefined,
       },
@@ -193,15 +169,12 @@ exports[`casper currency bridge scanAccounts casper seed 1 2`] = `
       "hasFailed": false,
       "hash": "d179d7aeb1e9046a1a50550f0e188a2a3c3cb257b9ebb1e225c9d8de6729625a",
       "id": "js:2:casper:0202bA6DC98cbE677711a45bf028A03646F9e588996eB223fad2485e8bc391b01581:casper_wallet-d179d7aeb1e9046a1a50550f0e188a2a3c3cb257b9ebb1e225c9d8de6729625a-IN",
-      "operator": undefined,
       "recipients": [
         "79e548dd1aed87e79e797704c1175266eb705757ba52d786784a72655eb53e7f",
       ],
       "senders": [
         "947cc343545c8215f1612f199b417e6fc1000139bb451c1554e63123ac9fb66e",
       ],
-      "standard": undefined,
-      "tokenId": undefined,
       "type": "IN",
       "value": "2500000000",
     },

package/src/families/casper/bridge/account.ts

@@ -1,273 +1,19 @@
-import type {
-  Account,
-  AccountBridge,
-  SignOperationEvent,
-  BroadcastFnSignature,
-  SignOperationFnSignature,
-  AccountLike,
-} from "@ledgerhq/types-live";
-import type { CasperOperation, Transaction, TransactionStatus } from "../types";
+import type { AccountBridge } from "@ledgerhq/types-live";
+import { defaultUpdateTransaction } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { makeAccountBridgeReceive, makeSync } from "../../../bridge/jsHelpers";
-
-import { getPath, isError } from "../msc-utils";
-import { DeployUtil } from "casper-js-sdk";
-import BigNumber from "bignumber.js";
-import {
-  CASPER_MINIMUM_VALID_AMOUNT_MOTES,
-  CASPER_MAX_TRANSFER_ID,
-  MayBlockAccountError,
-  InvalidMinimumAmountError,
-} from "../consts";
-import { getAddress, casperGetCLPublicKey, isAddressValid } from "./bridgeHelpers/addresses";
-import { log } from "@ledgerhq/logs";
-import { Observable } from "rxjs";
-import { withDevice } from "../../../hw/deviceAccess";
-import { encodeOperationId, patchOperationWithHash } from "../../../operation";
-import CasperApp from "@zondax/ledger-casper";
-import {
-  AmountRequired,
-  InvalidAddress,
-  InvalidAddressBecauseDestinationIsAlsoSource,
-  NotEnoughBalance,
-  RecipientRequired,
-} from "@ledgerhq/errors";
-import { CasperInvalidTransferId } from "../errors";
-import { broadcastTx } from "../api";
-import { getMainAccount } from "../../../account";
-import { createNewDeploy } from "./bridgeHelpers/txn";
+import type { CasperAccount, Transaction, TransactionStatus } from "../types";
+import { getTransactionStatus } from "../getTransactionStatus";
 import { getAccountShape } from "./bridgeHelpers/accountShape";
-import { getEstimatedFees } from "./bridgeHelpers/fee";
-import { isTransferIdValid } from "./bridgeHelpers/transferId";
-import { defaultUpdateTransaction } from "@ledgerhq/coin-framework/bridge/jsHelpers";
+import { estimateMaxSpendable } from "../estimateMaxSpendable";
+import { prepareTransaction } from "../prepareTransaction";
+import { createTransaction } from "../createTransaction";
+import { signOperation } from "../signOperation";
+import { broadcast } from "../broadcast";
 
 const receive = makeAccountBridgeReceive();
-
-const createTransaction = (): Transaction => {
-  // log("debug", "[createTransaction] creating base tx");
-
-  return {
-    family: "casper",
-    amount: new BigNumber(0),
-    fees: new BigNumber(0),
-    recipient: "",
-    useAllAmount: false,
-  };
-};
-
-const prepareTransaction = async (a: Account, t: Transaction): Promise<Transaction> => {
-  // log("debug", "[prepareTransaction] start fn");
-  const fees = getEstimatedFees();
-
-  const amount = t.useAllAmount ? a.spendableBalance.minus(t.fees) : t.amount;
-
-  // log("debug", "[prepareTransaction] finish fn");
-  return defaultUpdateTransaction(t, { fees, amount });
-};
-
-const getTransactionStatus = async (a: Account, t: Transaction): Promise<TransactionStatus> => {
-  const errors: TransactionStatus["errors"] = {};
-  const warnings: TransactionStatus["warnings"] = {};
-
-  const { balance, spendableBalance } = a;
-  const { address } = getAddress(a);
-  const { recipient, useAllAmount } = t;
-  let { amount } = t;
-
-  if (!recipient) {
-    errors.recipient = new RecipientRequired();
-  } else if (!isAddressValid(recipient)) {
-    errors.recipient = new InvalidAddress("", {
-      currencyName: a.currency.name,
-    });
-  } else if (recipient.toLowerCase() === address.toLowerCase()) {
-    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
-  }
-
-  if (!isAddressValid(address)) {
-    errors.sender = new InvalidAddress("", {
-      currencyName: a.currency.name,
-    });
-  } else if (!isTransferIdValid(t.transferId)) {
-    errors.sender = new CasperInvalidTransferId("", {
-      maxTransferId: CASPER_MAX_TRANSFER_ID,
-    });
-  }
-
-  const estimatedFees = t.fees;
-
-  let totalSpent = BigNumber(0);
-
-  if (useAllAmount) {
-    totalSpent = a.spendableBalance;
-    amount = totalSpent.minus(estimatedFees);
-    if (amount.lte(0) || totalSpent.gt(balance)) {
-      errors.amount = new NotEnoughBalance();
-    }
-  }
-
-  if (!useAllAmount) {
-    totalSpent = amount.plus(estimatedFees);
-    if (amount.eq(0)) {
-      errors.amount = new AmountRequired();
-    }
-
-    if (totalSpent.gt(a.spendableBalance)) {
-      errors.amount = new NotEnoughBalance();
-    }
-  }
-
-  if (amount.lt(CASPER_MINIMUM_VALID_AMOUNT_MOTES) && !errors.amount) {
-    errors.amount = InvalidMinimumAmountError;
-  }
-
-  if (
-    spendableBalance.minus(totalSpent).minus(estimatedFees).lt(CASPER_MINIMUM_VALID_AMOUNT_MOTES)
-  ) {
-    warnings.amount = MayBlockAccountError;
-  }
-
-  // log("debug", "[getTransactionStatus] finish fn");
-
-  return {
-    errors,
-    warnings,
-    estimatedFees,
-    amount,
-    totalSpent,
-  };
-};
-
-const estimateMaxSpendable = async ({
-  account,
-  parentAccount,
-  transaction,
-}: {
-  account: AccountLike;
-  parentAccount?: Account | null | undefined;
-  transaction?: Transaction | null | undefined;
-}): Promise<BigNumber> => {
-  const a = getMainAccount(account, parentAccount);
-  let balance = a.spendableBalance;
-
-  if (balance.eq(0)) return balance;
-
-  const estimatedFees = transaction?.fees ?? getEstimatedFees();
-
-  if (balance.lte(estimatedFees)) return new BigNumber(0);
-
-  balance = balance.minus(estimatedFees);
-
-  // log("debug", "[estimateMaxSpendable] finish fn");
-
-  return balance;
-};
-
-const signOperation: SignOperationFnSignature<Transaction> = ({
-  account,
-  deviceId,
-  transaction,
-}): Observable<SignOperationEvent> =>
-  withDevice(deviceId)(
-    transport =>
-      new Observable(o => {
-        async function main() {
-          // log("debug", "[signOperation] start fn");
-
-          const { recipient, amount } = transaction;
-          const { id: accountId } = account;
-          const { address, derivationPath } = getAddress(account);
-
-          const casper = new CasperApp(transport);
-
-          const fee = transaction.fees;
-
-          const deploy = createNewDeploy(
-            address,
-            recipient,
-            transaction.amount,
-            transaction.fees,
-            transaction.transferId,
-          );
-          // Serialize tx
-          const deployBytes = DeployUtil.deployToBytes(deploy);
-
-          log("debug", `[signOperation] serialized deploy: [${deployBytes.toString()}]`);
-
-          o.next({
-            type: "device-signature-requested",
-          });
-
-          // Sign by device
-          const result = await casper.sign(getPath(derivationPath), Buffer.from(deployBytes));
-          isError(result);
-
-          o.next({
-            type: "device-signature-granted",
-          });
-
-          // signature verification
-          const deployHash = deploy.hash.toString();
-          const signature = result.signatureRS;
-
-          // sign deploy object
-          const signedDeploy = DeployUtil.setSignature(
-            deploy,
-            signature,
-            casperGetCLPublicKey(address),
-          );
-
-          const operation: CasperOperation = {
-            id: encodeOperationId(accountId, deployHash, "OUT"),
-            hash: deployHash,
-            type: "OUT",
-            senders: [address],
-            recipients: [recipient],
-            accountId,
-            value: amount.plus(fee),
-            fee,
-            blockHash: null,
-            blockHeight: null,
-            date: new Date(),
-            extra: {
-              transferId: transaction.transferId,
-            },
-          };
-
-          o.next({
-            type: "signed",
-            signedOperation: {
-              operation,
-              signature: JSON.stringify(DeployUtil.deployToJson(signedDeploy)),
-            },
-          });
-        }
-
-        main().then(
-          () => o.complete(),
-          e => o.error(e),
-        );
-      }),
-  );
-
-const broadcast: BroadcastFnSignature = async ({ signedOperation: { signature, operation } }) => {
-  // log("debug", "[broadcast] start fn");
-
-  const tx = DeployUtil.deployFromJson(JSON.parse(signature)).unwrap();
-
-  // log("debug", `[broadcast] isDeployOk ${DeployUtil.validateDeploy(tx).ok}`);
-  const resp = await broadcastTx(tx);
-  const { deploy_hash } = resp;
-
-  const result = patchOperationWithHash(operation, deploy_hash);
-
-  // log("debug", "[broadcast] finish fn");
-
-  return result;
-};
-
 const sync = makeSync({ getAccountShape });
 
-const accountBridge: AccountBridge<Transaction> = {
+const accountBridge: AccountBridge<Transaction, CasperAccount, TransactionStatus> = {
   estimateMaxSpendable,
   createTransaction,
   updateTransaction: defaultUpdateTransaction,