@ledgerhq/live-common 21.19.3 → 21.19.4

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.
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/nft/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,aAAK,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;AAIpC,oBAAY,iBAAiB,GAAG,UAAU,GAAG;IAC3C,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAS,SAAS,EAAE,KAAG,GAAG,EAoCxD,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACtB,GAAG,EAAE,6CAEV,iBAAiB,EAoBnB,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,MAAM,WAAW,MAAM,KAAG,MAE7D,CAAC"}
1
+ {"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/nft/helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,aAAK,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;AAIpC,oBAAY,iBAAiB,GAAG,UAAU,GAAG;IAC3C,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAS,SAAS,EAAE,KAAG,GAAG,EAmCxD,CAAC;AAEF,eAAO,MAAM,iBAAiB,UACtB,GAAG,EAAE,6CAEV,iBAAiB,EAoBnB,CAAC;AAEF,eAAO,MAAM,SAAS,aAAc,MAAM,WAAW,MAAM,KAAG,MAE7D,CAAC"}
@@ -28,26 +28,27 @@ exports.__esModule = true;
28
28
  exports.getNftKey = exports.nftsByCollections = exports.nftsFromOperations = void 0;
29
29
  var eip55_1 = __importDefault(require("eip55"));
30
30
  var bignumber_js_1 = __importDefault(require("bignumber.js"));
31
+ var _1 = require(".");
31
32
  var nftsFromOperations = function (ops) {
32
33
  var nftsMap = ops
33
34
  // if ops are Operations get the prop nftOperations, else ops are considered nftOperations already
34
35
  .flatMap(function (op) { var _a; return (((_a = op === null || op === void 0 ? void 0 : op.nftOperations) === null || _a === void 0 ? void 0 : _a.length) ? op.nftOperations : op); })
35
36
  .reduce(function (acc, nftOp) {
36
- if (!(nftOp === null || nftOp === void 0 ? void 0 : nftOp.contract)) {
37
+ var contract = nftOp.contract;
38
+ if (!contract) {
37
39
  return acc;
38
40
  }
39
41
  // Creating a "token for a contract" unique key
40
- var contract = eip55_1["default"].encode(nftOp.contract);
41
- var nftKey = contract + nftOp.tokenId;
42
- var tokenId = nftOp.tokenId, standard = nftOp.standard, id = nftOp.id;
43
- var nft = (acc[nftKey] || {
42
+ contract = eip55_1["default"].encode(contract);
43
+ var tokenId = nftOp.tokenId, standard = nftOp.standard, accountId = nftOp.accountId;
44
+ if (!tokenId || !standard)
45
+ return acc;
46
+ var id = (0, _1.encodeNftId)(accountId, contract, tokenId || "");
47
+ var nft = (acc[id] || {
44
48
  id: id,
45
49
  tokenId: tokenId,
46
50
  amount: new bignumber_js_1["default"](0),
47
- collection: {
48
- contract: contract,
49
- standard: standard
50
- }
51
+ collection: { contract: contract, standard: standard }
51
52
  });
52
53
  if (nftOp.type === "NFT_IN") {
53
54
  nft.amount = nft.amount.plus(nftOp.value);
@@ -55,7 +56,7 @@ var nftsFromOperations = function (ops) {
55
56
  else if (nftOp.type === "NFT_OUT") {
56
57
  nft.amount = nft.amount.minus(nftOp.value);
57
58
  }
58
- acc[nftKey] = nft;
59
+ acc[id] = nft;
59
60
  return acc;
60
61
  }, {});
61
62
  return Object.values(nftsMap).filter(function (n) { return n.amount.gt(0); });
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/nft/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/nft/helpers.ts"],"names":[],"mappings":"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"}
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.19.3",
11
+ "version": "21.19.4",
12
12
  "main": "lib/index.js",
13
13
  "types": "lib/index.d.ts",
14
14
  "license": "Apache-2.0",
@@ -1,6 +1,7 @@
1
1
  import eip55 from "eip55";
2
2
  import BigNumber from "bignumber.js";
3
3
  import { NFT, Operation } from "../types";
4
+ import { encodeNftId } from ".";
4
5
 
5
6
  type Collection = NFT["collection"];
6
7
 
@@ -15,23 +16,22 @@ export const nftsFromOperations = (ops: Operation[]): NFT[] => {
15
16
  // if ops are Operations get the prop nftOperations, else ops are considered nftOperations already
16
17
  .flatMap((op) => (op?.nftOperations?.length ? op.nftOperations : op))
17
18
  .reduce((acc: Record<string, NFT>, nftOp: Operation) => {
18
- if (!nftOp?.contract) {
19
+ let { contract } = nftOp;
20
+ if (!contract) {
19
21
  return acc;
20
22
  }
21
23
 
22
24
  // Creating a "token for a contract" unique key
23
- const contract = eip55.encode(nftOp.contract!);
24
- const nftKey = contract + nftOp.tokenId!;
25
- const { tokenId, standard, id } = nftOp;
25
+ contract = eip55.encode(contract);
26
+ const { tokenId, standard, accountId } = nftOp;
27
+ if (!tokenId || !standard) return acc;
28
+ const id = encodeNftId(accountId, contract, tokenId || "");
26
29
 
27
- const nft = (acc[nftKey] || {
30
+ const nft = (acc[id] || {
28
31
  id,
29
- tokenId: tokenId!,
32
+ tokenId,
30
33
  amount: new BigNumber(0),
31
- collection: {
32
- contract,
33
- standard: standard!,
34
- },
34
+ collection: { contract, standard },
35
35
  }) as NFT;
36
36
 
37
37
  if (nftOp.type === "NFT_IN") {
@@ -40,7 +40,7 @@ export const nftsFromOperations = (ops: Operation[]): NFT[] => {
40
40
  nft.amount = nft.amount.minus(nftOp.value);
41
41
  }
42
42
 
43
- acc[nftKey] = nft;
43
+ acc[id] = nft;
44
44
 
45
45
  return acc;
46
46
  }, {});