@cityofzion/bs-neo3 3.1.2 → 3.1.4

package/dist/BSNeo3.d.ts

@@ -1,37 +1,38 @@
-import { type IBlockchainDataService, type IClaimDataService, type IExchangeDataService, type IExplorerService, type INeo3NeoXBridgeService, type INftDataService, type ITokenService, type IWalletConnectService, type TBSAccount, type TBSNetwork, type TBSToken, type TGetLedgerTransport, type TPingNetworkResponse, type TTransferParams, type IFullTransactionsDataService, type TTransactionDefault } from '@cityofzion/blockchain-service';
+import { type IBlockchainDataService, type IExchangeDataService, type IExplorerService, type INftDataService, type ITokenService, type IWalletConnectService, type TBSAccount, type TBSNetwork, type TBSToken, type TGetLedgerTransport, type TPingNetworkResponse, type TTransferParams, type IFullTransactionsDataService, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import { NeonDappKitLedgerServiceNeo3 } from './services/ledger/NeonDappKitLedgerServiceNeo3';
-import type { IBSNeo3, IVoteService, TBSNeo3NetworkId } from './types';
+import { Neo3NeoXBridgeService } from './services/neo3-neox-bridge/Neo3NeoXBridgeService';
+import { VoteServiceNeo3 } from './services/vote/VoteServiceNeo3';
+import type { IBSNeo3, TBSNeo3Name, TBSNeo3NetworkId } from './types';
 import { api, wallet } from './helpers/BSNeo3NeonJsSingletonHelper';
-export declare class BSNeo3<N extends string = string> implements IBSNeo3<N> {
+import { ClaimServiceNeo3 } from './services/claim/ClaimServiceNeo3';
+export declare class BSNeo3 implements IBSNeo3 {
     #private;
-    readonly name: N;
+    readonly name = "neo3";
     readonly bipDerivationPath: string;
     readonly isMultiTransferSupported = true;
     readonly isCustomNetworkSupported = true;
     tokens: TBSToken[];
     readonly nativeTokens: TBSToken[];
     readonly feeToken: TBSToken;
-    readonly claimToken: TBSToken;
-    readonly burnToken: TBSToken;
     network: TBSNetwork<TBSNeo3NetworkId>;
     networkUrls: string[];
     readonly defaultNetwork: TBSNetwork<TBSNeo3NetworkId>;
     readonly availableNetworks: TBSNetwork<TBSNeo3NetworkId>[];
-    blockchainDataService: IBlockchainDataService<N>;
+    blockchainDataService: IBlockchainDataService;
     nftDataService: INftDataService;
-    ledgerService: NeonDappKitLedgerServiceNeo3<N>;
+    ledgerService: NeonDappKitLedgerServiceNeo3;
     exchangeDataService: IExchangeDataService;
     explorerService: IExplorerService;
-    voteService: IVoteService<N>;
-    neo3NeoXBridgeService: INeo3NeoXBridgeService<N>;
+    voteService: VoteServiceNeo3;
+    neo3NeoXBridgeService: Neo3NeoXBridgeService;
     tokenService: ITokenService;
-    claimDataService: IClaimDataService;
-    walletConnectService: IWalletConnectService<N>;
-    fullTransactionsDataService: IFullTransactionsDataService<N>;
-    constructor(name: N, network?: TBSNetwork<TBSNeo3NetworkId>, getLedgerTransport?: TGetLedgerTransport<N>);
+    claimService: ClaimServiceNeo3;
+    walletConnectService: IWalletConnectService<TBSNeo3Name>;
+    fullTransactionsDataService: IFullTransactionsDataService;
+    constructor(network?: TBSNetwork<TBSNeo3NetworkId>, getLedgerTransport?: TGetLedgerTransport<TBSNeo3Name>);
     setNetwork(network: TBSNetwork<TBSNeo3NetworkId>): void;
     pingNetwork(url: string): Promise<TPingNetworkResponse>;
-    generateSigningCallback(account: TBSAccount<N>): Promise<{
+    _generateSigningCallback(account: TBSAccount<TBSNeo3Name>): Promise<{
         neonJsAccount: wallet.Account;
         signingCallback: api.SigningFunction;
     }>;
@@ -39,14 +40,12 @@ export declare class BSNeo3<N extends string = string> implements IBSNeo3<N> {
     validateEncrypted(encryptedKey: string): boolean;
     validateKey(key: string): boolean;
     validateNameServiceDomainFormat(domainName: string): boolean;
-    generateAccountFromMnemonic(mnemonic: string[] | string, index: number): Promise<TBSAccount<N>>;
-    generateAccountFromPublicKey(publicKey: string): Promise<TBSAccount<N>>;
-    generateAccountFromKey(key: string): Promise<TBSAccount<N>>;
-    decrypt(encryptedKey: string, password: string): Promise<TBSAccount<N>>;
+    generateAccountFromMnemonic(mnemonic: string[] | string, index: number): Promise<TBSAccount<TBSNeo3Name>>;
+    generateAccountFromPublicKey(publicKey: string): Promise<TBSAccount<TBSNeo3Name>>;
+    generateAccountFromKey(key: string): Promise<TBSAccount<TBSNeo3Name>>;
+    decrypt(encryptedKey: string, password: string): Promise<TBSAccount<TBSNeo3Name>>;
     encrypt(key: string, password: string): Promise<string>;
-    calculateTransferFee(params: TTransferParams<N>): Promise<string>;
-    transfer(params: TTransferParams<N>): Promise<TTransactionDefault<N>[]>;
-    calculateClaimFee(senderAccount: TBSAccount<N>): Promise<string>;
-    claim(senderAccount: TBSAccount<N>): Promise<TTransactionDefault<N>>;
+    calculateTransferFee(params: TTransferParams<TBSNeo3Name>): Promise<string>;
+    transfer(params: TTransferParams<TBSNeo3Name>): Promise<TTransactionDefault[]>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
 }

package/dist/BSNeo3.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 _BSNeo3_instances, _BSNeo3_setTokens, _BSNeo3_buildTransferInvocation, _BSNeo3_buildClaimParams;
+var _BSNeo3_instances, _BSNeo3_setTokens, _BSNeo3_buildTransferInvocation;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -19,26 +19,24 @@ const NeonDappKitLedgerServiceNeo3_1 = require("./services/ledger/NeonDappKitLed
 const GhostMarketNDSNeo3_1 = require("./services/nft-data/GhostMarketNDSNeo3");
 const BSNeo3Constants_1 = require("./constants/BSNeo3Constants");
 const Neo3NeoXBridgeService_1 = require("./services/neo3-neox-bridge/Neo3NeoXBridgeService");
-const DoraVoteServiceNeo3_1 = require("./services/vote/DoraVoteServiceNeo3");
+const VoteServiceNeo3_1 = require("./services/vote/VoteServiceNeo3");
 const TokenServiceNeo3_1 = require("./services/token/TokenServiceNeo3");
-const RpcCDSNeo3_1 = require("./services/chaim-data/RpcCDSNeo3");
 const BSNeo3NeonJsSingletonHelper_1 = require("./helpers/BSNeo3NeonJsSingletonHelper");
 const BSNeo3NeonDappKitSingletonHelper_1 = require("./helpers/BSNeo3NeonDappKitSingletonHelper");
 const axios_1 = __importDefault(require("axios"));
 const WalletConnectServiceNeo3_1 = require("./services/wallet-connect/WalletConnectServiceNeo3");
 const DoraFullTransactionsDataServiceNeo3_1 = require("./services/full-transactions-data/DoraFullTransactionsDataServiceNeo3");
+const ClaimServiceNeo3_1 = require("./services/claim/ClaimServiceNeo3");
 class BSNeo3 {
-    constructor(name, network, getLedgerTransport) {
+    constructor(network, getLedgerTransport) {
         _BSNeo3_instances.add(this);
+        this.name = 'neo3';
         this.isMultiTransferSupported = true;
         this.isCustomNetworkSupported = true;
-        this.name = name;
         this.ledgerService = new NeonDappKitLedgerServiceNeo3_1.NeonDappKitLedgerServiceNeo3(this, getLedgerTransport);
         this.bipDerivationPath = BSNeo3Constants_1.BSNeo3Constants.DEFAULT_BIP_DERIVATION_PATH;
         this.nativeTokens = BSNeo3Constants_1.BSNeo3Constants.NATIVE_ASSETS;
         this.feeToken = BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN;
-        this.burnToken = BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN;
-        this.claimToken = BSNeo3Constants_1.BSNeo3Constants.GAS_TOKEN;
         this.availableNetworks = BSNeo3Constants_1.BSNeo3Constants.ALL_NETWORKS;
         this.defaultNetwork = BSNeo3Constants_1.BSNeo3Constants.MAINNET_NETWORK;
         this.setNetwork(network ?? this.defaultNetwork);
@@ -59,14 +57,14 @@ class BSNeo3 {
         __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_setTokens).call(this, network);
         this.network = network;
         this.networkUrls = networkUrls;
-        this.tokenService = new TokenServiceNeo3_1.TokenServiceNeo3();
+        this.tokenService = new TokenServiceNeo3_1.TokenServiceNeo3(this);
         this.nftDataService = new GhostMarketNDSNeo3_1.GhostMarketNDSNeo3(this);
         this.explorerService = new DoraESNeo3_1.DoraESNeo3(this);
-        this.voteService = new DoraVoteServiceNeo3_1.DoraVoteServiceNeo3(this);
+        this.voteService = new VoteServiceNeo3_1.VoteServiceNeo3(this);
         this.neo3NeoXBridgeService = new Neo3NeoXBridgeService_1.Neo3NeoXBridgeService(this);
         this.blockchainDataService = new DoraBDSNeo3_1.DoraBDSNeo3(this);
         this.exchangeDataService = new FlamingoForthewinEDSNeo3_1.FlamingoForthewinEDSNeo3(this);
-        this.claimDataService = new RpcCDSNeo3_1.RpcCDSNeo3(this);
+        this.claimService = new ClaimServiceNeo3_1.ClaimServiceNeo3(this);
         this.walletConnectService = new WalletConnectServiceNeo3_1.WalletConnectServiceNeo3(this);
         this.fullTransactionsDataService = new DoraFullTransactionsDataServiceNeo3_1.DoraFullTransactionsDataServiceNeo3(this);
     }
@@ -91,7 +89,7 @@ class BSNeo3 {
             height: response.data.result,
         };
     }
-    async generateSigningCallback(account) {
+    async _generateSigningCallback(account) {
         const { wallet, api } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
         const neonJsAccount = new wallet.Account(account.key);
         if (account.isHardware) {
@@ -171,7 +169,7 @@ class BSNeo3 {
         return await wallet.encrypt(key, password);
     }
     async calculateTransferFee(params) {
-        const { neonJsAccount } = await this.generateSigningCallback(params.senderAccount);
+        const { neonJsAccount } = await this._generateSigningCallback(params.senderAccount);
         const { NeonInvoker } = BSNeo3NeonDappKitSingletonHelper_1.BSNeo3NeonDappKitSingletonHelper.getInstance();
         const invoker = await NeonInvoker.init({
             rpcAddress: this.network.url,
@@ -186,19 +184,39 @@ class BSNeo3 {
     }
     async transfer(params) {
         const { senderAccount } = params;
-        const { neonJsAccount, signingCallback } = await this.generateSigningCallback(senderAccount);
+        const { neonJsAccount, signingCallback } = await this._generateSigningCallback(senderAccount);
         const { NeonInvoker } = BSNeo3NeonDappKitSingletonHelper_1.BSNeo3NeonDappKitSingletonHelper.getInstance();
+        // Verify if the transfer includes any NEO token, if so the chain will automatically claim the GAS for the sender
+        let data;
+        let claimEvent = undefined;
+        if (params.intents.some(intent => this.tokenService.predicateByHash(intent.token.hash, BSNeo3Constants_1.BSNeo3Constants.NEO_TOKEN))) {
+            claimEvent = await this.claimService._buildTransactionEvent(senderAccount.address);
+            data = { isClaim: true };
+        }
+        const { address } = senderAccount;
+        const invocations = await __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_buildTransferInvocation).call(this, params, neonJsAccount);
+        const invocationMulti = { invocations, signers: [] };
         const invoker = await NeonInvoker.init({
             rpcAddress: this.network.url,
             account: neonJsAccount,
             signingCallback: signingCallback,
         });
-        const invocations = await __classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_buildTransferInvocation).call(this, params, neonJsAccount);
-        const cim = { invocations, signers: [] };
-        const fees = await invoker.calculateFee(cim);
-        const txId = await invoker.invokeFunction(cim);
-        const { address } = senderAccount;
-        const addressUrl = this.explorerService.buildAddressUrl(address);
+        const fees = await invoker.calculateFee(invocationMulti);
+        const txId = await invoker.invokeFunction(invocationMulti);
+        const events = params.intents.map(({ receiverAddress, amount, token }) => ({
+            eventType: 'token',
+            amount,
+            methodName: 'transfer',
+            from: address,
+            fromUrl: this.explorerService.buildAddressUrl(address),
+            to: receiverAddress,
+            toUrl: this.explorerService.buildAddressUrl(receiverAddress),
+            tokenUrl: this.explorerService.buildContractUrl(token.hash),
+            token,
+        }));
+        if (claimEvent) {
+            events.unshift(claimEvent);
+        }
         return [
             {
                 txId,
@@ -207,34 +225,12 @@ class BSNeo3 {
                 invocationCount: invocations.length,
                 networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(fees.networkFee, { decimals: this.feeToken.decimals }),
                 systemFeeAmount: blockchain_service_1.BSBigNumberHelper.format(fees.systemFee, { decimals: this.feeToken.decimals }),
-                type: 'default',
                 view: 'default',
-                events: params.intents.map(({ receiverAddress, amount, token }) => {
-                    const tokenHash = token.hash;
-                    return {
-                        eventType: 'token',
-                        amount,
-                        methodName: 'transfer',
-                        from: address,
-                        fromUrl: addressUrl,
-                        to: receiverAddress,
-                        toUrl: this.explorerService.buildAddressUrl(receiverAddress),
-                        tokenType: 'nep-17',
-                        tokenUrl: this.explorerService.buildContractUrl(tokenHash),
-                        token,
-                    };
-                }),
+                events,
+                data,
             },
         ];
     }
-    async calculateClaimFee(senderAccount) {
-        return this.calculateTransferFee(__classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_buildClaimParams).call(this, senderAccount));
-    }
-    async claim(senderAccount) {
-        const [transaction] = await this.transfer(__classPrivateFieldGet(this, _BSNeo3_instances, "m", _BSNeo3_buildClaimParams).call(this, senderAccount));
-        transaction.type = 'claim';
-        return transaction;
-    }
     async resolveNameServiceDomain(domainName) {
         const { NeonParser, NeonInvoker } = BSNeo3NeonDappKitSingletonHelper_1.BSNeo3NeonDappKitSingletonHelper.getInstance();
         const invoker = await NeonInvoker.init({ rpcAddress: this.network.url });
@@ -278,9 +274,4 @@ _BSNeo3_instances = new WeakSet(), _BSNeo3_setTokens = function _BSNeo3_setToken
         });
     }
     return invocations;
-}, _BSNeo3_buildClaimParams = function _BSNeo3_buildClaimParams(senderAccount) {
-    return {
-        senderAccount,
-        intents: [{ amount: '0', receiverAddress: senderAccount.address, token: this.burnToken }],
-    };
 };

package/dist/helpers/BSNeo3Helper.d.ts

@@ -2,6 +2,4 @@ import type { TBSNetwork } from '@cityofzion/blockchain-service';
 import type { TBSNeo3NetworkId } from '../types';
 export declare class BSNeo3Helper {
     static getTokens(network: TBSNetwork<TBSNeo3NetworkId>): import("@cityofzion/blockchain-service").TBSToken[];
-    static isCustomNetwork(network: TBSNetwork<TBSNeo3NetworkId>): boolean;
-    static isMainnetNetwork(network: TBSNetwork<TBSNeo3NetworkId>): boolean;
 }

package/dist/helpers/BSNeo3Helper.js

@@ -7,16 +7,5 @@ class BSNeo3Helper {
         const extraTokens = BSNeo3Constants_1.BSNeo3Constants.EXTRA_TOKENS_BY_NETWORK_ID[network.id] ?? [];
         return [...extraTokens, ...BSNeo3Constants_1.BSNeo3Constants.NATIVE_ASSETS];
     }
-    static isCustomNetwork(network) {
-        if (network.type === 'custom')
-            return true;
-        const knownNetwork = BSNeo3Constants_1.BSNeo3Constants.ALL_NETWORKS.find(n => n.id === network.id);
-        if (!knownNetwork)
-            return true;
-        return false;
-    }
-    static isMainnetNetwork(network) {
-        return network.id === BSNeo3Constants_1.BSNeo3Constants.MAINNET_NETWORK.id && network.type === 'mainnet';
-    }
 }
 exports.BSNeo3Helper = BSNeo3Helper;

package/dist/index.d.ts

@@ -9,7 +9,7 @@ export * from './services/exchange-data/FlamingoForthewinEDSNeo3';
 export * from './services/explorer/DoraESNeo3';
 export * from './services/ledger/NeonDappKitLedgerServiceNeo3';
 export * from './services/nft-data/GhostMarketNDSNeo3';
-export * from './services/vote/DoraVoteServiceNeo3';
+export * from './services/vote/VoteServiceNeo3';
 export * from './services/neo3-neox-bridge/Neo3NeoXBridgeService';
 export * from './services/token/TokenServiceNeo3';
 export * from './services/wallet-connect/WalletConnectServiceNeo3';

package/dist/index.js

@@ -25,7 +25,7 @@ __exportStar(require("./services/exchange-data/FlamingoForthewinEDSNeo3"), expor
 __exportStar(require("./services/explorer/DoraESNeo3"), exports);
 __exportStar(require("./services/ledger/NeonDappKitLedgerServiceNeo3"), exports);
 __exportStar(require("./services/nft-data/GhostMarketNDSNeo3"), exports);
-__exportStar(require("./services/vote/DoraVoteServiceNeo3"), exports);
+__exportStar(require("./services/vote/VoteServiceNeo3"), exports);
 __exportStar(require("./services/neo3-neox-bridge/Neo3NeoXBridgeService"), exports);
 __exportStar(require("./services/token/TokenServiceNeo3"), exports);
 __exportStar(require("./services/wallet-connect/WalletConnectServiceNeo3"), exports);

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

@@ -1,19 +1,13 @@
-import { type TBalanceResponse, type TBSToken, type TBridgeToken, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TContractResponse, type TTransactionDefault } from '@cityofzion/blockchain-service';
+import { type TBalanceResponse, type TBSToken, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TContractResponse, type TTransactionDefault } from '@cityofzion/blockchain-service';
 import { api } from '@cityofzion/dora-ts';
 import { RpcBDSNeo3 } from './RpcBDSNeo3';
 import type { IBSNeo3 } from '../../types';
-import { Notification } from '@cityofzion/dora-ts/dist/interfaces/api/neo';
-export declare class DoraBDSNeo3<N extends string> extends RpcBDSNeo3<N> {
+export declare class DoraBDSNeo3 extends RpcBDSNeo3 {
     #private;
     static getClient(): api.NeoRESTApi;
-    static getBridgeNeo3NeoXDataByNotifications<N extends string>(notifications: Notification[], service: IBSNeo3<N>): {
-        amount: string;
-        tokenToUse: TBridgeToken<N>;
-        receiverAddress: string;
-    } | undefined;
-    constructor(service: IBSNeo3<N>);
-    getTransaction(hash: string): Promise<TTransactionDefault<N>>;
-    getTransactionsByAddress({ address, nextPageParams, }: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    constructor(service: IBSNeo3);
+    getTransaction(hash: string): Promise<TTransactionDefault>;
+    getTransactionsByAddress({ address, nextPageParams, }: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     getContract(contractHash: string): Promise<TContractResponse>;
     getTokenInfo(tokenHash: string): Promise<TBSToken>;
     getBalance(address: string): Promise<TBalanceResponse[]>;

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

@@ -16,53 +16,17 @@ exports.DoraBDSNeo3 = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const dora_ts_1 = require("@cityofzion/dora-ts");
 const RpcBDSNeo3_1 = require("./RpcBDSNeo3");
-const BSNeo3Helper_1 = require("../../helpers/BSNeo3Helper");
-const BSNeo3NeonJsSingletonHelper_1 = require("../../helpers/BSNeo3NeonJsSingletonHelper");
 class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
     static getClient() {
         return new dora_ts_1.api.NeoRESTApi({ url: blockchain_service_1.BSCommonConstants.COZ_API_URL, endpoint: '/api/v2/neo3' });
     }
-    static getBridgeNeo3NeoXDataByNotifications(notifications, service) {
-        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 = notification?.state?.value;
-        if (!notificationStateValue)
-            return undefined;
-        let tokenToUse;
-        let amountInDecimals;
-        let byteStringReceiverAddress;
-        if (isNativeToken) {
-            tokenToUse = service.neo3NeoXBridgeService.gasToken;
-            amountInDecimals = notificationStateValue[2]?.value;
-            byteStringReceiverAddress = notificationStateValue[1]?.value;
-        }
-        else {
-            tokenToUse = service.neo3NeoXBridgeService.neoToken;
-            amountInDecimals = notificationStateValue[4]?.value;
-            byteStringReceiverAddress = notificationStateValue[3]?.value;
-        }
-        if (!tokenToUse || !amountInDecimals || !byteStringReceiverAddress)
-            return undefined;
-        const { u } = BSNeo3NeonJsSingletonHelper_1.BSNeo3NeonJsSingletonHelper.getInstance();
-        return {
-            amount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(amountInDecimals, tokenToUse.decimals), {
-                decimals: tokenToUse.decimals,
-            }),
-            tokenToUse,
-            receiverAddress: `0x${u.HexString.fromBase64(byteStringReceiverAddress).toLittleEndian()}`,
-        };
-    }
     constructor(service) {
         super(service);
         _DoraBDSNeo3_instances.add(this);
         _DoraBDSNeo3_apiInstance.set(this, void 0);
     }
     async getTransaction(hash) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(this._service.network)) {
+        if (this._service.network.type === 'custom') {
             return await super.getTransaction(hash);
         }
         const response = await __classPrivateFieldGet(this, _DoraBDSNeo3_instances, "a", _DoraBDSNeo3_api_get).transaction(hash, this._service.network.id);
@@ -75,7 +39,12 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
         const txId = response.hash;
         const txIdUrl = this._service.explorerService.buildTransactionUrl(txId);
         const events = await this._extractEventsFromNotifications(notifications);
-        let transaction = {
+        const data = {
+            ...this._service.neo3NeoXBridgeService._getDataFromNotifications(notifications),
+            ...this._service.claimService._getTransactionDataFromEvents(events),
+            ...this._service.voteService._getTransactionDataFromEvents(events),
+        };
+        const transaction = {
             txId,
             txIdUrl,
             block: response.block,
@@ -84,18 +53,14 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
             networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(response.netfee ?? 0, this._service.feeToken.decimals), { decimals: this._service.feeToken.decimals }),
             invocationCount: 0,
             notificationCount: 0,
-            type: 'default',
             view: 'default',
             events,
+            data,
         };
-        const bridgeNeo3NeoXData = this.getBridgeNeo3NeoXDataByNotifications(notifications);
-        if (bridgeNeo3NeoXData) {
-            transaction = { ...transaction, type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData };
-        }
         return transaction;
     }
     async getTransactionsByAddress({ address, nextPageParams = 1, }) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(this._service.network)) {
+        if (this._service.network.type === 'custom') {
             return await super.getTransactionsByAddress({ address, nextPageParams });
         }
         const data = await __classPrivateFieldGet(this, _DoraBDSNeo3_instances, "a", _DoraBDSNeo3_api_get).addressTXFull(address, nextPageParams, this._service.network.id);
@@ -109,7 +74,12 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
             const events = await this._extractEventsFromNotifications(notifications);
             const txId = item.hash;
             const txIdUrl = this._service.explorerService.buildTransactionUrl(txId);
-            let transaction = {
+            const data = {
+                ...this._service.neo3NeoXBridgeService._getDataFromNotifications(notifications),
+                ...this._service.claimService._getTransactionDataFromEvents(events),
+                ...this._service.voteService._getTransactionDataFromEvents(events),
+            };
+            const transaction = {
                 txId,
                 txIdUrl,
                 block: item.block,
@@ -118,14 +88,10 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
                 networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(item.netfee ?? 0, this._service.feeToken.decimals), { decimals: this._service.feeToken.decimals }),
                 invocationCount: 0,
                 notificationCount: notifications?.length ?? 0,
-                type: 'default',
                 view: 'default',
                 events,
+                data,
             };
-            const bridgeNeo3NeoXData = this.getBridgeNeo3NeoXDataByNotifications(notifications);
-            if (bridgeNeo3NeoXData) {
-                transaction = { ...transaction, type: 'bridgeNeo3NeoX', data: bridgeNeo3NeoXData };
-            }
             transactions.splice(index, 0, transaction);
         });
         await Promise.allSettled(promises);
@@ -137,7 +103,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
         };
     }
     async getContract(contractHash) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(this._service.network)) {
+        if (this._service.network.type === 'custom') {
             return await super.getContract(contractHash);
         }
         try {
@@ -153,7 +119,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
         }
     }
     async getTokenInfo(tokenHash) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(this._service.network)) {
+        if (this._service.network.type === 'custom') {
             return await super.getTokenInfo(tokenHash);
         }
         try {
@@ -179,7 +145,7 @@ class DoraBDSNeo3 extends RpcBDSNeo3_1.RpcBDSNeo3 {
         }
     }
     async getBalance(address) {
-        if (BSNeo3Helper_1.BSNeo3Helper.isCustomNetwork(this._service.network)) {
+        if (this._service.network.type === 'custom') {
             return await super.getBalance(address);
         }
         const response = await __classPrivateFieldGet(this, _DoraBDSNeo3_instances, "a", _DoraBDSNeo3_api_get).balance(address, this._service.network.id);

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

@@ -1,19 +1,14 @@
-import { type TBalanceResponse, type IBlockchainDataService, type TBSToken, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TContractResponse, type TBridgeToken, type TTransactionDefault } from '@cityofzion/blockchain-service';
+import { type TBalanceResponse, type IBlockchainDataService, type TBSToken, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse, type TContractResponse, type TTransactionDefault, type TTransactionDefaultEvent } from '@cityofzion/blockchain-service';
 import type { IBSNeo3, TRpcBDSNeo3Notification } from '../../types';
-export declare class RpcBDSNeo3<N extends string> implements IBlockchainDataService<N> {
+export declare class RpcBDSNeo3 implements IBlockchainDataService {
     #private;
     readonly maxTimeToConfirmTransactionInMs: number;
     readonly _tokenCache: Map<string, TBSToken>;
-    readonly _service: IBSNeo3<N>;
-    constructor(service: IBSNeo3<N>);
-    _extractEventsFromNotifications(notifications?: TRpcBDSNeo3Notification[]): Promise<(import("@cityofzion/blockchain-service").TTransactionTokenEvent | import("@cityofzion/blockchain-service").TTransactionNftEvent)[]>;
-    getBridgeNeo3NeoXDataByNotifications(notifications: TRpcBDSNeo3Notification[]): {
-        amount: string;
-        tokenToUse: TBridgeToken<N>;
-        receiverAddress: string;
-    } | undefined;
-    getTransaction(hash: string): Promise<TTransactionDefault<N>>;
-    getTransactionsByAddress(_params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N, TTransactionDefault<N>>>;
+    readonly _service: IBSNeo3;
+    constructor(service: IBSNeo3);
+    _extractEventsFromNotifications(notifications?: TRpcBDSNeo3Notification[]): Promise<TTransactionDefaultEvent[]>;
+    getTransaction(hash: string): Promise<TTransactionDefault>;
+    getTransactionsByAddress(_params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<TTransactionDefault>>;
     getContract(contractHash: string): Promise<TContractResponse>;
     getTokenInfo(tokenHash: string): Promise<TBSToken>;
     getBalance(address: string): Promise<TBalanceResponse[]>;