@cityofzion/bs-neox 1.2.4 → 1.3.0

package/dist/services/blockchain-data/BlockscoutBDSNeoX.d.ts

@@ -2,6 +2,7 @@ import { BalanceResponse, ContractResponse, ExplorerService, ExportTransactionsB
 import { DoraBDSEthereum } from '@cityofzion/bs-ethereum';
 import { BSNeoXNetworkId } from '../../constants/BSNeoXConstants';
 export declare class BlockscoutBDSNeoX extends DoraBDSEthereum<BSNeoXNetworkId> {
+    #private;
     static BASE_URL_BY_CHAIN_ID: Partial<Record<BSNeoXNetworkId, string>>;
     static getClient(network: Network<BSNeoXNetworkId>): import("axios").AxiosInstance;
     constructor(network: Network<BSNeoXNetworkId>, nftDataService: NftDataService, explorerService: ExplorerService);

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

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -22,6 +33,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _BlockscoutBDSNeoX_instances, _BlockscoutBDSNeoX_nftDataService, _BlockscoutBDSNeoX_explorerService, _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockscoutBDSNeoX = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -30,6 +42,9 @@ const ethers_1 = require("ethers");
 const dora_ts_1 = require("@cityofzion/dora-ts");
 const bs_ethereum_1 = require("@cityofzion/bs-ethereum");
 const BSNeoXConstants_1 = require("../../constants/BSNeoXConstants");
+const bridge_1 = require("../../assets/abis/bridge");
+const Neo3NeoXBridgeService_1 = require("../neo3neoXBridge/Neo3NeoXBridgeService");
+const neon_js_1 = require("@cityofzion/neon-js");
 class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
     static getClient(network) {
         const baseURL = BlockscoutBDSNeoX.BASE_URL_BY_CHAIN_ID[network.id];
@@ -41,10 +56,16 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
         });
     }
     constructor(network, nftDataService, explorerService) {
-        super(network, BSNeoXConstants_1.BSNeoXConstants.ALL_NETWORK_IDS, nftDataService, explorerService);
+        super(network, BSNeoXConstants_1.BSNeoXConstants.ALL_NETWORK_IDS);
+        _BlockscoutBDSNeoX_instances.add(this);
+        _BlockscoutBDSNeoX_nftDataService.set(this, void 0);
+        _BlockscoutBDSNeoX_explorerService.set(this, void 0);
         this.maxTimeToConfirmTransactionInMs = 1000 * 60 * 5;
+        __classPrivateFieldSet(this, _BlockscoutBDSNeoX_nftDataService, nftDataService, "f");
+        __classPrivateFieldSet(this, _BlockscoutBDSNeoX_explorerService, explorerService, "f");
     }
     getTransaction(txid) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const client = BlockscoutBDSNeoX.getClient(this._network);
             const { data } = yield client.get(`/transactions/${txid}`);
@@ -52,13 +73,14 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
                 throw new Error('Transaction not found');
             }
             const nativeToken = BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET;
+            const to = (_a = data.to) === null || _a === void 0 ? void 0 : _a.hash;
             const transfers = [];
             const hasNativeTokenBeingTransferred = data.value !== '0';
             if (hasNativeTokenBeingTransferred) {
                 transfers.push({
                     amount: ethers_1.ethers.utils.formatUnits(data.value, nativeToken.decimals),
                     from: data.from.hash,
-                    to: data.to.hash,
+                    to,
                     type: 'token',
                     contractHash: nativeToken.hash,
                     token: nativeToken,
@@ -94,14 +116,21 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
                     }
                 }
             }
-            return {
+            let transaction = {
                 block: data.block,
                 hash: data.hash,
                 fee: ethers_1.ethers.utils.formatUnits(data.fee.value, nativeToken.decimals),
                 time: new Date(data.timestamp).getTime() / 1000,
                 notifications: [],
                 transfers,
+                type: 'default',
             };
+            if (to === Neo3NeoXBridgeService_1.Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH) {
+                const [bridgeNeo3NeoXData] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _BlockscoutBDSNeoX_instances, "m", _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction).call(this, data));
+                if (bridgeNeo3NeoXData)
+                    transaction = Object.assign(Object.assign({}, transaction), { type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData });
+            }
+            return transaction;
         });
     }
     getTransactionsByAddress(params) {
@@ -118,13 +147,15 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
             const nativeToken = BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET;
             const transactions = [];
             const promises = data.items.map((item) => __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 const transfers = [];
+                const to = (_a = item.to) === null || _a === void 0 ? void 0 : _a.hash;
                 const hasNativeTokenBeingTransferred = item.value !== '0';
                 if (hasNativeTokenBeingTransferred) {
                     transfers.push({
                         amount: ethers_1.ethers.utils.formatUnits(item.value, nativeToken.decimals),
                         from: item.from.hash,
-                        to: item.to.hash,
+                        to,
                         type: 'token',
                         contractHash: nativeToken.hash,
                         token: nativeToken,
@@ -153,14 +184,21 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
                         /* empty */
                     }
                 }
-                transactions.push({
+                let transaction = {
                     block: item.block,
                     hash: item.hash,
                     fee: ethers_1.ethers.utils.formatUnits(item.fee.value, nativeToken.decimals),
                     time: new Date(item.timestamp).getTime() / 1000,
                     notifications: [],
                     transfers,
-                });
+                    type: 'default',
+                };
+                if (to === Neo3NeoXBridgeService_1.Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH) {
+                    const [bridgeNeo3NeoXData] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _BlockscoutBDSNeoX_instances, "m", _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction).call(this, item));
+                    if (bridgeNeo3NeoXData)
+                        transaction = Object.assign(Object.assign({}, transaction), { type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData });
+                }
+                transactions.push(transaction);
             }));
             yield Promise.allSettled(promises);
             return {
@@ -170,10 +208,11 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
         });
     }
     getFullTransactionsByAddress(_a) {
-        var _b;
+        var _b, _c;
         var { nextCursor } = _a, params = __rest(_a, ["nextCursor"]);
         return __awaiter(this, void 0, void 0, function* () {
             this._validateGetFullTransactionsByAddressParams(params);
+            const data = [];
             const response = yield dora_ts_1.api.NeoXREST.getFullTransactionsByAddress({
                 address: params.address,
                 timestampFrom: params.dateFrom,
@@ -182,7 +221,101 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
                 cursor: nextCursor,
                 pageLimit: (_b = params.pageSize) !== null && _b !== void 0 ? _b : 50,
             });
-            return yield this._transformFullTransactionsByAddressResponse(response);
+            const items = (_c = response.data) !== null && _c !== void 0 ? _c : [];
+            const nativeToken = bs_ethereum_1.BSEthereumHelper.getNativeAsset(this._network);
+            const client = BlockscoutBDSNeoX.getClient(this._network);
+            const addressTemplateUrl = __classPrivateFieldGet(this, _BlockscoutBDSNeoX_explorerService, "f").getAddressTemplateUrl();
+            const txTemplateUrl = __classPrivateFieldGet(this, _BlockscoutBDSNeoX_explorerService, "f").getTxTemplateUrl();
+            const nftTemplateUrl = __classPrivateFieldGet(this, _BlockscoutBDSNeoX_explorerService, "f").getNftTemplateUrl();
+            const contractTemplateUrl = __classPrivateFieldGet(this, _BlockscoutBDSNeoX_explorerService, "f").getContractTemplateUrl();
+            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;
+                let newItem = {
+                    txId,
+                    txIdUrl: txId ? txTemplateUrl === null || txTemplateUrl === void 0 ? void 0 : txTemplateUrl.replace('{txId}', txId) : undefined,
+                    block: item.block,
+                    date: item.date,
+                    invocationCount: item.invocationCount,
+                    notificationCount: item.notificationCount,
+                    networkFeeAmount: networkFeeAmount
+                        ? blockchain_service_1.BSBigNumberHelper.format(networkFeeAmount, { decimals: nativeToken.decimals })
+                        : undefined,
+                    systemFeeAmount: systemFeeAmount
+                        ? blockchain_service_1.BSBigNumberHelper.format(systemFeeAmount, { decimals: nativeToken.decimals })
+                        : undefined,
+                    events: [],
+                    type: 'default',
+                };
+                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 from = (_e = event.from) !== null && _e !== void 0 ? _e : undefined;
+                    const to = (_f = event.to) !== null && _f !== void 0 ? _f : undefined;
+                    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 isErc1155 = this._supportedErc1155Standards.includes(standard);
+                    const isErc721 = this._supportedErc721Standards.includes(standard);
+                    const isErc20 = this._supportedErc20Standards.includes(standard);
+                    const isNft = (isErc1155 || isErc721) && !!tokenId;
+                    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 (isNft) {
+                        const [nft] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __classPrivateFieldGet(this, _BlockscoutBDSNeoX_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: undefined,
+                            methodName,
+                            from,
+                            fromUrl,
+                            to,
+                            toUrl,
+                            hash,
+                            hashUrl,
+                            tokenId,
+                            tokenType: isErc1155 ? 'erc-1155' : 'erc-721',
+                            nftImageUrl: nft === null || nft === void 0 ? void 0 : nft.image,
+                            nftUrl,
+                            name: nft === null || nft === void 0 ? void 0 : nft.name,
+                            collectionName: nft === null || nft === void 0 ? void 0 : nft.collectionName,
+                        };
+                    }
+                    else {
+                        const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(hash));
+                        assetEvent = {
+                            eventType: 'token',
+                            amount: event.amount
+                                ? blockchain_service_1.BSBigNumberHelper.format(event.amount, { decimals: (_k = token === null || token === void 0 ? void 0 : token.decimals) !== null && _k !== void 0 ? _k : event.tokenDecimals })
+                                : undefined,
+                            methodName,
+                            from,
+                            fromUrl,
+                            to,
+                            toUrl,
+                            hash,
+                            hashUrl,
+                            token: token !== null && token !== void 0 ? token : undefined,
+                            tokenType: isErc20 ? 'erc-20' : 'generic',
+                        };
+                    }
+                    if (newItem.type === 'default' && to === Neo3NeoXBridgeService_1.Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH) {
+                        const [data] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => __awaiter(this, void 0, void 0, function* () {
+                            const response = yield client.get(`/transactions/${txId}`);
+                            return __classPrivateFieldGet(this, _BlockscoutBDSNeoX_instances, "m", _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction).call(this, response.data);
+                        }));
+                        if (data)
+                            newItem = Object.assign(Object.assign({}, newItem), { type: 'bridgeNeo3NeoX', data });
+                    }
+                    newItem.events.splice(eventIndex, 0, isNft ? nftEvent : assetEvent);
+                }));
+                yield Promise.allSettled(eventPromises);
+                data.splice(index, 0, newItem);
+            }));
+            yield Promise.allSettled(itemPromises);
+            return { nextCursor: response.nextCursor, data };
         });
     }
     exportFullTransactionsByAddress(params) {
@@ -311,6 +444,29 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.DoraBDSEthereum {
     }
 }
 exports.BlockscoutBDSNeoX = BlockscoutBDSNeoX;
+_BlockscoutBDSNeoX_nftDataService = new WeakMap(), _BlockscoutBDSNeoX_explorerService = new WeakMap(), _BlockscoutBDSNeoX_instances = new WeakSet(), _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction = function _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction(blockscoutTransaction) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const BridgeInterface = new ethers_1.ethers.utils.Interface(bridge_1.BRIDGE_ABI);
+        const input = BridgeInterface.parseTransaction({ data: blockscoutTransaction.raw_input });
+        const to = input.args._to;
+        const receiverAddress = neon_js_1.wallet.getAddressFromScriptHash(to.startsWith('0x') ? to.slice(2) : to);
+        if (input.name === 'withdrawNative') {
+            const token = BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET;
+            const amount = blockchain_service_1.BSBigNumberHelper.format(ethers_1.ethers.utils.formatUnits(blockscoutTransaction.value, token.decimals), {
+                decimals: token.decimals,
+            });
+            return { amount, token, receiverAddress };
+        }
+        if (input.name === 'withdrawToken') {
+            const token = BSNeoXConstants_1.BSNeoXConstants.NEO_TOKEN;
+            const amount = blockchain_service_1.BSBigNumberHelper.format(ethers_1.ethers.utils.formatUnits(input.args._amount, token.decimals), {
+                decimals: token.decimals,
+            });
+            return { amount, token, receiverAddress };
+        }
+        return undefined;
+    });
+};
 BlockscoutBDSNeoX.BASE_URL_BY_CHAIN_ID = {
     '47763': `${blockchain_service_1.BSCommonConstants.DORA_URL}/api/neox/mainnet`,
     '12227332': 'https://dora-stage.coz.io/api/neox/testnet',

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

@@ -2,13 +2,13 @@ import { INeo3NeoXBridgeService, TBridgeToken, TNeo3NeoXBridgeServiceBridgeParam
 import { BSNeoX } from '../../BSNeoX';
 export declare class Neo3NeoXBridgeService<BSName extends string> implements INeo3NeoXBridgeService<BSName> {
     #private;
-    readonly BRIDGE_SCRIPT_HASH = "0x1212000000000000000000000000000000000004";
+    static readonly BRIDGE_SCRIPT_HASH = "0x1212000000000000000000000000000000000004";
     readonly BRIDGE_BASE_CONFIRMATION_URL = "https://xexplorer.neo.org:8877/api/v1/transactions/deposits";
-    tokens: TBridgeToken[];
+    tokens: TBridgeToken<BSName>[];
     constructor(service: BSNeoX<BSName>);
-    getBridgeConstants(token: TBridgeToken): Promise<TNeo3NeoXBridgeServiceConstants>;
+    getBridgeConstants(token: TBridgeToken<BSName>): Promise<TNeo3NeoXBridgeServiceConstants>;
     getApprovalFee(params: TNeo3NeoXBridgeServiceGetApprovalParam<BSName>): Promise<string>;
     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,20 +37,19 @@ const BSNeoXHelper_1 = require("../../helpers/BSNeoXHelper");
 class Neo3NeoXBridgeService {
     constructor(service) {
         _Neo3NeoXBridgeService_instances.add(this);
-        this.BRIDGE_SCRIPT_HASH = '0x1212000000000000000000000000000000000004';
         this.BRIDGE_BASE_CONFIRMATION_URL = 'https://xexplorer.neo.org:8877/api/v1/transactions/deposits';
         _Neo3NeoXBridgeService_service.set(this, void 0);
         __classPrivateFieldSet(this, _Neo3NeoXBridgeService_service, service, "f");
         this.tokens = [
-            Object.assign(Object.assign({}, BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET), { multichainId: 'gas' }),
-            Object.assign(Object.assign({}, BSNeoXConstants_1.BSNeoXConstants.NEO_TOKEN), { multichainId: 'neo' }),
+            Object.assign(Object.assign({}, BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET), { multichainId: 'gas', blockchain: service.name }),
+            Object.assign(Object.assign({}, BSNeoXConstants_1.BSNeoXConstants.NEO_TOKEN), { multichainId: 'neo', blockchain: service.name }),
         ];
     }
     getBridgeConstants(token) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.url);
-                const bridgeContract = new ethers_1.ethers.Contract(this.BRIDGE_SCRIPT_HASH, bridge_1.BRIDGE_ABI, provider);
+                const bridgeContract = new ethers_1.ethers.Contract(Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH, bridge_1.BRIDGE_ABI, provider);
                 const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(token)(BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET);
                 const response = isNativeToken
                     ? yield bridgeContract.nativeBridge()
@@ -103,7 +102,7 @@ class Neo3NeoXBridgeService {
                 throw new blockchain_service_1.BSError('Bridging to Neo3 is only supported on mainnet', 'UNSUPPORTED_NETWORK');
             const { account } = params;
             const signer = yield __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").generateSigner(account);
-            const bridgeContract = new ethers_1.ethers.Contract(this.BRIDGE_SCRIPT_HASH, bridge_1.BRIDGE_ABI);
+            const bridgeContract = new ethers_1.ethers.Contract(Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH, bridge_1.BRIDGE_ABI);
             const to = '0x' + neon_js_1.wallet.getScriptHashFromAddress(params.receiverAddress);
             const bridgeFee = ethers_1.ethers.utils.parseUnits(params.bridgeFee, BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET.decimals);
             const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET);
@@ -112,7 +111,7 @@ class Neo3NeoXBridgeService {
             };
             if (isNativeToken) {
                 const populatedTransaction = yield bridgeContract.populateTransaction.withdrawNative(to, bridgeFee);
-                bridgeTransactionParam = Object.assign(Object.assign(Object.assign({}, bridgeTransactionParam), populatedTransaction), { value: ethers_1.ethers.utils.parseUnits(params.amount, params.token.decimals) });
+                bridgeTransactionParam = Object.assign(Object.assign(Object.assign({}, bridgeTransactionParam), populatedTransaction), { value: ethers_1.ethers.utils.parseUnits(params.amount, params.token.decimals).add(bridgeFee) });
             }
             else {
                 const approveTransactionParam = yield __classPrivateFieldGet(this, _Neo3NeoXBridgeService_instances, "m", _Neo3NeoXBridgeService_buildApproveTransactionParam).call(this, params);
@@ -129,7 +128,7 @@ class Neo3NeoXBridgeService {
             try {
                 gasLimit = yield signer.estimateGas(bridgeTransactionParam);
             }
-            catch (_a) {
+            catch (error) {
                 gasLimit = bs_ethereum_1.BSEthereumConstants.DEFAULT_GAS_LIMIT;
             }
             const gasPrice = yield signer.getGasPrice();
@@ -146,30 +145,37 @@ class Neo3NeoXBridgeService {
                 data = response.data;
             }
             catch (error) {
-                throw new blockchain_service_1.BSError('Transaction logs not found', 'LOGS_NOT_FOUND', error);
+                throw new blockchain_service_1.BSError('Failed to get nonce from transaction log', 'FAILED_TO_GET_NONCE', error);
             }
             if (!data.items || data.items.length === 0) {
-                throw new blockchain_service_1.BSError('Transaction logs not found', 'LOGS_NOT_FOUND');
+                throw new blockchain_service_1.BSError('Transaction invalid', 'INVALID_TRANSACTION');
             }
             try {
                 const BridgeInterface = new ethers_1.ethers.utils.Interface(bridge_1.BRIDGE_ABI);
                 const isNativeToken = blockchain_service_1.BSTokenHelper.predicateByHash(params.token)(BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET);
+                let nonce;
                 if (isNativeToken) {
                     const item = data.items[0];
                     const parsedLog = BridgeInterface.parseLog({ data: item.data, topics: item.topics.filter(Boolean) });
-                    return parsedLog.args.nonce ? parsedLog.args.nonce.toString() : null;
+                    nonce = parsedLog.args.nonce ? parsedLog.args.nonce.toString() : undefined;
+                }
+                else {
+                    const item = data.items[1];
+                    const parsedLog = BridgeInterface.parseLog({ data: item.data, topics: item.topics.filter(Boolean) });
+                    nonce = parsedLog.args.nonce ? parsedLog.args.nonce.toString() : undefined;
+                }
+                if (!nonce) {
+                    throw new blockchain_service_1.BSError('Nonce not found in transaction log', 'NONCE_NOT_FOUND');
                 }
-                const item = data.items[1];
-                const parsedLog = BridgeInterface.parseLog({ data: item.data, topics: item.topics.filter(Boolean) });
-                return parsedLog.args.nonce ? parsedLog.args.nonce.toString() : null;
+                return nonce;
             }
             catch (error) {
-                return null;
+                throw new blockchain_service_1.BSError('Failed to get nonce from transaction log', 'FAILED_TO_GET_NONCE', error);
             }
         });
     }
     getTransactionHashByNonce(params) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 let url;
@@ -182,12 +188,12 @@ class Neo3NeoXBridgeService {
                 }
                 const response = yield axios_1.default.get(url);
                 if (!((_a = response.data) === null || _a === void 0 ? void 0 : _a.txid)) {
-                    throw new blockchain_service_1.BSError('Transaction not found', 'TRANSACTION_NOT_FOUND');
+                    throw new blockchain_service_1.BSError('Transaction ID not found in response', 'TXID_NOT_FOUND');
                 }
-                return (_b = response.data) === null || _b === void 0 ? void 0 : _b.txid;
+                return response.data.txid;
             }
             catch (error) {
-                throw new blockchain_service_1.BSError('Transaction not found', 'TRANSACTION_NOT_FOUND', error);
+                throw new blockchain_service_1.BSError('Transaction ID not found in response', 'TXID_NOT_FOUND', error);
             }
         });
     }
@@ -197,7 +203,7 @@ _Neo3NeoXBridgeService_service = new WeakMap(), _Neo3NeoXBridgeService_instances
     return __awaiter(this, void 0, void 0, function* () {
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.url);
         const erc20Contract = new ethers_1.ethers.Contract(params.token.hash, bs_ethereum_1.ERC20_ABI, provider);
-        const allowance = yield erc20Contract.allowance(params.account.address, this.BRIDGE_SCRIPT_HASH);
+        const allowance = yield erc20Contract.allowance(params.account.address, Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH);
         const allowanceNumber = blockchain_service_1.BSBigNumberHelper.fromDecimals(allowance.toString(), BSNeoXConstants_1.BSNeoXConstants.NEO_TOKEN.decimals);
         // We are using 0 as the decimals because the NEO token in Neo3 has 0 decimals
         const fixedAmount = blockchain_service_1.BSBigNumberHelper.format(params.amount, { decimals: 0 });
@@ -205,7 +211,7 @@ _Neo3NeoXBridgeService_service = new WeakMap(), _Neo3NeoXBridgeService_instances
             return null;
         }
         const amount = ethers_1.ethers.utils.parseUnits(fixedAmount, params.token.decimals);
-        const populatedApproveTransaction = yield erc20Contract.populateTransaction.approve(this.BRIDGE_SCRIPT_HASH, amount);
-        return populatedApproveTransaction;
+        return yield erc20Contract.populateTransaction.approve(Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH, amount);
     });
 };
+Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH = '0x1212000000000000000000000000000000000004';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neox",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -16,8 +16,8 @@
     "axios": "1.8.2",
     "ethers": "5.7.2",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.19.2",
-    "@cityofzion/bs-ethereum": "2.12.7"
+    "@cityofzion/blockchain-service": "1.20.0",
+    "@cityofzion/bs-ethereum": "2.13.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.29.9",
@@ -29,7 +29,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"
   },
   "scripts": {