@cityofzion/bs-neo3 1.13.0 → 1.13.2

package/dist/services/blockchain-data/DoraBDSNeo3.js

@@ -93,12 +93,11 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                 const transferPromises = [];
                 item.notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
                     var _a;
-                    // TODO: created issue to fix it (https://app.clickup.com/t/86a86n3yw), type from @cityofzion/dora-ts is wrong, it's necessary to do this force casting now
-                    const properties = (_a = (Array.isArray(state) ? state : state === null || state === void 0 ? void 0 : state.value)) !== null && _a !== void 0 ? _a : [];
+                    const properties = Array.isArray(state) ? state : (_a = state === null || state === void 0 ? void 0 : state.value) !== null && _a !== void 0 ? _a : [];
                     if (eventName !== 'Transfer' || (properties.length !== 3 && properties.length !== 4))
                         return;
                     const promise = () => __awaiter(this, void 0, void 0, function* () {
-                        var _b, _c;
+                        var _b;
                         const isAsset = properties.length === 3;
                         const from = properties[0].value;
                         const to = properties[1].value;
@@ -106,7 +105,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                         const convertedTo = to ? this.convertByteStringToAddress(to) : 'Burn';
                         if (isAsset) {
                             const token = yield this.getTokenInfo(contractHash);
-                            const [, , { value: amount }] = properties;
+                            const amount = properties[2].value;
                             return {
                                 amount: amount ? neon_js_1.u.BigInteger.fromNumber(amount).toDecimal((_b = token.decimals) !== null && _b !== void 0 ? _b : 0) : '0',
                                 from: convertedFrom,
@@ -119,7 +118,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                         return {
                             from: convertedFrom,
                             to: convertedTo,
-                            tokenId: (_c = properties[3].value) !== null && _c !== void 0 ? _c : '',
+                            tokenId: properties[3].value,
                             contractHash,
                             type: 'nft',
                         };
@@ -170,7 +169,8 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
             const txTemplateUrl = __classPrivateFieldGet(this, _DoraBDSNeo3_explorerService, "f").getTxTemplateUrl();
             const nftTemplateUrl = __classPrivateFieldGet(this, _DoraBDSNeo3_explorerService, "f").getNftTemplateUrl();
             const contractTemplateUrl = __classPrivateFieldGet(this, _DoraBDSNeo3_explorerService, "f").getContractTemplateUrl();
-            const itemPromises = items.map((item) => __awaiter(this, void 0, void 0, function* () {
+            const itemPromises = items.map((_d) => __awaiter(this, void 0, void 0, function* () {
+                var { networkFeeAmount, systemFeeAmount } = _d, item = __rest(_d, ["networkFeeAmount", "systemFeeAmount"]);
                 const txId = item.transactionID;
                 const newItem = {
                     txId,
@@ -179,32 +179,32 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                     date: item.date,
                     invocationCount: item.invocationCount,
                     notificationCount: item.notificationCount,
-                    networkFeeAmount: (0, blockchain_service_1.formatNumber)(item.networkFeeAmount, this._feeToken.decimals),
-                    systemFeeAmount: (0, blockchain_service_1.formatNumber)(item.systemFeeAmount, this._feeToken.decimals),
+                    networkFeeAmount: networkFeeAmount
+                        ? blockchain_service_1.BSNumberHelper.formatNumber(networkFeeAmount, { decimals: this._feeToken.decimals })
+                        : undefined,
+                    systemFeeAmount: systemFeeAmount
+                        ? blockchain_service_1.BSNumberHelper.formatNumber(systemFeeAmount, { decimals: this._feeToken.decimals })
+                        : undefined,
                     events: [],
                 };
                 const eventPromises = item.events.map((event) => __awaiter(this, void 0, void 0, function* () {
-                    var _d, _e, _f, _g;
+                    var _e, _f, _g, _h, _j, _k;
                     let nftEvent;
                     let assetEvent;
-                    let from = event.from;
-                    let to = event.to;
                     const { methodName, tokenID: tokenId, contractHash: hash } = event;
+                    const from = (_e = event.from) !== null && _e !== void 0 ? _e : undefined;
+                    const to = (_f = event.to) !== null && _f !== void 0 ? _f : undefined;
                     const fromUrl = from ? addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', from) : undefined;
                     const toUrl = to ? addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', to) : undefined;
                     const hashUrl = hash ? contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', hash) : undefined;
-                    if (!from)
-                        from = 'Mint';
-                    if (!to)
-                        to = 'Burn';
-                    const standard = (_f = (_e = (_d = event.supportedStandards) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== null && _f !== void 0 ? _f : '';
+                    const standard = (_j = (_h = (_g = event.supportedStandards) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.toLowerCase()) !== null && _j !== void 0 ? _j : '';
                     const isNft = __classPrivateFieldGet(this, _DoraBDSNeo3_supportedNep11Standards, "f").includes(standard) && !!tokenId;
                     if (isNft) {
                         const [nft] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _DoraBDSNeo3_nftDataService, "f").getNft({ contractHash: hash, tokenId }));
                         const nftUrl = hash ? nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{hash}', hash).replace('{tokenId}', tokenId) : undefined;
                         nftEvent = {
                             eventType: 'nft',
-                            amount: '0',
+                            amount: undefined,
                             methodName,
                             from,
                             fromUrl,
@@ -222,10 +222,12 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                     }
                     else {
                         const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(hash));
-                        const amount = (0, blockchain_service_1.formatNumber)(event.amount, (_g = token === null || token === void 0 ? void 0 : token.decimals) !== null && _g !== void 0 ? _g : event.tokenDecimals);
+                        const { amount } = event;
                         assetEvent = {
                             eventType: 'token',
-                            amount,
+                            amount: amount
+                                ? blockchain_service_1.BSNumberHelper.formatNumber(amount, { decimals: (_k = token === null || token === void 0 ? void 0 : token.decimals) !== null && _k !== void 0 ? _k : event.tokenDecimals })
+                                : undefined,
                             methodName,
                             from,
                             fromUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@cityofzion/neon-js": "5.5.1",
     "@cityofzion/neon-core": "5.5.1",
-    "@cityofzion/dora-ts": "0.5.0",
+    "@cityofzion/dora-ts": "0.5.1",
     "axios": "1.8.2",
     "query-string": "7.1.3",
     "@ledgerhq/hw-transport": "~6.30.5",
@@ -21,7 +21,7 @@
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.18.0",
+    "@cityofzion/blockchain-service": "1.18.2",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {