@cityofzion/bs-neox 3.1.2 → 3.1.4

package/dist/BSNeoX.d.ts

@@ -1,12 +1,13 @@
 import { BSEthereum } from '@cityofzion/bs-ethereum';
-import { type INeo3NeoXBridgeService, type TBSNetwork, type TGetLedgerTransport, type TTransactionDefault, type TTransferParams } from '@cityofzion/blockchain-service';
-import type { IBSNeoX, TBSNeoXNetworkId, TSendTransactionParams, TSendTransactionResponse } from './types';
-export declare class BSNeoX<N extends string = string> extends BSEthereum<N, TBSNeoXNetworkId> implements IBSNeoX<N> {
-    neo3NeoXBridgeService: INeo3NeoXBridgeService<N>;
+import { type TBSNetwork, type TGetLedgerTransport, type TTransactionDefault, type TTransferParams } from '@cityofzion/blockchain-service';
+import { Neo3NeoXBridgeService } from './services/neo3-neox-bridge/Neo3NeoXBridgeService';
+import type { IBSNeoX, TBSNeoXName, TBSNeoXNetworkId, TSendTransactionParams, TSendTransactionResponse } from './types';
+export declare class BSNeoX extends BSEthereum<TBSNeoXName, TBSNeoXNetworkId> implements IBSNeoX {
+    neo3NeoXBridgeService: Neo3NeoXBridgeService;
     readonly defaultNetwork: TBSNetwork<TBSNeoXNetworkId>;
     readonly availableNetworks: TBSNetwork<TBSNeoXNetworkId>[];
-    constructor(name: N, network?: TBSNetwork<TBSNeoXNetworkId>, getLedgerTransport?: TGetLedgerTransport<N>);
+    constructor(network?: TBSNetwork<TBSNeoXNetworkId>, getLedgerTransport?: TGetLedgerTransport<TBSNeoXName>);
+    _sendTransaction({ signer, gasPrice, params }: TSendTransactionParams): Promise<TSendTransactionResponse>;
     setNetwork(network: TBSNetwork<TBSNeoXNetworkId>): void;
-    sendTransaction({ signer, gasPrice, params }: TSendTransactionParams): Promise<TSendTransactionResponse>;
-    transfer({ senderAccount, intents }: TTransferParams<N>): Promise<TTransactionDefault<N>[]>;
+    transfer({ senderAccount, intents }: TTransferParams<TBSNeoXName>): Promise<TTransactionDefault[]>;
 }

package/dist/BSNeoX.js

@@ -22,33 +22,15 @@ const viem_1 = require("viem");
 const BlockscoutFullTransactionsDataService_1 = require("./services/full-transactions-data/BlockscoutFullTransactionsDataService");
 const BSNeoXHelper_1 = require("./helpers/BSNeoXHelper");
 class BSNeoX extends bs_ethereum_1.BSEthereum {
-    constructor(name, network, getLedgerTransport) {
-        super(name, undefined, undefined, getLedgerTransport);
+    constructor(network, getLedgerTransport) {
+        super('neox', undefined, getLedgerTransport);
         this.nativeTokens = [BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET];
         this.feeToken = BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET;
         this.availableNetworks = BSNeoXConstants_1.BSNeoXConstants.ALL_NETWORKS;
         this.defaultNetwork = BSNeoXConstants_1.BSNeoXConstants.MAINNET_NETWORK;
         this.setNetwork(network || this.defaultNetwork);
     }
-    setNetwork(network) {
-        const networkUrls = BSNeoXConstants_1.BSNeoXConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
-        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, networkUrls);
-        if (!isValidNetwork) {
-            throw new blockchain_service_1.BSError(`Network with id ${network.id} is not available for ${this.name}`, 'INVALID_NETWORK');
-        }
-        this.network = network;
-        this.networkUrls = networkUrls;
-        this.tokens = [BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET, BSNeoXHelper_1.BSNeoXHelper.getNeoToken(this.network)];
-        this.nftDataService = new GhostMarketNDSNeoX_1.GhostMarketNDSNeoX(this);
-        this.explorerService = new BlockscoutESNeoX_1.BlockscoutESNeoX(this);
-        this.exchangeDataService = new FlamingoForthewinEDSNeoX_1.FlamingoForthewinEDSNeoX(this);
-        this.neo3NeoXBridgeService = new Neo3NeoXBridgeService_1.Neo3NeoXBridgeService(this);
-        this.blockchainDataService = new BlockscoutBDSNeoX_1.BlockscoutBDSNeoX(this);
-        this.tokenService = new bs_ethereum_1.TokenServiceEthereum();
-        this.walletConnectService = new WalletConnectServiceNeoX_1.WalletConnectServiceNeoX(this);
-        this.fullTransactionsDataService = new BlockscoutFullTransactionsDataService_1.BlockscoutFullTransactionsDataService(this);
-    }
-    async sendTransaction({ signer, gasPrice, params }) {
+    async _sendTransaction({ signer, gasPrice, params }) {
         const chainId = parseInt(this.network.id);
         if (isNaN(chainId)) {
             throw new Error('Invalid chainId');
@@ -130,27 +112,42 @@ class BSNeoX extends bs_ethereum_1.BSEthereum {
             throw secondTransactionError || new Error('Transaction error');
         return { transactionHash, fee };
     }
+    setNetwork(network) {
+        const networkUrls = BSNeoXConstants_1.BSNeoXConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
+        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, networkUrls);
+        if (!isValidNetwork) {
+            throw new blockchain_service_1.BSError(`Network with id ${network.id} is not available for ${this.name}`, 'INVALID_NETWORK');
+        }
+        this.network = network;
+        this.networkUrls = networkUrls;
+        this.tokens = [BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET, BSNeoXHelper_1.BSNeoXHelper.getNeoToken(this.network)];
+        this.nftDataService = new GhostMarketNDSNeoX_1.GhostMarketNDSNeoX(this);
+        this.explorerService = new BlockscoutESNeoX_1.BlockscoutESNeoX(this);
+        this.exchangeDataService = new FlamingoForthewinEDSNeoX_1.FlamingoForthewinEDSNeoX(this);
+        this.neo3NeoXBridgeService = new Neo3NeoXBridgeService_1.Neo3NeoXBridgeService(this);
+        this.blockchainDataService = new BlockscoutBDSNeoX_1.BlockscoutBDSNeoX(this);
+        this.tokenService = new bs_ethereum_1.TokenServiceEthereum(this);
+        this.walletConnectService = new WalletConnectServiceNeoX_1.WalletConnectServiceNeoX(this);
+        this.fullTransactionsDataService = new BlockscoutFullTransactionsDataService_1.BlockscoutFullTransactionsDataService(this);
+    }
     async transfer({ senderAccount, intents }) {
-        const signer = await this.generateSigner(senderAccount);
+        const signer = await this._generateSigner(senderAccount);
         const { address } = senderAccount;
         const addressUrl = this.explorerService.buildAddressUrl(address);
-        const nativeTokenHash = BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET.hash;
         const transactions = [];
         let error;
         for (const intent of intents) {
             try {
                 const { transactionParams, gasPrice } = await this._buildTransferParams(intent);
-                const { transactionHash, fee } = await this.sendTransaction({ signer, gasPrice, params: transactionParams });
+                const { transactionHash, fee } = await this._sendTransaction({ signer, gasPrice, params: transactionParams });
                 if (transactionHash) {
                     const { receiverAddress, token } = intent;
                     const tokenHash = token.hash;
-                    const isNativeToken = this.tokenService.predicateByHash(nativeTokenHash, tokenHash);
                     transactions.push({
                         txId: transactionHash,
                         txIdUrl: this.explorerService.buildTransactionUrl(transactionHash),
                         date: new Date().toJSON(),
                         networkFeeAmount: fee,
-                        type: 'default',
                         view: 'default',
                         events: [
                             {
@@ -161,7 +158,6 @@ class BSNeoX extends bs_ethereum_1.BSEthereum {
                                 fromUrl: addressUrl,
                                 to: receiverAddress,
                                 toUrl: this.explorerService.buildAddressUrl(receiverAddress),
-                                tokenType: isNativeToken ? 'native' : 'erc-20',
                                 tokenUrl: this.explorerService.buildContractUrl(tokenHash),
                                 token,
                             },

package/dist/constants/BSNeoXConstants.js

@@ -10,7 +10,7 @@ BSNeoXConstants.NATIVE_ASSET = {
     symbol: 'GAS',
     name: 'GAS',
     decimals: 18,
-    hash: '0x',
+    hash: '-',
 };
 BSNeoXConstants.ANTI_MEV_RPC_LIST_BY_NETWORK_ID = {
     '47763': ['https://mainnet-5.rpc.banelabs.org'],

package/dist/helpers/BSNeoXHelper.d.ts

@@ -1,7 +1,6 @@
 import { TBSNetwork } from '@cityofzion/blockchain-service';
 import type { TBSNeoXNetworkId } from '../types';
 export declare class BSNeoXHelper {
-    static isMainnetNetwork(network: TBSNetwork<TBSNeoXNetworkId>): boolean;
     static getNeoToken(network: TBSNetwork<TBSNeoXNetworkId>): {
         name: string;
         symbol: string;

package/dist/helpers/BSNeoXHelper.js

@@ -2,11 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeoXHelper = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const BSNeoXConstants_1 = require("../constants/BSNeoXConstants");
 class BSNeoXHelper {
-    static isMainnetNetwork(network) {
-        return network.id === BSNeoXConstants_1.BSNeoXConstants.MAINNET_NETWORK.id && network.type === 'mainnet';
-    }
     static getNeoToken(network) {
         if (network.type === 'custom') {
             throw new blockchain_service_1.BSError('Invalid network', 'INVALID_NETWORK');

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

@@ -1,15 +1,15 @@
 import { type TBalanceResponse, type TBSNetwork, type TBSToken, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TContractResponse, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import axios from 'axios';
 import { RpcBDSEthereum } from '@cityofzion/bs-ethereum';
-import type { IBSNeoX, TBSNeoXNetworkId } from '../../types';
-export declare class BlockscoutBDSNeoX<N extends string> extends RpcBDSEthereum<N, TBSNeoXNetworkId, IBSNeoX<N>> {
+import type { IBSNeoX, TBSNeoXName, TBSNeoXNetworkId } from '../../types';
+export declare class BlockscoutBDSNeoX extends RpcBDSEthereum<TBSNeoXName, TBSNeoXNetworkId, IBSNeoX> {
     #private;
     static readonly BASE_URL_BY_CHAIN_ID: Partial<Record<TBSNeoXNetworkId, string>>;
     static getClient(network: TBSNetwork<TBSNeoXNetworkId>): axios.AxiosInstance;
     readonly maxTimeToConfirmTransactionInMs: number;
-    constructor(service: IBSNeoX<N>);
-    getTransaction(txid: string): Promise<TTransactionDefault<N>>;
-    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    constructor(service: IBSNeoX);
+    getTransaction(txid: string): Promise<TTransactionDefault>;
+    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     getContract(contractHash: string): Promise<TContractResponse>;
     getTokenInfo(tokenHash: string): Promise<TBSToken>;
     getBalance(address: string): Promise<TBalanceResponse[]>;

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

@@ -7,7 +7,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BlockscoutBDSNeoX_instances, _a, _BlockscoutBDSNeoX_apiInstance, _BlockscoutBDSNeoX_api_get, _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction;
+var _BlockscoutBDSNeoX_instances, _a, _BlockscoutBDSNeoX_apiInstance, _BlockscoutBDSNeoX_api_get;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockscoutBDSNeoX = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -15,9 +15,6 @@ const axios_1 = __importDefault(require("axios"));
 const ethers_1 = require("ethers");
 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("../neo3-neox-bridge/Neo3NeoXBridgeService");
-const bs_neo3_1 = require("@cityofzion/bs-neo3");
 class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
     static getClient(network) {
         const baseURL = _a.BASE_URL_BY_CHAIN_ID[network.id];
@@ -37,7 +34,6 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
             throw new Error('Transaction not found');
         }
         const nativeToken = BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET;
-        const to = response.to?.hash;
         const events = [];
         const hasNativeTokenBeingTransferred = response.value !== '0';
         if (hasNativeTokenBeingTransferred) {
@@ -55,7 +51,6 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
                 fromUrl,
                 to,
                 toUrl,
-                tokenType: 'native',
                 tokenUrl: this._service.explorerService.buildContractUrl(nativeToken.hash),
                 token: nativeToken,
             });
@@ -86,7 +81,6 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
                         fromUrl,
                         to,
                         toUrl,
-                        tokenType: 'erc-20',
                         tokenUrl: this._service.explorerService.buildContractUrl(token.hash),
                         token,
                     });
@@ -103,15 +97,15 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
                         fromUrl,
                         to,
                         toUrl,
-                        tokenType: 'erc-721',
                         nft,
                     });
                 }
             });
             await Promise.allSettled(promises);
         }
+        const data = this._service.neo3NeoXBridgeService._getDataFromBlockscoutTransaction(response);
         const txId = response.hash;
-        let transaction = {
+        const transaction = {
             txId,
             txIdUrl: this._service.explorerService.buildTransactionUrl(txId),
             block: response.block,
@@ -119,16 +113,10 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
             networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(response.fee.value, this._service.feeToken.decimals), {
                 decimals: this._service.feeToken.decimals,
             }),
-            type: 'default',
             view: 'default',
             events,
+            data,
         };
-        if (to === Neo3NeoXBridgeService_1.Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH) {
-            const [bridgeNeo3NeoXData] = blockchain_service_1.BSUtilsHelper.tryCatch(() => __classPrivateFieldGet(this, _BlockscoutBDSNeoX_instances, "m", _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction).call(this, response));
-            if (bridgeNeo3NeoXData) {
-                transaction = { ...transaction, type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData };
-            }
-        }
         return transaction;
     }
     async getTransactionsByAddress(params) {
@@ -160,7 +148,6 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
                     fromUrl,
                     to,
                     toUrl,
-                    tokenType: 'native',
                     tokenUrl: this._service.explorerService.buildContractUrl(nativeToken.hash),
                     token: nativeToken,
                 });
@@ -189,7 +176,6 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
                         fromUrl,
                         to,
                         toUrl,
-                        tokenType: 'erc-20',
                         tokenUrl: this._service.explorerService.buildContractUrl(token.hash),
                         token,
                     });
@@ -201,8 +187,9 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
             if (events.length === 0) {
                 return;
             }
+            const data = this._service.neo3NeoXBridgeService._getDataFromBlockscoutTransaction(item);
             const txId = item.hash;
-            let transaction = {
+            const transaction = {
                 txId,
                 txIdUrl: this._service.explorerService.buildTransactionUrl(txId),
                 block: item.block,
@@ -210,17 +197,10 @@ class BlockscoutBDSNeoX extends bs_ethereum_1.RpcBDSEthereum {
                 networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(item.fee.value, this._service.feeToken.decimals), {
                     decimals: this._service.feeToken.decimals,
                 }),
-                type: 'default',
                 view: 'default',
                 events,
+                data,
             };
-            const hasBridgeNeo3NeoXEvent = events.some(event => event.to === Neo3NeoXBridgeService_1.Neo3NeoXBridgeService.BRIDGE_SCRIPT_HASH);
-            if (hasBridgeNeo3NeoXEvent) {
-                const [bridgeNeo3NeoXData] = blockchain_service_1.BSUtilsHelper.tryCatch(() => __classPrivateFieldGet(this, _BlockscoutBDSNeoX_instances, "m", _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction).call(this, item));
-                if (bridgeNeo3NeoXData) {
-                    transaction = { ...transaction, type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData };
-                }
-            }
             transactions.splice(index, 0, transaction);
         });
         await Promise.allSettled(promises);
@@ -337,29 +317,6 @@ _a = BlockscoutBDSNeoX, _BlockscoutBDSNeoX_apiInstance = new WeakMap(), _Blocksc
         return _a.getClient(this._service.network);
     }
     return __classPrivateFieldGet(this, _BlockscoutBDSNeoX_apiInstance, "f");
-}, _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction = function _BlockscoutBDSNeoX_getBridgeNeo3NeoXDataByBlockscoutTransaction(transactionResponse) {
-    const BridgeInterface = new ethers_1.ethers.utils.Interface(bridge_1.BRIDGE_ABI);
-    const input = BridgeInterface.parseTransaction({ data: transactionResponse.raw_input });
-    const { wallet } = bs_neo3_1.BSNeo3NeonJsSingletonHelper.getInstance();
-    const to = input.args._to;
-    const receiverAddress = wallet.getAddressFromScriptHash(to.startsWith('0x') ? to.slice(2) : to);
-    let tokenToUse;
-    let amountBn;
-    if (input.name === 'withdrawNative') {
-        tokenToUse = this._service.neo3NeoXBridgeService.gasToken;
-        amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(transactionResponse.value, tokenToUse.decimals).minus(Neo3NeoXBridgeService_1.Neo3NeoXBridgeService.BRIDGE_FEE);
-    }
-    else if (input.name === 'withdrawToken') {
-        tokenToUse = this._service.neo3NeoXBridgeService.neoToken;
-        amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(input.args._amount.toString(), tokenToUse.decimals);
-    }
-    if (!tokenToUse || !amountBn)
-        return undefined;
-    return {
-        tokenToUse,
-        receiverAddress,
-        amount: blockchain_service_1.BSBigNumberHelper.format(amountBn, { decimals: tokenToUse.decimals }),
-    };
 };
 BlockscoutBDSNeoX.BASE_URL_BY_CHAIN_ID = {
     '47763': `${blockchain_service_1.BSCommonConstants.COZ_API_URL}/api/neox/mainnet`,

package/dist/services/exchange-data/FlamingoForthewinEDSNeoX.d.ts

@@ -1,7 +1,7 @@
 import { FlamingoForthewinEDS, type TGetTokenPriceHistoryParams, type TGetTokenPricesParams, type TTokenPricesResponse } from '@cityofzion/blockchain-service';
-import type { IBSNeoX } from '../../types';
-export declare class FlamingoForthewinEDSNeoX<N extends string> extends FlamingoForthewinEDS<N> {
-    constructor(service: IBSNeoX<N>);
+import type { IBSNeoX, TBSNeoXName, TBSNeoXNetworkId } from '../../types';
+export declare class FlamingoForthewinEDSNeoX extends FlamingoForthewinEDS<TBSNeoXName, TBSNeoXNetworkId> {
+    constructor(service: IBSNeoX);
     getTokenPrices({ tokens }: TGetTokenPricesParams): Promise<TTokenPricesResponse[]>;
     getTokenPriceHistory(params: TGetTokenPriceHistoryParams): Promise<import("@cityofzion/blockchain-service").TTokenPricesHistoryResponse[]>;
 }

package/dist/services/exchange-data/FlamingoForthewinEDSNeoX.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlamingoForthewinEDSNeoX = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
-const BSNeoXHelper_1 = require("../../helpers/BSNeoXHelper");
 class FlamingoForthewinEDSNeoX extends blockchain_service_1.FlamingoForthewinEDS {
     constructor(service) {
         super(service);
     }
     async getTokenPrices({ tokens }) {
-        if (!BSNeoXHelper_1.BSNeoXHelper.isMainnetNetwork(this._service.network))
+        if (this._service.network.type !== 'mainnet')
             throw new Error('Exchange is only available on Neo X Mainnet');
         const gasToken = tokens.find(({ symbol }) => symbol === 'GAS');
         const neoToken = tokens.find(({ symbol }) => symbol === 'NEO');
@@ -19,7 +18,7 @@ class FlamingoForthewinEDSNeoX extends blockchain_service_1.FlamingoForthewinEDS
         });
     }
     async getTokenPriceHistory(params) {
-        if (!BSNeoXHelper_1.BSNeoXHelper.isMainnetNetwork(this._service.network))
+        if (this._service.network.type !== 'mainnet')
             throw new Error('Exchange is only available on Neo X Mainnet');
         const { symbol } = params.token;
         if (symbol !== 'GAS' && symbol !== 'NEO')

package/dist/services/explorer/BlockscoutESNeoX.d.ts

@@ -1,6 +1,6 @@
 import { BlockscoutESEthereum } from '@cityofzion/bs-ethereum';
-import type { IBSNeoX, TBSNeoXNetworkId } from '../../types';
-export declare class BlockscoutESNeoX<N extends string> extends BlockscoutESEthereum<N, TBSNeoXNetworkId> {
+import type { IBSNeoX, TBSNeoXName, TBSNeoXNetworkId } from '../../types';
+export declare class BlockscoutESNeoX extends BlockscoutESEthereum<TBSNeoXName, TBSNeoXNetworkId> {
     static readonly DEFAULT_BASE_URL_BY_NETWORK_ID: Record<TBSNeoXNetworkId, string>;
-    constructor(service: IBSNeoX<N>);
+    constructor(service: IBSNeoX);
 }

package/dist/services/full-transactions-data/BlockscoutFullTransactionsDataService.d.ts

@@ -1,12 +1,11 @@
 import { type IFullTransactionsDataService, type TExportFullTransactionsByAddressParams, type TGetFullTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import type { IBSNeoX, TBSNeoXNetworkId } from '../../types';
-export declare class BlockscoutFullTransactionsDataService<N extends string> implements IFullTransactionsDataService<N> {
+export declare class BlockscoutFullTransactionsDataService implements IFullTransactionsDataService {
     #private;
     static readonly SUPPORTED_NETWORKS_IDS: TBSNeoXNetworkId[];
     static readonly ERC721_STANDARDS: string[];
     static readonly ERC1155_STANDARDS: string[];
-    static readonly ERC20_STANDARDS: string[];
-    constructor(service: IBSNeoX<N>);
-    getFullTransactionsByAddress({ nextPageParams, ...params }: TGetFullTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    constructor(service: IBSNeoX);
+    getFullTransactionsByAddress({ nextPageParams, ...params }: TGetFullTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     exportFullTransactionsByAddress(params: TExportFullTransactionsByAddressParams): Promise<string>;
 }

package/dist/services/full-transactions-data/BlockscoutFullTransactionsDataService.js

@@ -48,7 +48,6 @@ class BlockscoutFullTransactionsDataService {
                 networkFeeAmount: networkFeeAmount
                     ? blockchain_service_1.BSBigNumberHelper.format(networkFeeAmount, { decimals: BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET.decimals })
                     : undefined,
-                type: 'default',
                 view: 'default',
                 events: [],
             };
@@ -57,7 +56,6 @@ class BlockscoutFullTransactionsDataService {
                 const standard = event.supportedStandards?.[0]?.toLowerCase() ?? '';
                 const isErc1155 = BlockscoutFullTransactionsDataService.ERC1155_STANDARDS.includes(standard);
                 const isErc721 = BlockscoutFullTransactionsDataService.ERC721_STANDARDS.includes(standard);
-                const isErc20 = BlockscoutFullTransactionsDataService.ERC20_STANDARDS.includes(standard);
                 const isNft = (isErc1155 || isErc721) && !!tokenHash;
                 const from = event.from ?? undefined;
                 const fromUrl = from ? __classPrivateFieldGet(this, _BlockscoutFullTransactionsDataService_service, "f").explorerService.buildAddressUrl(from) : undefined;
@@ -73,7 +71,6 @@ class BlockscoutFullTransactionsDataService {
                         fromUrl,
                         to,
                         toUrl,
-                        tokenType: isErc1155 ? 'erc-1155' : 'erc-721',
                         nft,
                     });
                     return;
@@ -89,7 +86,6 @@ class BlockscoutFullTransactionsDataService {
                     fromUrl,
                     to,
                     toUrl,
-                    tokenType: isErc20 ? 'erc-20' : 'generic',
                     tokenUrl: token ? __classPrivateFieldGet(this, _BlockscoutFullTransactionsDataService_service, "f").explorerService.buildContractUrl(token.hash) : undefined,
                     token,
                 });
@@ -101,11 +97,12 @@ class BlockscoutFullTransactionsDataService {
                         : __classPrivateFieldGet(this, _BlockscoutFullTransactionsDataService_service, "f").neo3NeoXBridgeService.neoToken;
                     newItem = {
                         ...newItem,
-                        type: 'bridgeNeo3NeoX',
                         data: {
-                            amount: blockchain_service_1.BSBigNumberHelper.format(bridgeData.amount, { decimals: tokenToUse.decimals }),
-                            tokenToUse,
-                            receiverAddress: bridgeData.receiverBridgeAddress,
+                            neo3NeoxBridge: {
+                                amount: blockchain_service_1.BSBigNumberHelper.format(bridgeData.amount, { decimals: tokenToUse.decimals }),
+                                tokenToUse,
+                                receiverAddress: bridgeData.receiverBridgeAddress,
+                            },
                         },
                     };
                 }
@@ -135,4 +132,3 @@ _BlockscoutFullTransactionsDataService_service = new WeakMap();
 BlockscoutFullTransactionsDataService.SUPPORTED_NETWORKS_IDS = ['47763', '12227332'];
 BlockscoutFullTransactionsDataService.ERC721_STANDARDS = ['erc721', 'erc-721'];
 BlockscoutFullTransactionsDataService.ERC1155_STANDARDS = ['erc1155', 'erc-1155'];
-BlockscoutFullTransactionsDataService.ERC20_STANDARDS = ['erc20', 'erc-20'];

package/dist/services/neo3-neox-bridge/Neo3NeoXBridgeService.d.ts

@@ -1,17 +1,19 @@
-import { INeo3NeoXBridgeService, TBridgeToken, TNeo3NeoXBridgeServiceBridgeParam, TNeo3NeoXBridgeServiceConstants, TNeo3NeoXBridgeServiceGetApprovalParam, TNeo3NeoXBridgeServiceGetNonceParams, TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams } from '@cityofzion/blockchain-service';
-import type { IBSNeoX } from '../../types';
-export declare class Neo3NeoXBridgeService<N extends string> implements INeo3NeoXBridgeService<N> {
+import { INeo3NeoXBridgeService, TBridgeToken, TNeo3NeoXBridgeServiceBridgeParam, TNeo3NeoXBridgeServiceConstants, TNeo3NeoXBridgeServiceGetApprovalParam, TNeo3NeoXBridgeServiceGetNonceParams, TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams, type TNeo3NeoXBridgeTransactionData, type TTransaction } from '@cityofzion/blockchain-service';
+import type { IBSNeoX, TBSNeoXName, TBlockscoutBDSNeoXTransactionApiResponse } from '../../types';
+export declare class Neo3NeoXBridgeService implements INeo3NeoXBridgeService<TBSNeoXName> {
     #private;
     static readonly BRIDGE_SCRIPT_HASH = "0x1212000000000000000000000000000000000004";
     static readonly BRIDGE_FEE = 0.1;
     static readonly BRIDGE_BASE_CONFIRMATION_URL = "https://xexplorer.neo.org:8877/api/v1/transactions/deposits";
-    readonly gasToken: TBridgeToken<N>;
-    readonly neoToken: TBridgeToken<N>;
-    constructor(service: IBSNeoX<N>);
-    getBridgeConstants(token: TBridgeToken<N>): Promise<TNeo3NeoXBridgeServiceConstants>;
-    getApprovalFee(params: TNeo3NeoXBridgeServiceGetApprovalParam<N>): Promise<string>;
-    bridge(params: TNeo3NeoXBridgeServiceBridgeParam<N>): Promise<string>;
-    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<N>): Promise<string>;
-    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<N>): Promise<string>;
-    getTokenByMultichainId(multichainId: string): TBridgeToken<N> | undefined;
+    readonly gasToken: TBridgeToken<TBSNeoXName>;
+    readonly neoToken: TBridgeToken<TBSNeoXName>;
+    constructor(service: IBSNeoX);
+    _getDataFromBlockscoutTransaction(response: TBlockscoutBDSNeoXTransactionApiResponse): TNeo3NeoXBridgeTransactionData<TBSNeoXName> | undefined;
+    getBridgeConstants(token: TBridgeToken<TBSNeoXName>): Promise<TNeo3NeoXBridgeServiceConstants>;
+    getApprovalFee(params: TNeo3NeoXBridgeServiceGetApprovalParam<TBSNeoXName>): Promise<string>;
+    bridge(params: TNeo3NeoXBridgeServiceBridgeParam<TBSNeoXName>): Promise<string>;
+    getNonce(params: TNeo3NeoXBridgeServiceGetNonceParams<TBSNeoXName>): Promise<string>;
+    getTransactionHashByNonce(params: TNeo3NeoXBridgeServiceGetTransactionHashByNonceParams<TBSNeoXName>): Promise<string>;
+    getTokenByMultichainId(multichainId: string): TBridgeToken<TBSNeoXName> | undefined;
+    getTransactionData(transaction: TTransaction): TNeo3NeoXBridgeTransactionData<TBSNeoXName> | undefined;
 }

package/dist/services/neo3-neox-bridge/Neo3NeoXBridgeService.js

@@ -23,8 +23,8 @@ const bridge_1 = require("../../assets/abis/bridge");
 const bs_ethereum_1 = require("@cityofzion/bs-ethereum");
 const axios_1 = __importDefault(require("axios"));
 const BlockscoutBDSNeoX_1 = require("../blockchain-data/BlockscoutBDSNeoX");
-const BSNeoXHelper_1 = require("../../helpers/BSNeoXHelper");
 const bs_neo3_1 = require("@cityofzion/bs-neo3");
+const BSNeoXHelper_1 = require("../../helpers/BSNeoXHelper");
 class Neo3NeoXBridgeService {
     constructor(service) {
         _Neo3NeoXBridgeService_instances.add(this);
@@ -34,6 +34,35 @@ class Neo3NeoXBridgeService {
         this.gasToken = { ...BSNeoXConstants_1.BSNeoXConstants.NATIVE_ASSET, blockchain: service.name, multichainId: 'gas' };
         this.neoToken = { ...neoToken, blockchain: service.name, multichainId: 'neo' };
     }
+    _getDataFromBlockscoutTransaction(response) {
+        if (response.to.hash.toLowerCase() !== _a.BRIDGE_SCRIPT_HASH.toLowerCase()) {
+            return undefined;
+        }
+        const BridgeInterface = new ethers_1.ethers.utils.Interface(bridge_1.BRIDGE_ABI);
+        const input = BridgeInterface.parseTransaction({ data: response.raw_input });
+        const { wallet } = bs_neo3_1.BSNeo3NeonJsSingletonHelper.getInstance();
+        const to = input.args._to;
+        const receiverAddress = wallet.getAddressFromScriptHash(to.startsWith('0x') ? to.slice(2) : to);
+        let tokenToUse;
+        let amountBn;
+        if (input.name === 'withdrawNative') {
+            tokenToUse = this.gasToken;
+            amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(response.value, tokenToUse.decimals).minus(_a.BRIDGE_FEE);
+        }
+        else if (input.name === 'withdrawToken') {
+            tokenToUse = this.neoToken;
+            amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(input.args._amount.toString(), tokenToUse.decimals);
+        }
+        if (!tokenToUse || !amountBn)
+            return undefined;
+        return {
+            neo3NeoxBridge: {
+                tokenToUse,
+                receiverAddress,
+                amount: blockchain_service_1.BSBigNumberHelper.format(amountBn, { decimals: tokenToUse.decimals }),
+            },
+        };
+    }
     async getBridgeConstants(token) {
         try {
             const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.url);
@@ -72,7 +101,7 @@ class Neo3NeoXBridgeService {
             if (isNaN(chainId)) {
                 throw new Error('Invalid chainId');
             }
-            const signer = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").generateSigner(params.account);
+            const signer = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f")._generateSigner(params.account);
             const nonce = await signer.getTransactionCount('pending');
             if (isNaN(nonce)) {
                 throw new Error('Invalid nonce');
@@ -90,10 +119,10 @@ class Neo3NeoXBridgeService {
         }
     }
     async bridge(params) {
-        if (!BSNeoXHelper_1.BSNeoXHelper.isMainnetNetwork(__classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network)) {
+        if (__classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").network.type !== 'mainnet') {
             throw new blockchain_service_1.BSError('Bridging to Neo3 is only supported on mainnet', 'UNSUPPORTED_NETWORK');
         }
-        const signer = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").generateSigner(params.account);
+        const signer = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f")._generateSigner(params.account);
         const bridgeContract = new ethers_1.ethers.Contract(_a.BRIDGE_SCRIPT_HASH, bridge_1.BRIDGE_ABI);
         const { wallet } = bs_neo3_1.BSNeo3NeonJsSingletonHelper.getInstance();
         const to = `0x${wallet.getScriptHashFromAddress(params.receiverAddress)}`;
@@ -110,7 +139,7 @@ class Neo3NeoXBridgeService {
         else {
             const approveTransactionParam = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_instances, "m", _Neo3NeoXBridgeService_buildApproveTransactionParam).call(this, params);
             if (approveTransactionParam) {
-                const { transactionHash } = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").sendTransaction({
+                const { transactionHash } = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f")._sendTransaction({
                     signer,
                     gasPrice,
                     params: approveTransactionParam,
@@ -123,7 +152,7 @@ class Neo3NeoXBridgeService {
             const populatedTransactionParams = await bridgeContract.populateTransaction.withdrawToken(params.token.hash, to, amount);
             Object.assign(transactionParams, populatedTransactionParams, { value: bridgeFee });
         }
-        const { transactionHash } = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f").sendTransaction({ signer, gasPrice, params: transactionParams });
+        const { transactionHash } = await __classPrivateFieldGet(this, _Neo3NeoXBridgeService_service, "f")._sendTransaction({ signer, gasPrice, params: transactionParams });
         return transactionHash;
     }
     async getNonce(params) {
@@ -173,6 +202,9 @@ class Neo3NeoXBridgeService {
         const tokens = [this.gasToken, this.neoToken];
         return tokens.find(token => token.multichainId === multichainId);
     }
+    getTransactionData(transaction) {
+        return transaction.data?.neo3NeoxBridge ? transaction.data : undefined;
+    }
 }
 exports.Neo3NeoXBridgeService = Neo3NeoXBridgeService;
 _a = Neo3NeoXBridgeService, _Neo3NeoXBridgeService_service = new WeakMap(), _Neo3NeoXBridgeService_instances = new WeakSet(), _Neo3NeoXBridgeService_buildApproveTransactionParam = async function _Neo3NeoXBridgeService_buildApproveTransactionParam(params) {

package/dist/services/nft-data/GhostMarketNDSNeoX.d.ts

@@ -1,7 +1,7 @@
 import { GhostMarketNDSEthereum } from '@cityofzion/bs-ethereum';
-import type { IBSNeoX, TBSNeoXNetworkId } from '../../types';
-export declare class GhostMarketNDSNeoX<N extends string> extends GhostMarketNDSEthereum<N, TBSNeoXNetworkId> {
+import type { IBSNeoX, TBSNeoXName, TBSNeoXNetworkId } from '../../types';
+export declare class GhostMarketNDSNeoX extends GhostMarketNDSEthereum<TBSNeoXName, TBSNeoXNetworkId> {
     static readonly CHAIN_BY_NETWORK_ID: Partial<Record<TBSNeoXNetworkId, string>>;
-    constructor(service: IBSNeoX<N>);
+    constructor(service: IBSNeoX);
     getChain(): string;
 }

package/dist/services/wallet-connect/WalletConnectServiceNeoX.d.ts

@@ -1,8 +1,9 @@
-import { type IWalletConnectService, type TBSNetworkId, type TWalletConnectServiceRequestMethodParams, type THexString } from '@cityofzion/blockchain-service';
-import { IBSEthereum, WalletConnectServiceEthereum } from '@cityofzion/bs-ethereum';
-export declare class WalletConnectServiceNeoX<N extends string, A extends TBSNetworkId> extends WalletConnectServiceEthereum<N, A> implements IWalletConnectService<N> {
-    constructor(service: IBSEthereum<N, A>);
-    eth_getTransactionCount(args: TWalletConnectServiceRequestMethodParams<N>): Promise<number>;
-    eth_getCachedTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<THexString>;
-    eth_sendTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;
+import { type TWalletConnectServiceRequestMethodParams, type THexString } from '@cityofzion/blockchain-service';
+import { WalletConnectServiceEthereum } from '@cityofzion/bs-ethereum';
+import type { IBSNeoX, TBSNeoXName, TBSNeoXNetworkId } from '../../types';
+export declare class WalletConnectServiceNeoX extends WalletConnectServiceEthereum<TBSNeoXName, TBSNeoXNetworkId> {
+    constructor(service: IBSNeoX);
+    eth_getTransactionCount(args: TWalletConnectServiceRequestMethodParams<TBSNeoXName>): Promise<number>;
+    eth_getCachedTransaction(args: TWalletConnectServiceRequestMethodParams<TBSNeoXName>): Promise<THexString>;
+    eth_sendTransaction(args: TWalletConnectServiceRequestMethodParams<TBSNeoXName>): Promise<string>;
 }

package/dist/services/wallet-connect/WalletConnectServiceNeoX.js

@@ -15,14 +15,14 @@ class WalletConnectServiceNeoX extends bs_ethereum_1.WalletConnectServiceEthereu
         this.supportedMethods.push('eth_getTransactionCount', 'eth_getCachedTransaction');
     }
     async eth_getTransactionCount(args) {
-        const wallet = await this._service.generateSigner(args.account);
+        const wallet = await this._service._generateSigner(args.account);
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(this._service.network.url);
         const connectedWallet = wallet.connect(provider);
         return await connectedWallet.getTransactionCount('pending');
     }
     async eth_getCachedTransaction(args) {
         const url = this._service.network.url;
-        const wallet = await this._service.generateSigner(args.account);
+        const wallet = await this._service._generateSigner(args.account);
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(url);
         const connectedWallet = wallet.connect(provider);
         const nonce = args.params[0];

package/dist/types.d.ts

@@ -1,9 +1,12 @@
 import type { IBSWithNeo3NeoXBridge, TBSNetworkId } from '@cityofzion/blockchain-service';
 import { ERC20_ABI, IBSEthereum } from '@cityofzion/bs-ethereum';
 import { ethers, Signer } from 'ethers';
+import type { Neo3NeoXBridgeService } from './services/neo3-neox-bridge/Neo3NeoXBridgeService';
 export type TBSNeoXNetworkId = TBSNetworkId<'47763' | '12227332'>;
-export interface IBSNeoX<N extends string = string> extends IBSEthereum<N, TBSNeoXNetworkId>, IBSWithNeo3NeoXBridge<N> {
-    sendTransaction(params: TSendTransactionParams): Promise<TSendTransactionResponse>;
+export type TBSNeoXName = 'neox';
+export interface IBSNeoX extends IBSEthereum<TBSNeoXName, TBSNeoXNetworkId>, IBSWithNeo3NeoXBridge<TBSNeoXName> {
+    neo3NeoXBridgeService: Neo3NeoXBridgeService;
+    _sendTransaction(params: TSendTransactionParams): Promise<TSendTransactionResponse>;
 }
 export type TBlockscoutBDSNeoXTransactionApiResponse = {
     fee: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-neox",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "repository": "https://github.com/CityOfZion/blockchain-services",
   "license": "GPL-3.0-only",
   "author": "Coz",
@@ -15,9 +15,9 @@
     "ethers": "~5.7.2",
     "neox-tpke": "~1.0.5",
     "viem": "~2.38.5",
-    "@cityofzion/bs-neo3": "3.1.2",
-    "@cityofzion/bs-ethereum": "3.1.2",
-    "@cityofzion/blockchain-service": "3.1.2"
+    "@cityofzion/blockchain-service": "3.1.4",
+    "@cityofzion/bs-ethereum": "3.1.4",
+    "@cityofzion/bs-neo3": "3.1.4"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "~6.32.0",
@@ -29,7 +29,7 @@
     "vitest": "~4.0.18"
   },
   "scripts": {
-    "build": "rm -rf ./dist && npm run typecheck && tsc --project tsconfig.build.json",
+    "build": "rm -rf ./dist && rm -f *.tgz && npm run typecheck && tsc --project tsconfig.build.json",
     "format": "eslint --fix",
     "lint": "eslint .",
     "package": "npm run build && npm pack",