@ledgerhq/live-common 34.52.0-nightly.4 → 34.52.0-nightly.5

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.
Files changed (35) hide show
  1. package/lib/bridge/generic-alpaca/getAccountShape.d.ts.map +1 -1
  2. package/lib/bridge/generic-alpaca/getAccountShape.js +7 -1
  3. package/lib/bridge/generic-alpaca/getAccountShape.js.map +1 -1
  4. package/lib/bridge/generic-alpaca/utils.d.ts.map +1 -1
  5. package/lib/bridge/generic-alpaca/utils.js +5 -4
  6. package/lib/bridge/generic-alpaca/utils.js.map +1 -1
  7. package/lib/families/hedera/utils.d.ts +2 -0
  8. package/lib/families/hedera/utils.d.ts.map +1 -0
  9. package/lib/families/hedera/{logic.js → utils.js} +2 -2
  10. package/lib/families/hedera/utils.js.map +1 -0
  11. package/lib-es/bridge/generic-alpaca/getAccountShape.d.ts.map +1 -1
  12. package/lib-es/bridge/generic-alpaca/getAccountShape.js +7 -1
  13. package/lib-es/bridge/generic-alpaca/getAccountShape.js.map +1 -1
  14. package/lib-es/bridge/generic-alpaca/utils.d.ts.map +1 -1
  15. package/lib-es/bridge/generic-alpaca/utils.js +5 -4
  16. package/lib-es/bridge/generic-alpaca/utils.js.map +1 -1
  17. package/lib-es/families/hedera/utils.d.ts +2 -0
  18. package/lib-es/families/hedera/utils.d.ts.map +1 -0
  19. package/lib-es/families/hedera/utils.js +3 -0
  20. package/lib-es/families/hedera/utils.js.map +1 -0
  21. package/package.json +35 -35
  22. package/src/bridge/generic-alpaca/getAccountShape.ts +8 -1
  23. package/src/bridge/generic-alpaca/tests/getAccountShape.test.ts +25 -2
  24. package/src/bridge/generic-alpaca/utils.test.ts +165 -0
  25. package/src/bridge/generic-alpaca/utils.ts +5 -4
  26. package/src/families/hedera/__snapshots__/bridge.integration.test.ts.snap +222 -86
  27. package/src/families/hedera/utils.ts +2 -0
  28. package/lib/families/hedera/logic.d.ts +0 -2
  29. package/lib/families/hedera/logic.d.ts.map +0 -1
  30. package/lib/families/hedera/logic.js.map +0 -1
  31. package/lib-es/families/hedera/logic.d.ts +0 -2
  32. package/lib-es/families/hedera/logic.d.ts.map +0 -1
  33. package/lib-es/families/hedera/logic.js +0 -3
  34. package/lib-es/families/hedera/logic.js.map +0 -1
  35. package/src/families/hedera/logic.ts +0 -2
package/lib/bridge/generic-alpaca/getAccountShape.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAiBtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAyFrF"}
1
+ {"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAiBtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAgGrF"}
package/lib/bridge/generic-alpaca/getAccountShape.js CHANGED
@@ -75,7 +75,13 @@ function genericGetAccountShape(network, kind) {
75
75
  subOperations,
76
76
  });
77
77
  });
78
- const operations = (0, jsHelpers_1.mergeOps)(oldOps, newOpsWithSubs);
78
+ const confirmedOperations = alpacaApi.refreshOperations && initialAccount?.pendingOperations.length
79
+ ? await alpacaApi.refreshOperations(initialAccount.pendingOperations)
80
+ : [];
81
+ const operations = (0, jsHelpers_1.mergeOps)(oldOps, [
82
+ ...confirmedOperations,
83
+ ...newOpsWithSubs,
84
+ ]);
79
85
  const res = {
80
86
  id: accountId,
81
87
  xpub: address,
package/lib/bridge/generic-alpaca/getAccountShape.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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"}
package/lib/bridge/generic-alpaca/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE9D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAKvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAMD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAkB5E;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CAqEjG;AAqBD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,kBAAkB,EAC/B,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,kBAAkB,KAAK,MAAM,GAC9D,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG;IACnE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC1C,CA4CA;AAED,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,kBAAkB,mBACd,MAAM,KACtB,SAgEF,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE9D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAKvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAMD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAkB5E;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CAqEjG;AAqBD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,kBAAkB,EAC/B,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,kBAAkB,KAAK,MAAM,GAC9D,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG;IACnE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC1C,CA4CA;AAED,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,kBAAkB,mBACd,MAAM,KACtB,SAiEF,CAAC"}
package/lib/bridge/generic-alpaca/utils.js CHANGED
@@ -195,10 +195,11 @@ const buildOptimisticOperation = (account, transaction, sequenceNumber) => {
195
195
  const fees = BigInt(transaction.fees?.toString() || "0");
196
196
  const { subAccountId } = transaction;
197
197
  const { subAccounts } = account;
198
+ const parentType = subAccountId ? "FEES" : type;
198
199
  const operation = {
199
- id: (0, operation_1.encodeOperationId)(account.id, "", type),
200
+ id: (0, operation_1.encodeOperationId)(account.id, "", parentType),
200
201
  hash: "",
201
- type: type,
202
+ type: parentType,
202
203
  value: subAccountId ? new bignumber_js_1.default(fees.toString()) : transaction.amount,
203
204
  fee: new bignumber_js_1.default(fees.toString()),
204
205
  blockHash: null,
@@ -218,9 +219,9 @@ const buildOptimisticOperation = (account, transaction, sequenceNumber) => {
218
219
  if (tokenAccount && subAccountId) {
219
220
  operation.subOperations = [
220
221
  {
221
- id: `${subAccountId}--OUT`,
222
+ id: `${subAccountId}--${type}`,
222
223
  hash: "",
223
- type: "OUT",
224
+ type,
224
225
  value: transaction.useAllAmount ? tokenAccount.balance : transaction.amount,
225
226
  fee: new bignumber_js_1.default(0),
226
227
  blockHash: null,
package/lib/bridge/generic-alpaca/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"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"}
package/lib/families/hedera/utils.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export * from "@ledgerhq/coin-hedera/logic/utils";
2
+ //# sourceMappingURL=utils.d.ts.map
package/lib/families/hedera/utils.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/families/hedera/utils.ts"],"names":[],"mappings":"AACA,cAAc,mCAAmC,CAAC"}
package/lib/families/hedera/{logic.js → utils.js} RENAMED
@@ -15,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  // Encapsulate for LLD & LLM
18
- __exportStar(require("@ledgerhq/coin-hedera/logic"), exports);
19
- //# sourceMappingURL=logic.js.map
18
+ __exportStar(require("@ledgerhq/coin-hedera/logic/utils"), exports);
19
+ //# sourceMappingURL=utils.js.map
package/lib/families/hedera/utils.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/families/hedera/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4BAA4B;AAC5B,oEAAkD"}
package/lib-es/bridge/generic-alpaca/getAccountShape.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAiBtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAyFrF"}
1
+ {"version":3,"file":"getAccountShape.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAY,MAAM,2CAA2C,CAAC;AAiBtF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAgGrF"}
package/lib-es/bridge/generic-alpaca/getAccountShape.js CHANGED
@@ -69,7 +69,13 @@ export function genericGetAccountShape(network, kind) {
69
69
  subOperations,
70
70
  });
71
71
  });
72
- const operations = mergeOps(oldOps, newOpsWithSubs);
72
+ const confirmedOperations = alpacaApi.refreshOperations && initialAccount?.pendingOperations.length
73
+ ? await alpacaApi.refreshOperations(initialAccount.pendingOperations)
74
+ : [];
75
+ const operations = mergeOps(oldOps, [
76
+ ...confirmedOperations,
77
+ ...newOpsWithSubs,
78
+ ]);
73
79
  const res = {
74
80
  id: accountId,
75
81
  xpub: address,
package/lib-es/bridge/generic-alpaca/getAccountShape.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getAccountShape.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/getAccountShape.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAmB,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,iCAAiC,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAIxE,SAAS,WAAW,CAAC,SAAoB;IACvC,OAAO,CACL,OAAO,SAAS,CAAC,OAAO,EAAE,YAAY,KAAK,QAAQ;QACnD,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAChE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAe,EAAE,IAAY;IAClE,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;QAChC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;QACnE,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAElD,IAAI,SAAS,CAAC,qBAAqB,EAAE;YACnC,MAAM,uBAAuB,GAAG,SAAS,CAAC,qBAAqB,EAAE,CAAC;YAClE,IAAI,uBAAuB,CAAC,eAAe,EAAE;gBAC3C,uBAAuB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;aAClD;SACF;QAED,MAAM,SAAS,GAAG,eAAe,CAAC;YAChC,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,GAAG;YACZ,UAAU,EAAE,QAAQ,CAAC,EAAE;YACvB,aAAa,EAAE,OAAO;YACtB,cAAc;SACf,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEzD,MAAM,sBAAsB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QACjF,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,IAAI,GAAG,CAAC,CAAC;QAExD,MAAM,gBAAgB,GAAG,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,EAAE,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC;QAEpF,uFAAuF;QACvF,MAAM,MAAM,GAAI,CAAC,cAAc,EAAE,UAAU,IAAI,EAAE,CAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAChF,EAAE,CAAC,SAAS,KAAK,SAAS;YACxB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAC7E,CAAC;QACF,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,IAAI,EAAE,CAAC;QAE5D,qCAAqC;QACrC,IAAI,SAAS,GAAW,CAAC,CAAC;QAC1B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,EAAE,WAAW,KAAK,CAAC,EAAE;YAC1D,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;SAC9C;QACD,MAAM,gBAAgB,GAAe,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjE,IAAI,eAAe,EAAE;YACnB,gBAAgB,CAAC,eAAe,GAAG,eAAe,CAAC;SACpD;QAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC/E,MAAM,MAAM,GAAG,UAAU;aACtB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;aAC9B,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,iCAAiC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAsB,CAAC;QAEpF,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CACtC,SAAS,CAAC,EAAE,CACV,SAAS,EAAE,KAAK,EAAE,cAAc;YAChC,SAAS,EAAE,KAAK,EAAE,UAAU;YAC5B,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAClD,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;YAC5C,SAAS;YACT,sBAAsB;YACtB,UAAU;YACV,UAAU,EAAE,kBAAkB;YAC9B,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,gBAAgB,CAAC,cAAc,EAAE,WAAW,IAAI,EAAE,EAAE,cAAc,CAAC,CAAC;QAExF,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACrC,MAAM,aAAa,GAAG,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAElE,OAAO,gBAAgB,CAAC;gBACtB,GAAG,EAAE;gBACL,aAAa;aACd,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,mBAAmB,GACvB,SAAS,CAAC,iBAAiB,IAAI,cAAc,EAAE,iBAAiB,CAAC,MAAM;YACrE,CAAC,CAAC,MAAM,SAAS,CAAC,iBAAiB,CAAC,cAAc,CAAC,iBAAiB,CAAC;YACrE,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE;YAClC,GAAG,mBAAmB;YACtB,GAAG,cAAc;SAClB,CAAsB,CAAC;QAExB,MAAM,GAAG,GAAG;YACV,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,IAAI,cAAc,EAAE,WAAW;YAC1F,OAAO,EAAE,IAAI,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAChD,gBAAgB,EAAE,IAAI,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YAC5D,UAAU;YACV,WAAW;YACX,eAAe,EAAE,UAAU,CAAC,MAAM;SACnC,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC"}
package/lib-es/bridge/generic-alpaca/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE9D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAKvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAMD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAkB5E;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CAqEjG;AAqBD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,kBAAkB,EAC/B,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,kBAAkB,KAAK,MAAM,GAC9D,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG;IACnE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC1C,CA4CA;AAED,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,kBAAkB,mBACd,MAAM,KACtB,SAgEF,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,OAAO,EACP,SAAS,IAAI,aAAa,EAC1B,iBAAiB,EAClB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE9D,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAKvF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOzE;AAMD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,CAkB5E;AAED,wBAAgB,iCAAiC,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,SAAS,CAqEjG;AAqBD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,kBAAkB,EAC/B,iBAAiB,CAAC,EAAE,CAAC,WAAW,EAAE,kBAAkB,KAAK,MAAM,GAC9D,iBAAiB,GAAG;IAAE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GAAG;IACnE,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC1C,CA4CA;AAED,eAAO,MAAM,wBAAwB,YAC1B,OAAO,eACH,kBAAkB,mBACd,MAAM,KACtB,SAiEF,CAAC"}
package/lib-es/bridge/generic-alpaca/utils.js CHANGED
@@ -184,10 +184,11 @@ export const buildOptimisticOperation = (account, transaction, sequenceNumber) =
184
184
  const fees = BigInt(transaction.fees?.toString() || "0");
185
185
  const { subAccountId } = transaction;
186
186
  const { subAccounts } = account;
187
+ const parentType = subAccountId ? "FEES" : type;
187
188
  const operation = {
188
- id: encodeOperationId(account.id, "", type),
189
+ id: encodeOperationId(account.id, "", parentType),
189
190
  hash: "",
190
- type: type,
191
+ type: parentType,
191
192
  value: subAccountId ? new BigNumber(fees.toString()) : transaction.amount,
192
193
  fee: new BigNumber(fees.toString()),
193
194
  blockHash: null,
@@ -207,9 +208,9 @@ export const buildOptimisticOperation = (account, transaction, sequenceNumber) =
207
208
  if (tokenAccount && subAccountId) {
208
209
  operation.subOperations = [
209
210
  {
210
- id: `${subAccountId}--OUT`,
211
+ id: `${subAccountId}--${type}`,
211
212
  hash: "",
212
- type: "OUT",
213
+ type,
213
214
  value: transaction.useAllAmount ? tokenAccount.balance : transaction.amount,
214
215
  fee: new BigNumber(0),
215
216
  blockHash: null,
package/lib-es/bridge/generic-alpaca/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/bridge/generic-alpaca/utils.ts"],"names":[],"mappings":"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"}
package/lib-es/families/hedera/utils.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export * from "@ledgerhq/coin-hedera/logic/utils";
2
+ //# sourceMappingURL=utils.d.ts.map
package/lib-es/families/hedera/utils.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/families/hedera/utils.ts"],"names":[],"mappings":"AACA,cAAc,mCAAmC,CAAC"}
package/lib-es/families/hedera/utils.js ADDED
@@ -0,0 +1,3 @@
1
+ // Encapsulate for LLD & LLM
2
+ export * from "@ledgerhq/coin-hedera/logic/utils";
3
+ //# sourceMappingURL=utils.js.map
package/lib-es/families/hedera/utils.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/families/hedera/utils.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,cAAc,mCAAmC,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@ledgerhq/live-common",
3
3
  "description": "Common ground for the Ledger Live apps",
4
- "version": "34.52.0-nightly.4",
4
+ "version": "34.52.0-nightly.5",
5
5
  "repository": {
6
6
  "type": "git",
7
7
  "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -163,34 +163,34 @@
163
163
  "xstate": "^5.19.2",
164
164
  "yargs": "^17.0.0",
165
165
  "zod": "^3.22.4",
166
- "@ledgerhq/coin-algorand": "^0.12.0-nightly.3",
167
- "@ledgerhq/coin-aptos": "^3.5.0-nightly.2",
168
- "@ledgerhq/coin-bitcoin": "^0.24.0-nightly.2",
169
- "@ledgerhq/coin-canton": "^0.9.0-nightly.2",
170
- "@ledgerhq/coin-cardano": "^0.14.0-nightly.2",
171
- "@ledgerhq/coin-casper": "^2.3.0-nightly.2",
172
- "@ledgerhq/coin-celo": "^1.7.0-nightly.4",
173
- "@ledgerhq/coin-cosmos": "^0.19.0-nightly.2",
174
- "@ledgerhq/coin-evm": "^2.34.0-nightly.4",
175
- "@ledgerhq/coin-filecoin": "^1.14.0-nightly.2",
176
- "@ledgerhq/coin-framework": "^6.8.0-nightly.2",
177
- "@ledgerhq/coin-hedera": "^1.13.0-nightly.2",
178
- "@ledgerhq/coin-icon": "^0.14.0-nightly.2",
179
- "@ledgerhq/coin-internet_computer": "^1.10.0-nightly.2",
180
- "@ledgerhq/coin-kaspa": "^1.4.0-nightly.2",
181
- "@ledgerhq/coin-mina": "^1.4.0-nightly.2",
182
- "@ledgerhq/coin-multiversx": "^0.7.0-nightly.3",
183
- "@ledgerhq/coin-near": "^0.15.0-nightly.2",
184
- "@ledgerhq/coin-polkadot": "^6.12.0-nightly.2",
185
- "@ledgerhq/coin-solana": "^0.36.0-nightly.2",
186
- "@ledgerhq/coin-stacks": "^0.11.0-nightly.2",
187
- "@ledgerhq/coin-stellar": "^6.6.0-nightly.2",
188
- "@ledgerhq/coin-sui": "^0.17.0-nightly.3",
189
- "@ledgerhq/coin-tezos": "^6.8.0-nightly.2",
190
- "@ledgerhq/coin-ton": "^0.16.0-nightly.2",
191
- "@ledgerhq/coin-tron": "^5.6.0-nightly.2",
192
- "@ledgerhq/coin-vechain": "^2.11.1-nightly.2",
193
- "@ledgerhq/coin-xrp": "^7.7.0-nightly.2",
166
+ "@ledgerhq/coin-algorand": "^0.12.0-nightly.4",
167
+ "@ledgerhq/coin-aptos": "^3.5.0-nightly.3",
168
+ "@ledgerhq/coin-bitcoin": "^0.24.0-nightly.3",
169
+ "@ledgerhq/coin-canton": "^0.9.0-nightly.3",
170
+ "@ledgerhq/coin-cardano": "^0.14.0-nightly.3",
171
+ "@ledgerhq/coin-casper": "^2.3.0-nightly.3",
172
+ "@ledgerhq/coin-celo": "^1.7.0-nightly.5",
173
+ "@ledgerhq/coin-cosmos": "^0.19.0-nightly.3",
174
+ "@ledgerhq/coin-evm": "^2.34.0-nightly.5",
175
+ "@ledgerhq/coin-filecoin": "^1.14.0-nightly.3",
176
+ "@ledgerhq/coin-framework": "^6.8.0-nightly.3",
177
+ "@ledgerhq/coin-hedera": "^1.13.0-nightly.3",
178
+ "@ledgerhq/coin-icon": "^0.14.0-nightly.3",
179
+ "@ledgerhq/coin-internet_computer": "^1.10.0-nightly.3",
180
+ "@ledgerhq/coin-kaspa": "^1.4.0-nightly.3",
181
+ "@ledgerhq/coin-mina": "^1.4.0-nightly.3",
182
+ "@ledgerhq/coin-multiversx": "^0.7.0-nightly.4",
183
+ "@ledgerhq/coin-near": "^0.15.0-nightly.3",
184
+ "@ledgerhq/coin-polkadot": "^6.12.0-nightly.3",
185
+ "@ledgerhq/coin-solana": "^0.36.0-nightly.3",
186
+ "@ledgerhq/coin-stacks": "^0.11.0-nightly.3",
187
+ "@ledgerhq/coin-stellar": "^6.6.0-nightly.3",
188
+ "@ledgerhq/coin-sui": "^0.17.0-nightly.4",
189
+ "@ledgerhq/coin-tezos": "^6.8.0-nightly.3",
190
+ "@ledgerhq/coin-ton": "^0.16.0-nightly.3",
191
+ "@ledgerhq/coin-tron": "^5.6.0-nightly.3",
192
+ "@ledgerhq/coin-vechain": "^2.11.1-nightly.3",
193
+ "@ledgerhq/coin-xrp": "^7.7.0-nightly.3",
194
194
  "@ledgerhq/crypto-icons-ui": "^1.21.0",
195
195
  "@ledgerhq/cryptoassets": "^13.32.0-nightly.1",
196
196
  "@ledgerhq/device-core": "^0.6.7-nightly.1",
@@ -221,17 +221,17 @@
221
221
  "@ledgerhq/ledger-cal-service": "^1.7.1-nightly.0",
222
222
  "@ledgerhq/ledger-trust-service": "^0.4.1-nightly.0",
223
223
  "@ledgerhq/live-config": "^3.2.0",
224
- "@ledgerhq/live-countervalues": "^0.8.1-nightly.2",
225
- "@ledgerhq/live-countervalues-react": "^0.7.1-nightly.2",
224
+ "@ledgerhq/live-countervalues": "^0.8.1-nightly.3",
225
+ "@ledgerhq/live-countervalues-react": "^0.7.1-nightly.3",
226
226
  "@ledgerhq/live-dmk-shared": "^0.14.0",
227
227
  "@ledgerhq/live-env": "^2.19.0",
228
228
  "@ledgerhq/live-hooks": "0.2.0",
229
229
  "@ledgerhq/live-network": "^2.1.0-nightly.0",
230
230
  "@ledgerhq/live-promise": "^0.1.1",
231
- "@ledgerhq/live-signer-canton": "^0.5.0-nightly.2",
232
- "@ledgerhq/live-signer-evm": "^0.9.1-nightly.4",
233
- "@ledgerhq/live-signer-solana": "^0.5.9-nightly.2",
234
- "@ledgerhq/live-wallet": "^0.15.0-nightly.2",
231
+ "@ledgerhq/live-signer-canton": "^0.5.0-nightly.3",
232
+ "@ledgerhq/live-signer-evm": "^0.9.1-nightly.5",
233
+ "@ledgerhq/live-signer-solana": "^0.5.9-nightly.3",
234
+ "@ledgerhq/live-wallet": "^0.15.0-nightly.3",
235
235
  "@ledgerhq/logs": "^6.13.0",
236
236
  "@ledgerhq/speculos-transport": "^0.2.14-nightly.0",
237
237
  "@ledgerhq/wallet-api-acre-module": "^0.8.0",
package/src/bridge/generic-alpaca/getAccountShape.ts CHANGED
@@ -91,7 +91,14 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
91
91
  subOperations,
92
92
  });
93
93
  });
94
- const operations = mergeOps(oldOps, newOpsWithSubs) as OperationCommon[];
94
+ const confirmedOperations =
95
+ alpacaApi.refreshOperations && initialAccount?.pendingOperations.length
96
+ ? await alpacaApi.refreshOperations(initialAccount.pendingOperations)
97
+ : [];
98
+ const operations = mergeOps(oldOps, [
99
+ ...confirmedOperations,
100
+ ...newOpsWithSubs,
101
+ ]) as OperationCommon[];
95
102
 
96
103
  const res = {
97
104
  id: accountId,
package/src/bridge/generic-alpaca/tests/getAccountShape.test.ts CHANGED
@@ -15,12 +15,14 @@ const getBalanceMock = jest.fn();
15
15
  const lastBlockMock = jest.fn();
16
16
  const getTokenFromAssetMock = jest.fn();
17
17
  const chainSpecificGetAccountShapeMock = jest.fn();
18
+ const refreshOperationsMock = jest.fn();
18
19
  jest.mock("../alpaca", () => ({
19
20
  getAlpacaApi: () => ({
20
21
  lastBlock: (...a: any[]) => lastBlockMock(...a),
21
22
  getBalance: (...a: any[]) => getBalanceMock(...a),
22
23
  listOperations: (...a: any[]) => listOperationsMock(...a),
23
24
  getTokenFromAsset: (...a: any[]) => getTokenFromAssetMock(...a),
25
+ refreshOperations: (...a: any[]) => refreshOperationsMock(...a),
24
26
  getChainSpecificRules: () => ({
25
27
  getAccountShape: (...a: any[]) => chainSpecificGetAccountShapeMock(...a),
26
28
  }),
@@ -68,7 +70,16 @@ describe("genericGetAccountShape", () => {
68
70
  type: "OPT_IN",
69
71
  extra: { pagingToken: "pt1", assetReference: "ar1", assetOwner: "ow1" },
70
72
  };
71
- const initialAccount = { operations: [oldOp], blockHeight: 10 };
73
+ const pendingOp = {
74
+ hash: "h0",
75
+ blockHeight: 10,
76
+ type: "OUT",
77
+ };
78
+ const initialAccount = {
79
+ operations: [oldOp],
80
+ pendingOperations: [pendingOp],
81
+ blockHeight: 10,
82
+ };
72
83
 
73
84
  extractBalanceMock.mockReturnValue({ value: "1000", locked: "300" });
74
85
  getBalanceMock.mockResolvedValue([
@@ -83,6 +94,13 @@ describe("genericGetAccountShape", () => {
83
94
 
84
95
  const coreOp = { hash: "h2", height: 12 };
85
96
  listOperationsMock.mockResolvedValue([[coreOp]]);
97
+ refreshOperationsMock.mockImplementation(ops => {
98
+ const op = ops[0];
99
+ if (op?.hash === "h0") {
100
+ return [{ ...op, blockHeight: 12 }];
101
+ }
102
+ return [];
103
+ });
86
104
 
87
105
  adaptCoreOperationToLiveOperationMock.mockImplementation((_accId, op) => ({
88
106
  hash: op.hash,
@@ -141,9 +159,14 @@ describe("genericGetAccountShape", () => {
141
159
  balance: new BigNumber(1000),
142
160
  spendableBalance: new BigNumber(700),
143
161
  blockHeight: 123,
144
- operationsCount: 2,
162
+ operationsCount: 3,
145
163
  subAccounts: [{ id: `${currency.id}_subAcc1`, type: "TokenAccount" }],
146
164
  operations: [
165
+ {
166
+ hash: "h0",
167
+ type: "OUT",
168
+ blockHeight: 12,
169
+ },
147
170
  {
148
171
  hash: "h2",
149
172
  type: "IN",
package/src/bridge/generic-alpaca/utils.test.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import {
2
2
  adaptCoreOperationToLiveOperation,
3
+ buildOptimisticOperation,
3
4
  cleanedOperation,
4
5
  extractBalance,
5
6
  findCryptoCurrencyByNetwork,
@@ -11,6 +12,170 @@ import { Account } from "@ledgerhq/types-live";
11
12
  import { GenericTransaction, OperationCommon } from "./types";
12
13
 
13
14
  describe("Alpaca utils", () => {
15
+ describe("buildOptimisticOperation", () => {
16
+ it.each([
17
+ [
18
+ "coin",
19
+ "changeTrust",
20
+ {},
21
+ {
22
+ parentType: "OPT_IN",
23
+ subType: undefined,
24
+ parentValue: new BigNumber(50),
25
+ },
26
+ ],
27
+ [
28
+ "coin",
29
+ "delegate",
30
+ {},
31
+ {
32
+ parentType: "DELEGATE",
33
+ subType: undefined,
34
+ parentValue: new BigNumber(50),
35
+ },
36
+ ],
37
+ [
38
+ "coin",
39
+ "stake",
40
+ {},
41
+ {
42
+ parentType: "DELEGATE",
43
+ subType: undefined,
44
+ parentValue: new BigNumber(50),
45
+ },
46
+ ],
47
+ [
48
+ "coin",
49
+ "undelegate",
50
+ {},
51
+ {
52
+ parentType: "UNDELEGATE",
53
+ subType: undefined,
54
+ parentValue: new BigNumber(50),
55
+ },
56
+ ],
57
+ [
58
+ "coin",
59
+ "unstake",
60
+ {},
61
+ {
62
+ parentType: "UNDELEGATE",
63
+ subType: undefined,
64
+ parentValue: new BigNumber(50),
65
+ },
66
+ ],
67
+ [
68
+ "coin",
69
+ "send",
70
+ {},
71
+ {
72
+ parentType: "OUT",
73
+ subType: undefined,
74
+ parentValue: new BigNumber(50),
75
+ },
76
+ ],
77
+ [
78
+ "token",
79
+ "changeTrust",
80
+ { subAccountId: "sub-account-id" },
81
+ {
82
+ parentType: "FEES",
83
+ subType: "OPT_IN",
84
+ parentValue: new BigNumber(12),
85
+ },
86
+ ],
87
+ [
88
+ "token",
89
+ "delegate",
90
+ { subAccountId: "sub-account-id" },
91
+ {
92
+ parentType: "FEES",
93
+ subType: "DELEGATE",
94
+ parentValue: new BigNumber(12),
95
+ },
96
+ ],
97
+ [
98
+ "token",
99
+ "stake",
100
+ { subAccountId: "sub-account-id" },
101
+ {
102
+ parentType: "FEES",
103
+ subType: "DELEGATE",
104
+ parentValue: new BigNumber(12),
105
+ },
106
+ ],
107
+ [
108
+ "token",
109
+ "undelegate",
110
+ { subAccountId: "sub-account-id" },
111
+ {
112
+ parentType: "FEES",
113
+ subType: "UNDELEGATE",
114
+ parentValue: new BigNumber(12),
115
+ },
116
+ ],
117
+ [
118
+ "token",
119
+ "unstake",
120
+ { subAccountId: "sub-account-id" },
121
+ {
122
+ parentType: "FEES",
123
+ subType: "UNDELEGATE",
124
+ parentValue: new BigNumber(12),
125
+ },
126
+ ],
127
+ [
128
+ "token",
129
+ "send",
130
+ { subAccountId: "sub-account-id" },
131
+ { parentType: "FEES", subType: "OUT", parentValue: new BigNumber(12) },
132
+ ],
133
+ ])("builds an optimistic %s operation with %s mode ", (_s, mode, params, expected) => {
134
+ const operation = buildOptimisticOperation(
135
+ {
136
+ id: "parent-account-id",
137
+ freshAddress: "account-address",
138
+ subAccounts: [{ id: "sub-account-id" }],
139
+ } as Account,
140
+ {
141
+ mode,
142
+ amount: new BigNumber(50),
143
+ fees: new BigNumber(12),
144
+ recipient: "recipient-address",
145
+ ...params,
146
+ } as GenericTransaction,
147
+ );
148
+
149
+ expect(operation).toMatchObject({
150
+ id: `parent-account-id--${expected.parentType}`,
151
+ type: expected.parentType,
152
+ value: expected.parentValue,
153
+ accountId: "parent-account-id",
154
+ senders: ["account-address"],
155
+ recipients: ["recipient-address"],
156
+ fee: new BigNumber(12),
157
+ blockHash: null,
158
+ blockHeight: null,
159
+ ...(expected.subType
160
+ ? {
161
+ subOperations: [
162
+ {
163
+ id: `sub-account-id--${expected.subType}`,
164
+ accountId: "sub-account-id",
165
+ type: expected.subType,
166
+ senders: ["account-address"],
167
+ recipients: ["recipient-address"],
168
+ value: new BigNumber(50),
169
+ blockHash: null,
170
+ blockHeight: null,
171
+ },
172
+ ],
173
+ }
174
+ : {}),
175
+ });
176
+ });
177
+ });
178
+
14
179
  describe("cleanedOperation", () => {
15
180
  it("creates a cleaned version of an operation without mutating it", () => {
16
181
  const dirty = {