@ledgerhq/live-common 21.11.0 → 21.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/families/bitcoin/js-prepareTransaction.d.ts.map +1 -1
- package/lib/families/bitcoin/js-prepareTransaction.js +0 -3
- package/lib/families/bitcoin/js-prepareTransaction.js.map +1 -1
- package/lib/families/bitcoin/js-signOperation.d.ts.map +1 -1
- package/lib/families/bitcoin/js-signOperation.js +3 -1
- package/lib/families/bitcoin/js-signOperation.js.map +1 -1
- package/lib/families/bitcoin/wallet-btc/explorer/index.d.ts +2 -2
- package/lib/families/bitcoin/wallet-btc/index.d.ts.map +1 -1
- package/lib/families/bitcoin/wallet-btc/index.js +3 -0
- package/lib/families/bitcoin/wallet-btc/index.js.map +1 -1
- package/lib/families/bitcoin/wallet-btc/storage/index.js +10 -10
- package/lib/families/bitcoin/wallet-btc/storage/index.js.map +1 -1
- package/lib/families/bitcoin/wallet-btc/wallet.d.ts +1 -0
- package/lib/families/bitcoin/wallet-btc/wallet.d.ts.map +1 -1
- package/lib/families/bitcoin/wallet-btc/wallet.js +18 -8
- package/lib/families/bitcoin/wallet-btc/wallet.js.map +1 -1
- package/lib/families/crypto_org/api/sdk.d.ts.map +1 -1
- package/lib/families/crypto_org/api/sdk.js +6 -4
- package/lib/families/crypto_org/api/sdk.js.map +1 -1
- package/lib/families/crypto_org/cli-transaction.d.ts.map +1 -1
- package/lib/families/crypto_org/cli-transaction.js +6 -1
- package/lib/families/crypto_org/cli-transaction.js.map +1 -1
- package/lib/families/crypto_org/js-buildTransaction.d.ts.map +1 -1
- package/lib/families/crypto_org/js-buildTransaction.js +4 -1
- package/lib/families/crypto_org/js-buildTransaction.js.map +1 -1
- package/lib/families/crypto_org/js-transaction.d.ts +1 -0
- package/lib/families/crypto_org/js-transaction.d.ts.map +1 -1
- package/lib/families/crypto_org/js-transaction.js +9 -4
- package/lib/families/crypto_org/js-transaction.js.map +1 -1
- package/lib/families/crypto_org/transaction.d.ts +2 -2
- package/lib/families/crypto_org/transaction.d.ts.map +1 -1
- package/lib/families/crypto_org/transaction.js +4 -4
- package/lib/families/crypto_org/transaction.js.map +1 -1
- package/lib/families/crypto_org/types.d.ts +2 -0
- package/lib/families/crypto_org/types.d.ts.map +1 -1
- package/lib/families/crypto_org/types.js.map +1 -1
- package/lib/families/tezos/bakers.whitelist-default.d.ts.map +1 -1
- package/lib/families/tezos/bakers.whitelist-default.js +1 -1
- package/lib/families/tezos/bakers.whitelist-default.js.map +1 -1
- package/lib/generated/transaction.d.ts +1 -1
- package/lib/reconciliation.d.ts.map +1 -1
- package/lib/reconciliation.js +3 -1
- package/lib/reconciliation.js.map +1 -1
- package/package.json +19 -19
- package/src/families/bitcoin/js-prepareTransaction.ts +0 -2
- package/src/families/bitcoin/js-signOperation.ts +3 -0
- package/src/families/bitcoin/wallet-btc/index.ts +2 -0
- package/src/families/bitcoin/wallet-btc/storage/index.ts +12 -12
- package/src/families/bitcoin/wallet-btc/wallet.ts +24 -7
- package/src/families/crypto_org/api/sdk.ts +7 -3
- package/src/families/crypto_org/cli-transaction.ts +11 -1
- package/src/families/crypto_org/js-buildTransaction.ts +5 -0
- package/src/families/crypto_org/js-transaction.ts +9 -2
- package/src/families/crypto_org/transaction.ts +4 -2
- package/src/families/crypto_org/types.ts +2 -0
- package/src/families/tezos/bakers.whitelist-default.ts +0 -2
- package/src/reconciliation.ts +2 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/families/crypto_org/transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,6CAAyC;AACzC,mDAGkC;AAElC,yCAA+C;AAC/C,+CAAsD;AAC/C,IAAM,iBAAiB,GAAG,UAC/B,
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/families/crypto_org/transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,6CAAyC;AACzC,mDAGkC;AAElC,yCAA+C;AAC/C,+CAAsD;AAC/C,IAAM,iBAAiB,GAAG,UAC/B,EAA4D,EAC5D,OAAgB;QADd,IAAI,UAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,YAAY,kBAAA,EAAE,IAAI,UAAA;IAElC,OAAA,OACX,IAAI,CAAC,WAAW,EAAE,UAClB,YAAY;QACV,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;YACjB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,GAAG;gBACH,IAAA,+BAAkB,EAAC,IAAA,wBAAc,EAAC,OAAO,CAAC,EAAE,MAAM,EAAE;oBAClD,QAAQ,EAAE,IAAI;oBACd,eAAe,EAAE,IAAI;iBACtB,CAAC,KACL,SAAS,CAAC,CAAC,CAAC,UAAQ,SAAW,CAAC,CAAC,CAAC,EAAE,KAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAgB,IAAM,CAAE;AAXlE,CAWkE,CAAC;AAdnE,QAAA,iBAAiB,qBAckD;AACzE,IAAM,kBAAkB,GAAG,UAAC,EAAkB;IACnD,IAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,EAAE,CAAC,CAAC;IAC5C,6BACK,MAAM,KACT,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,wBAAS,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,wBAAS,CAAC,CAAC,CAAC,EACzD,IAAI,EAAE,EAAE,CAAC,IAAI,IACb;AACJ,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AACK,IAAM,gBAAgB,GAAG,UAAC,CAAc;;IAC7C,IAAM,MAAM,GAAG,IAAA,+BAAsB,EAAC,CAAC,CAAC,CAAC;IACzC,6BACK,MAAM,KACT,MAAM,EAAE,CAAC,CAAC,MAAM,EAChB,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,IAAI,EAAE,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,QAAQ,EAAE,KAAI,EAAE,EAC9B,IAAI,EAAE,CAAC,CAAC,IAAI,IACZ;AACJ,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B;AACF,qBAAe;IACb,iBAAiB,2BAAA;IACjB,kBAAkB,4BAAA;IAClB,gBAAgB,0BAAA;CACjB,CAAC"}
|
|
@@ -20,11 +20,13 @@ export declare type Transaction = TransactionCommon & {
|
|
|
20
20
|
mode: string;
|
|
21
21
|
family: "crypto_org";
|
|
22
22
|
fees?: BigNumber;
|
|
23
|
+
memo: string | null | undefined;
|
|
23
24
|
};
|
|
24
25
|
export declare type TransactionRaw = TransactionCommonRaw & {
|
|
25
26
|
family: "crypto_org";
|
|
26
27
|
mode: string;
|
|
27
28
|
fees?: string;
|
|
29
|
+
memo: string | null | undefined;
|
|
28
30
|
};
|
|
29
31
|
export declare type CryptoOrgPreloadData = Record<any, any>;
|
|
30
32
|
export declare type NetworkInfo = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/families/crypto_org/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,oBAAY,WAAW,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3C,oBAAY,oBAAoB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACpD,oBAAY,sBAAsB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACtD,oBAAY,qBAAqB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACrD,oBAAY,kBAAkB,GAAG;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,gBAAgB,EAAE,SAAS,CAAC;IAC5B,WAAW,EAAE,SAAS,CAAC;CACxB,CAAC;AACF,oBAAY,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,oBAAY,WAAW,GAAG,iBAAiB,GAAG;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/families/crypto_org/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AACjC,oBAAY,WAAW,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3C,oBAAY,oBAAoB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACpD,oBAAY,sBAAsB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACtD,oBAAY,qBAAqB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACrD,oBAAY,kBAAkB,GAAG;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,gBAAgB,EAAE,SAAS,CAAC;IAC5B,WAAW,EAAE,SAAS,CAAC;CACxB,CAAC;AACF,oBAAY,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,oBAAY,WAAW,GAAG,iBAAiB,GAAG;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACjC,CAAC;AACF,oBAAY,cAAc,GAAG,oBAAoB,GAAG;IAClD,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACjC,CAAC;AACF,oBAAY,oBAAoB,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACpD,oBAAY,WAAW,GAAG;IACxB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AACF,oBAAY,cAAc,GAAG;IAC3B,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AACF,eAAO,MAAM,OAAO,aAAc,GAAG,SAAO,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/families/crypto_org/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/families/crypto_org/types.ts"],"names":[],"mappings":";;;AAwCO,IAAM,OAAO,GAAG,UAAC,QAAa,IAAM,CAAC,CAAC;AAAhC,QAAA,OAAO,WAAyB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bakers.whitelist-default.d.ts","sourceRoot":"","sources":["../../../src/families/tezos/bakers.whitelist-default.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"bakers.whitelist-default.d.ts","sourceRoot":"","sources":["../../../src/families/tezos/bakers.whitelist-default.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,SAAS,UAkCkC,CAAC;AAKlD,eAAe,SAAS,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
exports.__esModule = true;
|
|
3
3
|
// unfinished list...
|
|
4
|
-
var whitelist = "tz1WCd2jm4uSt4vntk4vSuUWoZQGhLcDuR9q\ntz1Scdr2HsZiQjc7bHMeBbmDRXYVvdhjJbBh\ntz1VmiY38m3y95HqQLjMwqnMS7sdMfGomzKi\ntz1g8vkmcde6sWKaG2NN9WKzCkDM6Rziq194\ntz1PWCDnz783NNGGQjEFFsHtrcK5yBW4E2rm\ntz1d6Fx42mYgVFnHUW8T8A7WBfJ6nD9pVok8\ntz1RV1MBbZMR68tacosb7Mwj6LkbPSUS1er1\ntz1KfEsrtDaA1sX7vdM4qmEPWuSytuqCDp5j\ntz1QLXqnfN51dkjeghXvKHkJfhvGiM5gK4tc\ntz1V4qCyvPKZ5UeqdH14HN42rxvNPQfc9UZg\ntz1Lhf4J9Qxoe3DZ2nfe8FGDnvVj7oKjnMY6\ntz1Ldzz6k1BHdhuKvAtMRX7h5kJSMHESMHLC\ntz1Kf25fX1VdmYGSEzwFy1wNmkbSEZ2V83sY\ntz1RCFbB9GpALpsZtu6J58sb74dm8qe6XBzv\
|
|
4
|
+
var whitelist = "tz1WCd2jm4uSt4vntk4vSuUWoZQGhLcDuR9q\ntz1Scdr2HsZiQjc7bHMeBbmDRXYVvdhjJbBh\ntz1VmiY38m3y95HqQLjMwqnMS7sdMfGomzKi\ntz1g8vkmcde6sWKaG2NN9WKzCkDM6Rziq194\ntz1PWCDnz783NNGGQjEFFsHtrcK5yBW4E2rm\ntz1d6Fx42mYgVFnHUW8T8A7WBfJ6nD9pVok8\ntz1RV1MBbZMR68tacosb7Mwj6LkbPSUS1er1\ntz1KfEsrtDaA1sX7vdM4qmEPWuSytuqCDp5j\ntz1QLXqnfN51dkjeghXvKHkJfhvGiM5gK4tc\ntz1V4qCyvPKZ5UeqdH14HN42rxvNPQfc9UZg\ntz1Lhf4J9Qxoe3DZ2nfe8FGDnvVj7oKjnMY6\ntz1Ldzz6k1BHdhuKvAtMRX7h5kJSMHESMHLC\ntz1Kf25fX1VdmYGSEzwFy1wNmkbSEZ2V83sY\ntz1RCFbB9GpALpsZtu6J58sb74dm8qe6XBzv\ntz1dbfppLAAxXZNtf2SDps7rch3qfUznKSoK\ntz1Q8QkSBS63ZQnH3fBTiAMPes9R666Rn6Sc\ntz2FCNBrERXtaTtNX6iimR1UJ5JSDxvdHM93\ntz1Vyuu4EJ5Nym4JcrfRLnp3hpaq1DSEp1Ke\ntz1S1Aew75hMrPUymqenKfHo8FspppXKpW7h\ntz1SohptP53wDPZhzTWzDUFAUcWF6DMBpaJV\ntz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb\ntz1KzSC1J9aBxKp7u8TUnpN8L7S65PBRkgdF\ntz1STeamwbp68THcny9zk3LsbG3H36DMvbRK\ntz1fJHFn6sWEd3NnBPngACuw2dggTv6nQZ7g\ntz1NEKxGEHsFufk87CVZcrqWu8o22qh46GK6\ntz1V3yg82mcrPJbegqVCPn6bC8w1CSTRp3f8\ntz1aRoaRhSpRYvFdyvgWLL6TGyRoGF51wDjM\ntz1MQJPGNMijnXnVoBENFz9rUhaPt3S7rWoz\ntz1dRKU4FQ9QRRQPdaH4zCR6gmCmXfcvcgtB\ntz1ZcTRk5uxD86EFEn1vvNffWWqJy7q5eVhc\ntz1aDiEJf9ztRrAJEXZfcG3CKimoKsGhwVAi\ntz1NMNQYrYrfNpmUqQrMhJypf6ovnaDZhJHM\ntz1QXrzaHrGACVn15UiCg33aLCJ6npWdQb3J\ntz1axcnVN9tZnCe4sQQhC6f3tfSEXdjPaXPY".split("\n");
|
|
5
5
|
// we give no ordering preference. it's settled at module load time
|
|
6
6
|
whitelist.sort(function () { return Math.random() - 0.5; });
|
|
7
7
|
exports["default"] = whitelist;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bakers.whitelist-default.js","sourceRoot":"","sources":["../../../src/families/tezos/bakers.whitelist-default.ts"],"names":[],"mappings":";;AAAA,qBAAqB;AACrB,IAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"bakers.whitelist-default.js","sourceRoot":"","sources":["../../../src/families/tezos/bakers.whitelist-default.ts"],"names":[],"mappings":";;AAAA,qBAAqB;AACrB,IAAM,SAAS,GAAG,4wCAkCmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAElD,mEAAmE;AACnE,SAAS,CAAC,IAAI,CAAC,cAAM,OAAA,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAnB,CAAmB,CAAC,CAAC;AAE1C,qBAAe,SAAS,CAAC"}
|
|
@@ -15,7 +15,7 @@ declare const _default: {
|
|
|
15
15
|
toTransactionRaw: (t: import("../families/cosmos/types").Transaction) => import("../families/cosmos/types").TransactionRaw;
|
|
16
16
|
};
|
|
17
17
|
crypto_org: {
|
|
18
|
-
formatTransaction: ({ mode, amount, recipient, useAllAmount }: import("../families/crypto_org/types").Transaction, account: import("../types").Account) => string;
|
|
18
|
+
formatTransaction: ({ mode, amount, recipient, useAllAmount, memo }: import("../families/crypto_org/types").Transaction, account: import("../types").Account) => string;
|
|
19
19
|
fromTransactionRaw: (tr: import("../families/crypto_org/types").TransactionRaw) => import("../families/crypto_org/types").Transaction;
|
|
20
20
|
toTransactionRaw: (t: import("../families/crypto_org/types").Transaction) => import("../families/crypto_org/types").TransactionRaw;
|
|
21
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconciliation.d.ts","sourceRoot":"","sources":["../src/reconciliation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,OAAO,EAEP,UAAU,EACV,UAAU,EACV,aAAa,EAGd,MAAM,SAAS,CAAC;AAkBjB,wBAAsB,wBAAwB,CAAC,EAAE,EAC/C,kBAAkB,EAAE,SAAS,EAAE,EAC/B,cAAc,EAAE,EAAE,EAAE,EACpB,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,6EAA6E;AACpJ,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,SAAS,GAClD,OAAO,CAAC,SAAS,EAAE,CAAC,CAmDtB;AACD,wBAAgB,4BAA4B,CAAC,EAAE,EAC7C,kBAAkB,EAAE,SAAS,EAAE,EAC/B,cAAc,EAAE,EAAE,EAAE,EACpB,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,KAAK,SAAS,GAAG,IAAI,GAAG,SAAS,GAC3D,SAAS,EAAE,CAwBb;
|
|
1
|
+
{"version":3,"file":"reconciliation.d.ts","sourceRoot":"","sources":["../src/reconciliation.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,OAAO,EAEP,UAAU,EACV,UAAU,EACV,aAAa,EAGd,MAAM,SAAS,CAAC;AAkBjB,wBAAsB,wBAAwB,CAAC,EAAE,EAC/C,kBAAkB,EAAE,SAAS,EAAE,EAC/B,cAAc,EAAE,EAAE,EAAE,EACpB,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,6EAA6E;AACpJ,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,SAAS,GAClD,OAAO,CAAC,SAAS,EAAE,CAAC,CAmDtB;AACD,wBAAgB,4BAA4B,CAAC,EAAE,EAC7C,kBAAkB,EAAE,SAAS,EAAE,EAC/B,cAAc,EAAE,EAAE,EAAE,EACpB,OAAO,EAAE,CAAC,aAAa,EAAE,EAAE,KAAK,SAAS,GAAG,IAAI,GAAG,SAAS,GAC3D,SAAS,EAAE,CAwBb;AAwDD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,OAAO,CAkNT;AACD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,EACtC,UAAU,EAAE,aAAa,GACxB,UAAU,CAiGZ;AACD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,SAAS,EAAE,EACvB,OAAO,EAAE,YAAY,EAAE,EACvB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,GAAG,SAAS,GAC3C,SAAS,EAAE,CAMb"}
|
package/lib/reconciliation.js
CHANGED
|
@@ -203,7 +203,9 @@ function shouldRefreshBitcoinResources(updatedRaw, account) {
|
|
|
203
203
|
var raw = updatedRaw.bitcoinResources;
|
|
204
204
|
// FIXME Need more typing in wallet-btc to have a meaningful comparison
|
|
205
205
|
//if (!isEqual(raw.walletAccount?.xpub?.data, existing.walletAccount?.xpub?.data)) return true;
|
|
206
|
-
|
|
206
|
+
if (raw.utxos.length !== existing.utxos.length)
|
|
207
|
+
return true;
|
|
208
|
+
return !(0, isEqual_1["default"])(raw.utxos, existing.utxos);
|
|
207
209
|
}
|
|
208
210
|
function patchAccount(account, updatedRaw) {
|
|
209
211
|
// id can change after a sync typically if changing the version or filling more info. in that case we consider all changes.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconciliation.js","sourceRoot":"","sources":["../src/reconciliation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reconciliation.js","sourceRoot":"","sources":["../src/reconciliation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+FAA+F;AAC/F,wBAAwB;AACxB,2DAAqC;AACrC,6CAAyC;AACzC,gDAA4C;AAY5C,qCAamB;AACnB,wFAAkE;AAElE,2EAA2E;AAC3E,SAAsB,wBAAwB,CAC5C,kBAA+B,EAC/B,cAAoB,EACpB,OAAqE,EAAE,6EAA6E;AACpJ,gBAAmD;;;;;;oBAEnD,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;wBAClE,sBAAO,kBAAkB,EAAC;qBAC3B;oBAEK,KAAK,GAAqB;wBAC9B,QAAQ,EAAE,KAAK;wBACf,UAAU,EAAE,EAAE;wBACd,WAAW,EAAE,kBAAkB,IAAI,EAAE;wBACrC,sBAAsB,EAAE,KAAK;qBAC9B,CAAC;oBACE,qBAAqB,GAAgB,EAAE,CAAC;oBAEnC,CAAC,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC;;;yBAAE,CAAA,CAAC,IAAI,CAAC,CAAA;oBACtC,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAC7B,qBAAM,OAAO,CAAC,aAAa,CAAC,EAAA;;oBAAjC,EAAE,GAAG,SAA4B;oBACvC,IAAI,CAAC,EAAE;wBAAE,wBAAS,CAAC,kDAAkD;oBAEjE,KAAK,SAAA,CAAC;oBAEV,IAAI,gBAAgB,EAAE;wBACpB,IACE,qBAAqB,CAAC,MAAM,KAAK,CAAC;4BAClC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,EACzC;4BACA,qEAAqE;4BACrE,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;4BAC/B,wBAAS;yBACV;wBAED,yDAAyD;wBACzD,uEAAuE;wBACvE,KAAK,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;wBAChD,qBAAqB,GAAG,CAAC,EAAE,CAAC,CAAC;qBAC9B;yBAAM;wBACL,+CAA+C;wBAC/C,KAAK,GAAG,EAAE,CAAC;qBACZ;oBAED,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;oBAE7B,IAAI,KAAK,CAAC,QAAQ,EAAE;wBAClB,sBAAO,KAAK,CAAC,UAAU,EAAC;qBACzB;;;oBA9B6C,CAAC,EAAE,CAAA;;;oBAiCnD,IAAI,gBAAgB,IAAI,qBAAqB,CAAC,MAAM,EAAE;wBACpD,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC;qBAChE;oBAED,sBAAO,KAAK,CAAC,UAAU,EAAC;;;;CACzB;AAxDD,4DAwDC;AACD,SAAgB,4BAA4B,CAC1C,kBAA+B,EAC/B,cAAoB,EACpB,OAA4D;IAE5D,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;QAClE,OAAO,kBAAkB,CAAC;KAC3B;IAED,IAAM,KAAK,GAAqB;QAC9B,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,EAAE;QACd,WAAW,EAAE,kBAAkB,IAAI,EAAE;QACrC,sBAAsB,EAAE,KAAK;KAC9B,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACnD,IAAM,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACxC,IAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAE7B,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,OAAO,KAAK,CAAC,UAAU,CAAC;SACzB;KACF;IAED,OAAO,KAAK,CAAC,UAAU,CAAC;AAC1B,CAAC;AA5BD,oEA4BC;AAED,IAAM,gCAAgC,GAAG,UACvC,mBAAwC,EACxC,OAAoB;IAEpB,IAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC;IAC9C,IAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC;IACtC,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC,CAAC,+CAA+C;IAErG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC,CAAC,iDAAiD;IAEjH,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IACpC,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/B,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,CAAC,4BAA4B;IAEtG,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,qCAAqC;AACrC,IAAM,2BAA2B,GAAG,UAClC,cAAoC,EACpC,OAAgB;IAER,IAAA,IAAI,GAAK,cAAc,KAAnB,CAAoB;IAChC,IAAM,WAAW,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;IAC1E,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC,CAAC,4DAA4D;IAE9F,IAAA,KAAA,OAAc,IAAI,CAAC,CAAC,CAAC,IAAA,EAApB,SAAS,QAAW,CAAC;IACtB,IAAA,KAAA,OAAgB,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAA,EAAlC,SAAS,QAAyB,CAAC;IACpC,IAAM,gBAAgB,GAAK,WAAW,CAAC,CAAC,CAAC,KAAnB,CAAoB;IAC1C,IAAO,gBAAgB,GAAK,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,MAAxC,CAAyC;IACxE,IAAM,UAAU,GAAG,SAAS,KAAK,gBAAgB,CAAC,WAAW,EAAE,CAAC;IAChE,OAAO,CACL,CAAC,UAAU,IAAI,sCAAsC;QACrD,SAAS,KAAK,gBAAgB,CAAC,QAAQ,EAAE,IAAI,4BAA4B;QACzE,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,kCAAkC;KACtE,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,6BAA6B,CACpC,UAAsB,EACtB,OAAgB;IAEhB,IAAI,CAAC,UAAU,CAAC,gBAAgB;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,CAAC,OAAO,CAAC,gBAAgB;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,UAAU,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAChE,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACpE,IAAkB,QAAQ,GAAK,OAAO,iBAAZ,CAAa;IACvC,IAAkB,GAAG,GAAK,UAAU,iBAAf,CAAgB;IAC7C,uEAAuE;IACvE,+FAA+F;IAC/F,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAC5D,OAAO,CAAC,IAAA,oBAAO,EAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC;AAED,SAAgB,YAAY,CAC1B,OAAgB,EAChB,UAAsB;IAEtB,2HAA2H;IAC3H,IAAI,OAAO,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE;QAAE,OAAO,IAAA,wBAAc,EAAC,UAAU,CAAC,CAAC;IACpE,IAAI,WAAW,CAAC;IAEhB,IAAI,UAAU,CAAC,WAAW,EAAE;QAC1B,IAAM,qBAAmB,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QACtD,IAAI,oBAAkB,GACpB,UAAU,CAAC,WAAW,CAAC,MAAM,KAAK,qBAAmB,CAAC,MAAM,CAAC;QAC/D,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,UAAC,EAAE;YAC1C,IAAM,QAAQ,GAAG,qBAAmB,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAd,CAAc,CAAC,CAAC;YACjE,IAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAE9C,IAAI,OAAO,KAAK,QAAQ,EAAE;gBACxB,oBAAkB,GAAG,IAAI,CAAC;aAC3B;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oBAAkB,EAAE;YACvB,WAAW,GAAG,qBAAmB,CAAC;SACnC;KACF;IAED,IAAM,UAAU,GAAG,eAAe,CAChC,OAAO,CAAC,UAAU,EAClB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,EAAE,EACb,WAAW,CACZ,CAAC;IACF,IAAM,iBAAiB,GAAG,eAAe,CACvC,OAAO,CAAC,iBAAiB,EACzB,UAAU,CAAC,iBAAiB,EAC5B,UAAU,CAAC,EAAE,EACb,WAAW,CACZ,CAAC;IACF,IAAM,IAAI,gBAAiB,OAAO,CAAE,CAAC;IACrC,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,IAAI,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,EAAE;QACtD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,UAAU,EAAE;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,OAAO,CAAC,eAAe,KAAK,UAAU,CAAC,eAAe;QACtD,UAAU,CAAC,eAAe,EAC1B;QACA,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;QAClD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,iBAAiB,KAAK,iBAAiB,EAAE;QACnD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,+BAA+B;IACvB,IAAA,cAAc,GAAK,UAAU,eAAf,CAAgB;IAEtC,IAAI,cAAc,EAAE;QAClB,IAAI,2BAA2B,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE;YACxD,IAAI,CAAC,cAAc,GAAG,IAAA,kCAAwB,EAAC,cAAc,CAAC,CAAC;YAC/D,OAAO,GAAG,IAAI,CAAC;SAChB;KACF;SAAM,IAAI,IAAI,CAAC,cAAc,EAAE;QAC9B,OAAO,IAAI,CAAC,cAAc,CAAC;QAC3B,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,UAAU,CAAC,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE;QACvE,IAAI,CAAC,gBAAgB,GAAG,IAAI,wBAAS,CACnC,UAAU,CAAC,gBAAgB,IAAI,UAAU,CAAC,OAAO,CAClD,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,UAAU,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE;QAClE,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACtD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,YAAY;QACvB,UAAU,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,EAC9D;QACA,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACtD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,YAAY,KAAK,UAAU,CAAC,YAAY,EAAE;QACpD,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAC5C,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,gBAAgB,KAAK,UAAU,CAAC,gBAAgB,EAAE;QAC5D,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC;QACpD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,WAAW,KAAK,UAAU,CAAC,WAAW,EAAE;QAClD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;QAC1C,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,EAAE;QAC5C,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACpC,OAAO,GAAG,IAAI,CAAC;KAChB;IAEO,IAAA,mBAAmB,GAAK,UAAU,oBAAf,CAAgB;IAE3C,IAAI,mBAAmB,EAAE;QACvB,IAAI,gCAAgC,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YAClE,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;YAC/C,OAAO,GAAG,IAAI,CAAC;SAChB;KACF;IAED,IACE,UAAU,CAAC,aAAa;QACxB,+DAA+D;QAC/D,OAAO,CAAC,aAAa,KAAK,UAAU,CAAC,aAAa,EAClD;QACA,IAAI,CAAC,aAAa,GAAG,IAAA,8BAAoB,EAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QACpE,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,eAAe;QAC1B,+DAA+D;QAC/D,OAAO,CAAC,eAAe,KAAK,UAAU,CAAC,eAAe,EACtD;QACA,IAAI,CAAC,eAAe,GAAG,IAAA,gCAAsB,EAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC1E,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,iBAAiB;QAC5B,+DAA+D;QAC/D,OAAO,CAAC,iBAAiB,KAAK,UAAU,CAAC,iBAAiB,EAC1D;QACA,IAAI,CAAC,iBAAiB,GAAG,IAAA,kCAAwB,EAC/C,UAAU,CAAC,iBAAiB,CAC7B,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,gBAAgB;QAC3B,6BAA6B,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD;QACA,IAAI,CAAC,gBAAgB,GAAG,IAAA,iCAAuB,EAC7C,UAAU,CAAC,gBAAgB,CAC5B,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,iBAAiB;QAC5B,+DAA+D;QAC/D,OAAO,CAAC,iBAAiB,KAAK,UAAU,CAAC,iBAAiB,EAC1D;QACA,IAAI,CAAC,iBAAiB,GAAG,IAAA,kCAAwB,EAC/C,UAAU,CAAC,iBAAiB,CAC7B,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,cAAc;QACzB,OAAO,CAAC,cAAc,KAAK,UAAU,CAAC,cAAc,EACpD;QACA,IAAI,CAAC,cAAc,GAAG,IAAA,+BAAqB,EAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACvE,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,eAAe;QAC1B,OAAO,CAAC,eAAe,KAAK,UAAU,CAAC,eAAe,EACtD;QACA,IAAI,CAAC,eAAe,GAAG,IAAA,gCAAsB,EAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC1E,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,kBAAkB;QAC7B,iDAAiD;QACjD,OAAO,CAAC,kBAAkB,KAAK,UAAU,CAAC,kBAAkB,EAC5D;QACA,IAAI,CAAC,kBAAkB,GAAG,IAAA,mCAAyB,EACjD,UAAU,CAAC,kBAAkB,CAC9B,CAAC;QACF,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC,CAAC,yBAAyB;IAEvD,OAAO,IAAI,CAAC;AACd,CAAC;AArND,oCAqNC;AACD,SAAgB,eAAe,CAC7B,OAAsC,EACtC,UAAyB;;IAEzB,2HAA2H;IAC3H,IACE,CAAC,OAAO;QACR,OAAO,CAAC,EAAE,KAAK,UAAU,CAAC,EAAE;QAC5B,OAAO,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,EACxC;QACA,OAAO,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;KACtC;IAED,IAAM,UAAU,GAAG,eAAe,CAChC,OAAO,CAAC,UAAU,EAClB,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,EAAE,EACb,SAAS,CACV,CAAC;IACF,IAAM,iBAAiB,GAAG,eAAe,CACvC,OAAO,CAAC,iBAAiB,EACzB,UAAU,CAAC,iBAAiB,EAC5B,UAAU,CAAC,EAAE,EACb,SAAS,CACV,CAAC;IACF,qCAAqC;IACrC,IAAM,IAAI,gBAAoB,OAAO,CAAE,CAAC;IACxC,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,IACE,OAAO,CAAC,eAAe,KAAK,UAAU,CAAC,eAAe;QACtD,UAAU,CAAC,eAAe,EAC1B;QACA,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;QAClD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,UAAU,CAAC,YAAY;QACvB,UAAU,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,EAC9D;QACA,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QACtD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,UAAU,EAAE;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,iBAAiB,KAAK,iBAAiB,EAAE;QACnD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,GAAG,IAAI,CAAC;KAChB;IAED,IACE,IAAI,CAAC,IAAI,KAAK,cAAc;QAC5B,OAAO,CAAC,IAAI,KAAK,cAAc;QAC/B,UAAU,CAAC,IAAI,KAAK,iBAAiB,EACrC;QACA,IAAI,UAAU,CAAC,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,EAAE;YACvE,IAAI,CAAC,gBAAgB,GAAG,IAAI,wBAAS,CACnC,UAAU,CAAC,gBAAgB,IAAI,UAAU,CAAC,OAAO,CAClD,CAAC;YACF,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IAAI,UAAU,CAAC,eAAe,MAAK,MAAA,OAAO,CAAC,eAAe,0CAAE,QAAQ,EAAE,CAAA,EAAE;YACtE,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,eAAe;gBAC/C,CAAC,CAAC,IAAI,wBAAS,CAAC,UAAU,CAAC,eAAe,CAAC;gBAC3C,CAAC,CAAC,SAAS,CAAC;YACd,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,IACE,UAAU,CAAC,SAAS;YACpB,CAAC,IAAA,oBAAO,EAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,EACjD;YACA,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;YACtC,OAAO,GAAG,IAAI,CAAC;SAChB;KACF;IAEO,IAAA,mBAAmB,GAAK,UAAU,oBAAf,CAAgB;IAE3C,IAAI,mBAAmB,EAAE;QACvB,IAAI,gCAAgC,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YAClE,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;YAC/C,OAAO,GAAG,IAAI,CAAC;SAChB;KACF;IAED,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC,CAAC,yBAAyB;IAEvD,OAAO,IAAI,CAAC;AACd,CAAC;AApGD,0CAoGC;AACD,SAAgB,eAAe,CAC7B,UAAuB,EACvB,OAAuB,EACvB,SAAiB,EACjB,WAA4C;IAE5C,OAAO,4BAA4B,CACjC,UAAU,EACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAC1B,UAAC,GAAG,IAAK,OAAA,IAAA,0BAAgB,EAAC,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,EAA7C,CAA6C,CACvD,CAAC;AACJ,CAAC;AAXD,0CAWC;AAED,SAAS,cAAc,CAAC,GAAG,EAAE,EAAE;IAC7B,OAAO,GAAG,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAd,CAAc,CAAC,CAAC;AACzC,CAAC;AASD,4DAA4D;AAC5D,qEAAqE;AACrE,8DAA8D;AAC9D,SAAS,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;IAClC,IAAM,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE5D,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE;QAC/C,wCAAwC;QACxC,IAAI,UAAU,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW,EAAE;YAChD,sDAAsD;YACtD,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO;SACR;aAAM;YACL,KAAK,CAAC,sBAAsB,GAAG,IAAI,CAAC;YAEpC,kDAAkD;YAClD,IAAI,CAAC,IAAA,kBAAM,EAAC,UAAU,EAAE,KAAK,CAAC,EAAE;gBAC9B,qEAAqE;gBACrE,kEAAkE;gBAClE,IAAA,qCAAwB,EACtB,KAAK,EACL,UAAU,EACV,wCAAwC,CACzC,CAAC;gBACF,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC;gBACvB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC7B,OAAO;aACR;SACF;KACF;IAED,IAAI,UAAU,EAAE;QACd,6DAA6D;QAC7D,IAAM,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChD,IAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE;YACvB,uDAAuD;YACvD,yEAAyE;YACzE,6BAA6B;YAC7B,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACnC;aAAM;YACL,0EAA0E;YAC1E,kCAAkC;YAClC,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAC5C,qEAAqE;gBACrE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC;aACtC;iBAAM;gBACL,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aAClD;YAED,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YACtB,OAAO;SACR;KACF;SAAM;QACL,0BAA0B;QAC1B,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KAC9B;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"type": "git",
|
|
9
9
|
"url": "https://github.com/LedgerHQ/ledger-live-common"
|
|
10
10
|
},
|
|
11
|
-
"version": "21.
|
|
11
|
+
"version": "21.12.0",
|
|
12
12
|
"main": "lib/index.js",
|
|
13
13
|
"types": "lib/index.d.ts",
|
|
14
14
|
"license": "Apache-2.0",
|
|
@@ -45,20 +45,20 @@
|
|
|
45
45
|
"@crypto-com/chain-jslib": "0.0.19",
|
|
46
46
|
"@ledgerhq/compressjs": "1.3.2",
|
|
47
47
|
"@ledgerhq/cryptoassets": "6.11.0",
|
|
48
|
-
"@ledgerhq/devices": "6.11.
|
|
48
|
+
"@ledgerhq/devices": "6.11.2",
|
|
49
49
|
"@ledgerhq/errors": "6.10.0",
|
|
50
|
-
"@ledgerhq/hw-app-algorand": "6.11.
|
|
51
|
-
"@ledgerhq/hw-app-btc": "6.11.
|
|
52
|
-
"@ledgerhq/hw-app-cosmos": "6.11.
|
|
53
|
-
"@ledgerhq/hw-app-eth": "6.11.
|
|
54
|
-
"@ledgerhq/hw-app-polkadot": "6.11.
|
|
55
|
-
"@ledgerhq/hw-app-str": "6.11.
|
|
56
|
-
"@ledgerhq/hw-app-tezos": "6.11.
|
|
57
|
-
"@ledgerhq/hw-app-trx": "6.11.
|
|
58
|
-
"@ledgerhq/hw-app-xrp": "6.11.
|
|
59
|
-
"@ledgerhq/hw-transport": "6.11.
|
|
60
|
-
"@ledgerhq/hw-transport-mocker": "6.11.
|
|
61
|
-
"@ledgerhq/hw-transport-node-speculos": "6.11.
|
|
50
|
+
"@ledgerhq/hw-app-algorand": "6.11.2",
|
|
51
|
+
"@ledgerhq/hw-app-btc": "6.11.2",
|
|
52
|
+
"@ledgerhq/hw-app-cosmos": "6.11.2",
|
|
53
|
+
"@ledgerhq/hw-app-eth": "6.11.2",
|
|
54
|
+
"@ledgerhq/hw-app-polkadot": "6.11.2",
|
|
55
|
+
"@ledgerhq/hw-app-str": "6.11.2",
|
|
56
|
+
"@ledgerhq/hw-app-tezos": "6.11.2",
|
|
57
|
+
"@ledgerhq/hw-app-trx": "6.11.2",
|
|
58
|
+
"@ledgerhq/hw-app-xrp": "6.11.2",
|
|
59
|
+
"@ledgerhq/hw-transport": "6.11.2",
|
|
60
|
+
"@ledgerhq/hw-transport-mocker": "6.11.2",
|
|
61
|
+
"@ledgerhq/hw-transport-node-speculos": "6.11.2",
|
|
62
62
|
"@ledgerhq/json-bignumber": "^1.1.0",
|
|
63
63
|
"@ledgerhq/live-app-sdk": "^0.2.0",
|
|
64
64
|
"@ledgerhq/logs": "6.10.0",
|
|
@@ -71,9 +71,9 @@
|
|
|
71
71
|
"@walletconnect/client": "1.6.6",
|
|
72
72
|
"@xstate/react": "^1.6.1",
|
|
73
73
|
"@zondax/ledger-filecoin": "^0.11.2",
|
|
74
|
-
"async": "^3.2.
|
|
75
|
-
"axios": "0.
|
|
76
|
-
"axios-retry": "^3.2.
|
|
74
|
+
"async": "^3.2.2",
|
|
75
|
+
"axios": "0.24.0",
|
|
76
|
+
"axios-retry": "^3.2.4",
|
|
77
77
|
"base32-decode": "^1.0.0",
|
|
78
78
|
"bchaddrjs": "^0.5.2",
|
|
79
79
|
"bech32": "^2.0.0",
|
|
@@ -107,8 +107,8 @@
|
|
|
107
107
|
"numeral": "^2.0.6",
|
|
108
108
|
"performance-now": "^2.1.0",
|
|
109
109
|
"prando": "^6.0.1",
|
|
110
|
-
"redux": "^4.1.
|
|
111
|
-
"reselect": "^4.1.
|
|
110
|
+
"redux": "^4.1.2",
|
|
111
|
+
"reselect": "^4.1.1",
|
|
112
112
|
"ripemd160": "^2.0.2",
|
|
113
113
|
"ripple-binary-codec": "^1.1.3",
|
|
114
114
|
"ripple-bs58check": "^2.0.2",
|
|
@@ -3,13 +3,11 @@ import type { Account } from "../../types";
|
|
|
3
3
|
import type { Transaction } from "./types";
|
|
4
4
|
import { getAccountNetworkInfo } from "./getAccountNetworkInfo";
|
|
5
5
|
import { inferFeePerByte } from "./logic";
|
|
6
|
-
import { AccountNeedResync } from "../../errors";
|
|
7
6
|
|
|
8
7
|
const prepareTransaction = async (
|
|
9
8
|
a: Account,
|
|
10
9
|
t: Transaction
|
|
11
10
|
): Promise<Transaction> => {
|
|
12
|
-
if (a.id.startsWith("libcore")) throw new AccountNeedResync();
|
|
13
11
|
let networkInfo = t.networkInfo;
|
|
14
12
|
|
|
15
13
|
if (!networkInfo) {
|
|
@@ -105,6 +105,8 @@ const signOperation = ({
|
|
|
105
105
|
? Buffer.from([0x00, 0x00, 0x00, 0x00])
|
|
106
106
|
: undefined;
|
|
107
107
|
|
|
108
|
+
const hasExtraData = perCoin?.hasExtraData || false;
|
|
109
|
+
|
|
108
110
|
const signature = await wallet.signAccountTx({
|
|
109
111
|
btc: hwApp,
|
|
110
112
|
fromAccount: walletAccount,
|
|
@@ -115,6 +117,7 @@ const signOperation = ({
|
|
|
115
117
|
//initialTimestamp,
|
|
116
118
|
additionals,
|
|
117
119
|
expiryHeight,
|
|
120
|
+
hasExtraData,
|
|
118
121
|
onDeviceSignatureGranted: () =>
|
|
119
122
|
o.next({
|
|
120
123
|
type: "device-signature-granted",
|
|
@@ -15,6 +15,7 @@ import { isValidAddress } from "./utils";
|
|
|
15
15
|
|
|
16
16
|
import type { Account as WalletAccount } from "./account";
|
|
17
17
|
import type { Account as LiveAccount } from "./../../../types";
|
|
18
|
+
import { AccountNeedResync } from "../../../errors";
|
|
18
19
|
|
|
19
20
|
export {
|
|
20
21
|
BitcoinLikeWallet,
|
|
@@ -37,6 +38,7 @@ export {
|
|
|
37
38
|
let wallet: BitcoinLikeWallet | null = null;
|
|
38
39
|
|
|
39
40
|
export const getWalletAccount = (account: LiveAccount): WalletAccount => {
|
|
41
|
+
if (account.id.startsWith("libcore")) throw new AccountNeedResync();
|
|
40
42
|
const walletAccount = account.bitcoinResources?.walletAccount;
|
|
41
43
|
if (!walletAccount) {
|
|
42
44
|
throw new Error("bitcoin wallet account expected");
|
|
@@ -116,18 +116,18 @@ class BitcoinLikeStorage implements IStorage {
|
|
|
116
116
|
|
|
117
117
|
async removeTxs(txsFilter: { account: number; index: number }) {
|
|
118
118
|
const newTxs: TX[] = [];
|
|
119
|
+
this.primaryIndex = {};
|
|
119
120
|
|
|
120
121
|
this.txs.forEach((tx: TX) => {
|
|
121
|
-
if (tx.account !== txsFilter.account || tx.index !== txsFilter.index) {
|
|
122
|
-
newTxs.push(tx);
|
|
123
|
-
return;
|
|
124
|
-
}
|
|
125
|
-
|
|
126
122
|
// clean
|
|
127
123
|
const indexAddress = tx.address;
|
|
128
124
|
const index = `${indexAddress}-${tx.hash}`;
|
|
129
125
|
|
|
130
|
-
|
|
126
|
+
if (tx.account !== txsFilter.account || tx.index !== txsFilter.index) {
|
|
127
|
+
this.primaryIndex[index] = newTxs.push(tx) - 1;
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
131
|
delete this.unspentUtxos[indexAddress];
|
|
132
132
|
delete this.spentUtxos[indexAddress];
|
|
133
133
|
});
|
|
@@ -140,10 +140,15 @@ class BitcoinLikeStorage implements IStorage {
|
|
|
140
140
|
async removePendingTxs(txsFilter: { account: number; index: number }) {
|
|
141
141
|
const newTxs: TX[] = [];
|
|
142
142
|
const txsToReAdd: TX[] = [];
|
|
143
|
+
this.primaryIndex = {};
|
|
143
144
|
|
|
144
145
|
this.txs.forEach((tx: TX) => {
|
|
146
|
+
// clean
|
|
147
|
+
const indexAddress = tx.address;
|
|
148
|
+
const index = `${indexAddress}-${tx.hash}`;
|
|
149
|
+
|
|
145
150
|
if (tx.account !== txsFilter.account || tx.index !== txsFilter.index) {
|
|
146
|
-
newTxs.push(tx);
|
|
151
|
+
this.primaryIndex[index] = newTxs.push(tx) - 1;
|
|
147
152
|
return;
|
|
148
153
|
}
|
|
149
154
|
|
|
@@ -151,11 +156,6 @@ class BitcoinLikeStorage implements IStorage {
|
|
|
151
156
|
txsToReAdd.push(tx);
|
|
152
157
|
}
|
|
153
158
|
|
|
154
|
-
// clean
|
|
155
|
-
const indexAddress = tx.address;
|
|
156
|
-
const index = `${indexAddress}-${tx.hash}`;
|
|
157
|
-
|
|
158
|
-
delete this.primaryIndex[index];
|
|
159
159
|
delete this.unspentUtxos[indexAddress];
|
|
160
160
|
delete this.spentUtxos[indexAddress];
|
|
161
161
|
});
|
|
@@ -209,6 +209,7 @@ class BitcoinLikeWallet {
|
|
|
209
209
|
segwit?: boolean;
|
|
210
210
|
additionals?: Array<string>;
|
|
211
211
|
expiryHeight?: Buffer;
|
|
212
|
+
hasExtraData?: boolean;
|
|
212
213
|
onDeviceSignatureRequested?: () => void;
|
|
213
214
|
onDeviceSignatureGranted?: () => void;
|
|
214
215
|
onDeviceStreaming?: (arg0: {
|
|
@@ -221,7 +222,9 @@ class BitcoinLikeWallet {
|
|
|
221
222
|
btc,
|
|
222
223
|
fromAccount,
|
|
223
224
|
txInfo,
|
|
225
|
+
segwit,
|
|
224
226
|
additionals,
|
|
227
|
+
hasExtraData,
|
|
225
228
|
onDeviceSignatureRequested,
|
|
226
229
|
onDeviceSignatureGranted,
|
|
227
230
|
onDeviceStreaming,
|
|
@@ -239,7 +242,6 @@ class BitcoinLikeWallet {
|
|
|
239
242
|
bufferWriter.writeVarSlice(txOut.script);
|
|
240
243
|
});
|
|
241
244
|
const outputScriptHex = buffer.toString("hex");
|
|
242
|
-
|
|
243
245
|
const associatedKeysets = txInfo.associatedDerivations.map(
|
|
244
246
|
([account, index]) =>
|
|
245
247
|
`${fromAccount.params.path}/${fromAccount.params.index}'/${account}/${index}`
|
|
@@ -250,12 +252,27 @@ class BitcoinLikeWallet {
|
|
|
250
252
|
string | null | undefined,
|
|
251
253
|
number | null | undefined
|
|
252
254
|
][];
|
|
253
|
-
const inputs: Inputs = txInfo.inputs.map((i) =>
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
255
|
+
const inputs: Inputs = txInfo.inputs.map((i) => {
|
|
256
|
+
log("hw", `splitTransaction`, {
|
|
257
|
+
transactionHex: i.txHex,
|
|
258
|
+
isSegwitSupported: segwit,
|
|
259
|
+
hasTimestamp: false,
|
|
260
|
+
hasExtraData,
|
|
261
|
+
additionals,
|
|
262
|
+
});
|
|
263
|
+
return [
|
|
264
|
+
btc.splitTransaction(
|
|
265
|
+
i.txHex,
|
|
266
|
+
segwit,
|
|
267
|
+
false, // FIXME hasTimestamp needed for LL-7539
|
|
268
|
+
hasExtraData,
|
|
269
|
+
additionals
|
|
270
|
+
),
|
|
271
|
+
i.output_index,
|
|
272
|
+
null,
|
|
273
|
+
i.sequence,
|
|
274
|
+
];
|
|
275
|
+
});
|
|
259
276
|
|
|
260
277
|
const lastOutputIndex = txInfo.outputs.length - 1;
|
|
261
278
|
|
|
@@ -148,7 +148,8 @@ function convertSendTransactionToOperation(
|
|
|
148
148
|
addr: string,
|
|
149
149
|
messageSendContent: CryptoOrgMsgSendContent,
|
|
150
150
|
transaction: CryptoOrgAccountTransaction,
|
|
151
|
-
currencyId: string
|
|
151
|
+
currencyId: string,
|
|
152
|
+
memo: string
|
|
152
153
|
): Operation {
|
|
153
154
|
const type = getOperationType(messageSendContent, addr);
|
|
154
155
|
return {
|
|
@@ -164,7 +165,7 @@ function convertSendTransactionToOperation(
|
|
|
164
165
|
senders: [messageSendContent.fromAddress],
|
|
165
166
|
recipients: [messageSendContent.toAddress],
|
|
166
167
|
hasFailed: !transaction.success,
|
|
167
|
-
extra: {},
|
|
168
|
+
extra: { memo },
|
|
168
169
|
};
|
|
169
170
|
}
|
|
170
171
|
|
|
@@ -191,6 +192,8 @@ export const getOperations = async (
|
|
|
191
192
|
|
|
192
193
|
for (let i = 0; i < accountTransactions.length; i++) {
|
|
193
194
|
const msgs = accountTransactions[i].messages;
|
|
195
|
+
const memo = accountTransactions[i].memo;
|
|
196
|
+
const memoTransaction = memo || "";
|
|
194
197
|
|
|
195
198
|
for (let j = 0; j < msgs.length; j++) {
|
|
196
199
|
switch (msgs[j].type) {
|
|
@@ -202,7 +205,8 @@ export const getOperations = async (
|
|
|
202
205
|
addr,
|
|
203
206
|
msgSend,
|
|
204
207
|
accountTransactions[i],
|
|
205
|
-
currencyId
|
|
208
|
+
currencyId,
|
|
209
|
+
memoTransaction
|
|
206
210
|
)
|
|
207
211
|
);
|
|
208
212
|
break;
|
|
@@ -7,6 +7,11 @@ const options = [
|
|
|
7
7
|
type: String,
|
|
8
8
|
desc: "mode of transaction: send",
|
|
9
9
|
},
|
|
10
|
+
{
|
|
11
|
+
name: "memo",
|
|
12
|
+
type: String,
|
|
13
|
+
desc: "add a memo to a transaction",
|
|
14
|
+
},
|
|
10
15
|
];
|
|
11
16
|
|
|
12
17
|
function inferTransactions(
|
|
@@ -27,7 +32,12 @@ function inferTransactions(
|
|
|
27
32
|
if (!account.cryptoOrgResources) throw new Error("unactivated account");
|
|
28
33
|
}
|
|
29
34
|
|
|
30
|
-
return {
|
|
35
|
+
return {
|
|
36
|
+
...transaction,
|
|
37
|
+
family: "crypto_org",
|
|
38
|
+
mode: opts.mode || "send",
|
|
39
|
+
memo: opts.memo,
|
|
40
|
+
};
|
|
31
41
|
});
|
|
32
42
|
}
|
|
33
43
|
|
|
@@ -45,6 +45,11 @@ export const buildTransaction = async (
|
|
|
45
45
|
toAddress: t.recipient,
|
|
46
46
|
amount: getTransactionAmount(a, t),
|
|
47
47
|
});
|
|
48
|
+
|
|
49
|
+
const { memo } = t;
|
|
50
|
+
const memoTransaction = memo || "";
|
|
51
|
+
rawTx.setMemo(memoTransaction);
|
|
52
|
+
|
|
48
53
|
const signableTx = rawTx
|
|
49
54
|
.appendMessage(msgSend)
|
|
50
55
|
.addSigner({
|
|
@@ -17,6 +17,7 @@ export const createTransaction = (): Transaction => ({
|
|
|
17
17
|
recipient: "",
|
|
18
18
|
useAllAmount: false,
|
|
19
19
|
fees: new BigNumber(0),
|
|
20
|
+
memo: null,
|
|
20
21
|
});
|
|
21
22
|
|
|
22
23
|
/**
|
|
@@ -38,10 +39,16 @@ export const updateTransaction = (
|
|
|
38
39
|
*/
|
|
39
40
|
export const prepareTransaction = async (a: Account, t: Transaction) => {
|
|
40
41
|
let fees = t.fees;
|
|
42
|
+
let memo = t.memo;
|
|
43
|
+
|
|
41
44
|
fees = await getEstimatedFees();
|
|
42
45
|
|
|
43
|
-
if (
|
|
44
|
-
|
|
46
|
+
if (t.mode !== "send" && !memo) {
|
|
47
|
+
memo = "Ledger Live";
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
if (t.memo !== memo || !sameFees(t.fees, fees)) {
|
|
51
|
+
return { ...t, memo, fees };
|
|
45
52
|
}
|
|
46
53
|
|
|
47
54
|
return t;
|
|
@@ -8,7 +8,7 @@ import type { Account } from "../../types";
|
|
|
8
8
|
import { getAccountUnit } from "../../account";
|
|
9
9
|
import { formatCurrencyUnit } from "../../currencies";
|
|
10
10
|
export const formatTransaction = (
|
|
11
|
-
{ mode, amount, recipient, useAllAmount }: Transaction,
|
|
11
|
+
{ mode, amount, recipient, useAllAmount, memo }: Transaction,
|
|
12
12
|
account: Account
|
|
13
13
|
): string => `
|
|
14
14
|
${mode.toUpperCase()} ${
|
|
@@ -21,7 +21,7 @@ ${mode.toUpperCase()} ${
|
|
|
21
21
|
showCode: true,
|
|
22
22
|
disableRounding: true,
|
|
23
23
|
})
|
|
24
|
-
}${recipient ? `\nTO ${recipient}` : ""}`;
|
|
24
|
+
}${recipient ? `\nTO ${recipient}` : ""}${!memo ? "" : `\n with memo=${memo}`}`;
|
|
25
25
|
export const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
|
|
26
26
|
const common = fromTransactionCommonRaw(tr);
|
|
27
27
|
return {
|
|
@@ -29,6 +29,7 @@ export const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
|
|
|
29
29
|
family: tr.family,
|
|
30
30
|
mode: tr.mode,
|
|
31
31
|
fees: tr.fees ? new BigNumber(tr.fees) : new BigNumber(0),
|
|
32
|
+
memo: tr.memo,
|
|
32
33
|
};
|
|
33
34
|
};
|
|
34
35
|
export const toTransactionRaw = (t: Transaction): TransactionRaw => {
|
|
@@ -38,6 +39,7 @@ export const toTransactionRaw = (t: Transaction): TransactionRaw => {
|
|
|
38
39
|
family: t.family,
|
|
39
40
|
mode: t.mode,
|
|
40
41
|
fees: t.fees?.toString() || "",
|
|
42
|
+
memo: t.memo,
|
|
41
43
|
};
|
|
42
44
|
};
|
|
43
45
|
export default {
|
|
@@ -23,11 +23,13 @@ export type Transaction = TransactionCommon & {
|
|
|
23
23
|
mode: string;
|
|
24
24
|
family: "crypto_org";
|
|
25
25
|
fees?: BigNumber; // add here all transaction-specific fields if you implement other modes than "send"
|
|
26
|
+
memo: string | null | undefined;
|
|
26
27
|
};
|
|
27
28
|
export type TransactionRaw = TransactionCommonRaw & {
|
|
28
29
|
family: "crypto_org";
|
|
29
30
|
mode: string;
|
|
30
31
|
fees?: string; // also the transaction fields as raw JSON data
|
|
32
|
+
memo: string | null | undefined;
|
|
31
33
|
};
|
|
32
34
|
export type CryptoOrgPreloadData = Record<any, any>;
|
|
33
35
|
export type NetworkInfo = {
|
|
@@ -14,7 +14,6 @@ tz1Lhf4J9Qxoe3DZ2nfe8FGDnvVj7oKjnMY6
|
|
|
14
14
|
tz1Ldzz6k1BHdhuKvAtMRX7h5kJSMHESMHLC
|
|
15
15
|
tz1Kf25fX1VdmYGSEzwFy1wNmkbSEZ2V83sY
|
|
16
16
|
tz1RCFbB9GpALpsZtu6J58sb74dm8qe6XBzv
|
|
17
|
-
tz1LLNkQK4UQV6QcFShiXJ2vT2ELw449MzAA
|
|
18
17
|
tz1dbfppLAAxXZNtf2SDps7rch3qfUznKSoK
|
|
19
18
|
tz1Q8QkSBS63ZQnH3fBTiAMPes9R666Rn6Sc
|
|
20
19
|
tz2FCNBrERXtaTtNX6iimR1UJ5JSDxvdHM93
|
|
@@ -24,7 +23,6 @@ tz1SohptP53wDPZhzTWzDUFAUcWF6DMBpaJV
|
|
|
24
23
|
tz1P2Po7YM526ughEsRbY4oR9zaUPDZjxFrb
|
|
25
24
|
tz1KzSC1J9aBxKp7u8TUnpN8L7S65PBRkgdF
|
|
26
25
|
tz1STeamwbp68THcny9zk3LsbG3H36DMvbRK
|
|
27
|
-
tz1bLwpPfr3xqy1gWBF4sGvv8bLJyPHR11kx
|
|
28
26
|
tz1fJHFn6sWEd3NnBPngACuw2dggTv6nQZ7g
|
|
29
27
|
tz1NEKxGEHsFufk87CVZcrqWu8o22qh46GK6
|
|
30
28
|
tz1V3yg82mcrPJbegqVCPn6bC8w1CSTRp3f8
|
package/src/reconciliation.ts
CHANGED
|
@@ -168,7 +168,8 @@ function shouldRefreshBitcoinResources(
|
|
|
168
168
|
const { bitcoinResources: raw } = updatedRaw;
|
|
169
169
|
// FIXME Need more typing in wallet-btc to have a meaningful comparison
|
|
170
170
|
//if (!isEqual(raw.walletAccount?.xpub?.data, existing.walletAccount?.xpub?.data)) return true;
|
|
171
|
-
|
|
171
|
+
if (raw.utxos.length !== existing.utxos.length) return true;
|
|
172
|
+
return !isEqual(raw.utxos, existing.utxos);
|
|
172
173
|
}
|
|
173
174
|
|
|
174
175
|
export function patchAccount(
|