@cityofzion/bs-neo3 1.15.3 → 1.16.0

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

@@ -30,12 +30,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _DoraBDSNeo3_instances, _DoraBDSNeo3_supportedNep11Standards, _DoraBDSNeo3_nftDataService, _DoraBDSNeo3_explorerService, _DoraBDSNeo3_validateAddress, _DoraBDSNeo3_validateFullTransactionsByAddressParams, _DoraBDSNeo3_validateGetFullTransactionsByAddressParams;
+var _DoraBDSNeo3_instances, _DoraBDSNeo3_supportedNep11Standards, _DoraBDSNeo3_nftDataService, _DoraBDSNeo3_explorerService, _DoraBDSNeo3_validateAddress, _DoraBDSNeo3_validateFullTransactionsByAddressParams, _DoraBDSNeo3_validateGetFullTransactionsByAddressParams, _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoraBDSNeo3 = exports.DoraNeoRest = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const dora_ts_1 = require("@cityofzion/dora-ts");
 const neon_js_1 = require("@cityofzion/neon-js");
+const BSNeo3Constants_1 = require("../../constants/BSNeo3Constants");
 const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
 const RpcBDSNeo3_1 = require("./RpcBDSNeo3");
 exports.DoraNeoRest = new dora_ts_1.api.NeoRESTApi({
@@ -73,6 +74,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                     fee: blockchain_service_1.BSBigNumberHelper.format(totalFee, { decimals: this._feeToken.decimals }),
                     notifications: [],
                     transfers: [],
+                    type: 'default', // It's not possible to set the correct type because we don't have notifications here
                 };
             }
             catch (_c) {
@@ -90,9 +92,10 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
             }
             const data = yield exports.DoraNeoRest.addressTXFull(address, nextPageParams, this._network.id);
             const promises = data.items.map((item) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
+                var _a, _b, _c;
                 const transferPromises = [];
-                item.notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
+                const notifications = (_a = item.notifications) !== null && _a !== void 0 ? _a : [];
+                notifications.forEach(({ contract: contractHash, state, event_name: eventName }) => {
                     var _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))
@@ -127,21 +130,25 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                     transferPromises.push(promise());
                 });
                 const transfers = yield Promise.all(transferPromises);
-                const notifications = item.notifications.map(notification => ({
-                    eventName: notification.event_name,
-                    state: notification.state,
-                }));
-                const systemFeeNumber = blockchain_service_1.BSBigNumberHelper.fromNumber((_a = item.sysfee) !== null && _a !== void 0 ? _a : 0);
-                const networkFeeNumber = blockchain_service_1.BSBigNumberHelper.fromNumber((_b = item.netfee) !== null && _b !== void 0 ? _b : 0);
+                const systemFeeNumber = blockchain_service_1.BSBigNumberHelper.fromNumber((_b = item.sysfee) !== null && _b !== void 0 ? _b : 0);
+                const networkFeeNumber = blockchain_service_1.BSBigNumberHelper.fromNumber((_c = item.netfee) !== null && _c !== void 0 ? _c : 0);
                 const totalFee = systemFeeNumber.plus(networkFeeNumber);
-                return {
+                let transaction = {
                     block: item.block,
                     time: Number(item.time),
                     hash: item.hash,
                     fee: blockchain_service_1.BSBigNumberHelper.format(totalFee, { decimals: this._feeToken.decimals }),
                     transfers,
-                    notifications,
+                    notifications: notifications.map(notification => ({
+                        eventName: notification.event_name,
+                        state: notification.state,
+                    })),
+                    type: 'default',
                 };
+                const bridgeNeo3NeoXData = __classPrivateFieldGet(this, _DoraBDSNeo3_instances, "m", _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications).call(this, notifications);
+                if (bridgeNeo3NeoXData)
+                    transaction = Object.assign(Object.assign({}, transaction), { type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData });
+                return transaction;
             }));
             const transactions = yield Promise.all(promises);
             const limit = 15;
@@ -171,10 +178,10 @@ 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((_d) => __awaiter(this, void 0, void 0, function* () {
+            const itemPromises = items.map((_d, index) => __awaiter(this, void 0, void 0, function* () {
                 var { networkFeeAmount, systemFeeAmount } = _d, item = __rest(_d, ["networkFeeAmount", "systemFeeAmount"]);
                 const txId = item.transactionID;
-                const newItem = {
+                let newItem = {
                     txId,
                     txIdUrl: txId ? txTemplateUrl === null || txTemplateUrl === void 0 ? void 0 : txTemplateUrl.replace('{txId}', txId) : undefined,
                     block: item.block,
@@ -188,12 +195,13 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                         ? blockchain_service_1.BSBigNumberHelper.format(systemFeeAmount, { decimals: this._feeToken.decimals })
                         : undefined,
                     events: [],
+                    type: 'default',
                 };
-                const eventPromises = item.events.map((event) => __awaiter(this, void 0, void 0, function* () {
+                const eventPromises = item.events.map((event, eventIndex) => __awaiter(this, void 0, void 0, function* () {
                     var _e, _f, _g, _h, _j, _k;
                     let nftEvent;
                     let assetEvent;
-                    const { methodName, tokenID: tokenId, contractHash: hash } = event;
+                    const { methodName, tokenID: tokenId, contractHash: hash, contractName } = 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;
@@ -240,10 +248,18 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                             tokenType: 'nep-17',
                         };
                     }
-                    newItem.events.push(isNft ? nftEvent : assetEvent);
+                    if (newItem.type === 'default' && contractName === 'NeoXBridge') {
+                        const [log] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => exports.DoraNeoRest.log(txId, this._network.id));
+                        if (!!log && log.vmstate === 'HALT') {
+                            const data = __classPrivateFieldGet(this, _DoraBDSNeo3_instances, "m", _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications).call(this, log.notifications || []);
+                            if (data)
+                                newItem = Object.assign(Object.assign({}, newItem), { type: 'bridgeNeo3NeoX', data });
+                        }
+                    }
+                    newItem.events.splice(eventIndex, 0, isNft ? nftEvent : assetEvent);
                 }));
                 yield Promise.allSettled(eventPromises);
-                data.push(newItem);
+                data.splice(index, 0, newItem);
             }));
             yield Promise.allSettled(itemPromises);
             return { nextCursor: response.nextCursor, data };
@@ -357,4 +373,28 @@ _DoraBDSNeo3_supportedNep11Standards = new WeakMap(), _DoraBDSNeo3_nftDataServic
     if (typeof pageSize === 'number' && (isNaN(pageSize) || pageSize < 1 || pageSize > 500))
         throw new Error('Page size should be between 1 and 500');
     __classPrivateFieldGet(this, _DoraBDSNeo3_instances, "m", _DoraBDSNeo3_validateFullTransactionsByAddressParams).call(this, params);
+}, _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications = function _DoraBDSNeo3_getBridgeNeo3NeoXDataByNotifications(notifications) {
+    var _a, _b, _c;
+    const gasNotification = notifications.find(({ event_name }) => event_name === 'NativeDeposit');
+    const isNativeToken = !!gasNotification;
+    const neoNotification = !isNativeToken
+        ? notifications.find(({ event_name }) => event_name === 'TokenDeposit')
+        : undefined;
+    const notification = isNativeToken ? gasNotification : neoNotification;
+    const notificationStateValue = (_a = notification === null || notification === void 0 ? void 0 : notification.state) === null || _a === void 0 ? void 0 : _a.value;
+    if (!notificationStateValue)
+        return undefined;
+    const decimals = isNativeToken ? BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN.decimals : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.decimals;
+    const amountIndex = isNativeToken ? 2 : 4;
+    const amountWithDecimals = ((_b = notificationStateValue === null || notificationStateValue === void 0 ? void 0 : notificationStateValue[amountIndex]) === null || _b === void 0 ? void 0 : _b.value) || 0;
+    const amount = blockchain_service_1.BSBigNumberHelper.format(neon_js_1.u.BigInteger.fromNumber(amountWithDecimals).toDecimal(decimals), {
+        decimals,
+    });
+    const receiverAddressIndex = isNativeToken ? 1 : 3;
+    const byteStringReceiverAddress = ((_c = notificationStateValue === null || notificationStateValue === void 0 ? void 0 : notificationStateValue[receiverAddressIndex]) === null || _c === void 0 ? void 0 : _c.value) || '';
+    if (!byteStringReceiverAddress)
+        return undefined;
+    const receiverAddress = `0x${neon_js_1.u.HexString.fromBase64(byteStringReceiverAddress).toLittleEndian()}`;
+    const token = isNativeToken ? BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN;
+    return { amount, token, receiverAddress };
 };

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

@@ -39,6 +39,7 @@ class RpcBDSNeo3 {
                     notifications: [],
                     transfers: [],
                     time: response.blocktime,
+                    type: 'default', // It's not possible to set the correct type because we don't have notifications here
                 };
             }
             catch (_c) {

package/dist/services/neo3neoXBridge/Neo3NeoXBridgeService.d.ts

@@ -3,11 +3,11 @@ import { BSNeo3 } from '../../BSNeo3';
 export declare class Neo3NeoXBridgeService<BSName extends string = string> implements INeo3NeoXBridgeService<BSName> {
     #private;
     readonly BRIDGE_SCRIPT_HASH = "0xbb19cfc864b73159277e1fd39694b3fd5fc613d2";
-    tokens: TBridgeToken[];
+    tokens: TBridgeToken<BSName>[];
     constructor(service: BSNeo3<BSName>);
     getApprovalFee(): Promise<string>;
-    getBridgeConstants(token: TBridgeToken): Promise<TNeo3NeoXBridgeServiceConstants>;
+    getBridgeConstants(token: TBridgeToken<BSName>): Promise<TNeo3NeoXBridgeServiceConstants>;
     bridge(params: TNeo3NeoXBridgeServiceBridgeParam<BSName>): Promise<string>;
-    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams): Promise<string | null>;
-    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams): Promise<string | null>;
+    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<BSName>): Promise<string>;
+    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<BSName>): Promise<string>;
 }

package/dist/services/neo3neoXBridge/Neo3NeoXBridgeService.js

@@ -37,8 +37,8 @@ class Neo3NeoXBridgeService {
         _Neo3NeoXBridgeService_service.set(this, void 0);
         __classPrivateFieldSet(this, _Neo3NeoXBridgeService_service, service, "f");
         this.tokens = [
-            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN), { multichainId: 'gas' }),
-            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN), { multichainId: 'neo' }),
+            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN), { multichainId: 'gas', blockchain: service.name }),
+            Object.assign(Object.assign({}, BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN), { multichainId: 'neo', blockchain: service.name }),
         ];
     }
     getApprovalFee() {
@@ -147,37 +147,62 @@ class Neo3NeoXBridgeService {
     getNonce(params) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const log = yield DoraBDSNeo3_1.DoraNeoRest.log(params.transactionHash, __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.id);
-            if (log.vmstate !== 'HALT') {
-                return null;
+            let log;
+            try {
+                log = yield DoraBDSNeo3_1.DoraNeoRest.log(params.transactionHash, __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.id);
+            }
+            catch (error) {
+                throw new blockchain_service_1.BSError('Failed to get nonce from transaction log', 'FAILED_TO_GET_NONCE', error);
+            }
+            if ((log === null || log === void 0 ? void 0 : log.vmstate) !== 'HALT') {
+                throw new blockchain_service_1.BSError('Transaction invalid', 'INVALID_TRANSACTION');
             }
             const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+            let nonce = null;
             if (isNativeToken) {
                 const notification = log.notifications.find(item => item.event_name === 'NativeDeposit');
-                return (_a = notification === null || notification === void 0 ? void 0 : notification.state.value[0].value) !== null && _a !== void 0 ? _a : null;
+                nonce = (_a = notification === null || notification === void 0 ? void 0 : notification.state.value[0].value) !== null && _a !== void 0 ? _a : null;
+            }
+            else {
+                const notification = log.notifications.find(item => item.event_name === 'TokenDeposit');
+                nonce = (_b = notification === null || notification === void 0 ? void 0 : notification.state.value[2].value) !== null && _b !== void 0 ? _b : null;
+            }
+            if (!nonce) {
+                throw new blockchain_service_1.BSError('Nonce not found in transaction log', 'NONCE_NOT_FOUND');
             }
-            const notification = log.notifications.find(item => item.event_name === 'TokenDeposit');
-            return (_b = notification === null || notification === void 0 ? void 0 : notification.state.value[2].value) !== null && _b !== void 0 ? _b : null;
+            return nonce;
         });
     }
     getTransactionHashByNonce(params) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
-            const { data } = yield axios_1.default.post('https://neofura.ngd.network', {
-                jsonrpc: '2.0',
-                method: 'GetBridgeTxByNonce',
-                params: {
-                    ContractHash: this.BRIDGE_SCRIPT_HASH,
-                    TokenHash: isNativeToken ? '' : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.hash,
-                    Nonce: Number(params.nonce),
-                },
-                id: 1,
-            });
+            let data;
+            try {
+                const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN);
+                const response = yield axios_1.default.post('https://neofura.ngd.network', {
+                    jsonrpc: '2.0',
+                    method: 'GetBridgeTxByNonce',
+                    params: {
+                        ContractHash: this.BRIDGE_SCRIPT_HASH,
+                        TokenHash: isNativeToken ? '' : BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN.hash,
+                        Nonce: Number(params.nonce),
+                    },
+                    id: 1,
+                });
+                data = response.data;
+            }
+            catch (error) {
+                throw new blockchain_service_1.BSError('Failed to get transaction by nonce', 'FAILED_TO_GET_TRANSACTION_BY_NONCE', error);
+            }
             if (!(data === null || data === void 0 ? void 0 : data.result)) {
-                throw new blockchain_service_1.BSError('Transaction not found', 'INVALID_RESPONSE');
+                throw new blockchain_service_1.BSError('Failed to get transaction by nonce', 'FAILED_TO_GET_TRANSACTION_BY_NONCE');
+            }
+            if (data.result.Vmstate !== 'HALT') {
+                throw new blockchain_service_1.BSError('Transaction invalid', 'INVALID_TRANSACTION');
+            }
+            if (!data.result.txid) {
+                throw new blockchain_service_1.BSError('Transaction ID not found in response', 'TXID_NOT_FOUND');
             }
-            return data.result.Vmstate === 'HALT' ? (_a = data.result.txid) !== null && _a !== void 0 ? _a : null : null;
+            return data.result.txid;
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neo3",
-  "version": "1.15.3",
+  "version": "1.16.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -21,7 +21,7 @@
     "isomorphic-ws": "^5.0.0",
     "lodash.clonedeep": "^4.5.0",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.19.2",
+    "@cityofzion/blockchain-service": "1.20.0",
     "@cityofzion/bs-asteroid-sdk": "0.9.1"
   },
   "devDependencies": {
@@ -35,7 +35,7 @@
     "eslint": "^8.48.0",
     "jest": "29.6.2",
     "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
+    "ts-node": "~10.9.2",
     "typescript": "4.9.5",
     "typed-emitter": "^2.1.0"
   },