@cityofzion/bs-solana 2.0.11 → 3.0.0

package/dist/BSSolana.d.ts

@@ -16,7 +16,7 @@ export declare class BSSolana<N extends string = string> implements IBSSolana<N>
     readonly defaultNetwork: TBSNetwork<TBSSolanaNetworkId>;
     ledgerService: Web3LedgerServiceSolana<N>;
     exchangeDataService: IExchangeDataService;
-    blockchainDataService: IBlockchainDataService;
+    blockchainDataService: IBlockchainDataService<N>;
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;

package/dist/BSSolana.js

@@ -181,17 +181,9 @@ class BSSolana {
     }
     transfer(param) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { transaction, latestBlockhash } = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_buildTransferParams).call(this, param);
+            const { transaction } = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_buildTransferParams).call(this, param);
             const signedTransaction = yield __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_signTransaction).call(this, transaction, param.senderAccount);
             const signature = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").sendRawTransaction(signedTransaction);
-            const status = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").confirmTransaction({
-                blockhash: latestBlockhash.blockhash,
-                lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-                signature,
-            });
-            if (status.value.err) {
-                throw new Error('Transaction failed: ' + status.value.err);
-            }
             return [signature];
         });
     }
@@ -245,7 +237,6 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
     });
 }, _BSSolana_buildTransferParams = function _BSSolana_buildTransferParams(param) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         const latestBlockhash = yield __classPrivateFieldGet(this, _BSSolana_connection, "f").getLatestBlockhash();
         const senderPublicKey = new web3_js_1.default.PublicKey(param.senderAccount.address);
         const transaction = new web3_js_1.default.Transaction();
@@ -254,9 +245,9 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
         transaction.lastValidBlockHeight = latestBlockhash.lastValidBlockHeight;
         for (const intent of param.intents) {
             const amountBn = blockchain_service_1.BSBigNumberHelper.fromNumber(intent.amount);
-            const amount = Number(blockchain_service_1.BSBigNumberHelper.toDecimals(amountBn, (_a = intent.tokenDecimals) !== null && _a !== void 0 ? _a : 0));
+            const amount = Number(blockchain_service_1.BSBigNumberHelper.toDecimals(amountBn, intent.token.decimals));
             const receiverPublicKey = new web3_js_1.default.PublicKey(intent.receiverAddress);
-            const normalizedTokenHash = this.tokenService.normalizeHash(intent.tokenHash);
+            const normalizedTokenHash = this.tokenService.normalizeHash(intent.token.hash);
             const isNative = normalizedTokenHash === this.tokenService.normalizeHash(BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash);
             if (isNative) {
                 transaction.add(web3_js_1.default.SystemProgram.transfer({
@@ -286,7 +277,6 @@ _BSSolana_connection = new WeakMap(), _BSSolana_instances = new WeakSet(), _BSSo
         return {
             transaction,
             senderPublicKey,
-            latestBlockhash,
         };
     });
 };

package/dist/helpers/BSSolanaHelper.d.ts

@@ -1,7 +1,5 @@
 import { TBSNetwork } from '@cityofzion/blockchain-service';
 import { TBSSolanaNetworkId } from '../types';
 export declare class BSSolanaHelper {
-    static fixBip44Path(bip44Path: string): string;
-    static getBip44Path(path: string, index: number): string;
     static isMainnetNetwork(network: TBSNetwork<TBSSolanaNetworkId>): boolean;
 }

package/dist/helpers/BSSolanaHelper.js

@@ -3,12 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSSolanaHelper = void 0;
 const BSSolanaConstants_1 = require("../constants/BSSolanaConstants");
 class BSSolanaHelper {
-    static fixBip44Path(bip44Path) {
-        return bip44Path.replace('m/', '');
-    }
-    static getBip44Path(path, index) {
-        return this.fixBip44Path(path.replace('?', index.toString()));
-    }
     static isMainnetNetwork(network) {
         return BSSolanaConstants_1.BSSolanaConstants.MAINNET_NETWORK.id === network.id && network.type === 'mainnet';
     }

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

@@ -1,17 +1,15 @@
-import { TBalanceResponse, ContractResponse, TExportTransactionsByAddressParams, TFullTransactionsByAddressParams, TFullTransactionsByAddressResponse, IBlockchainDataService, TBSNetwork, TBSToken, TTransactionResponse, TTransactionsByAddressParams, TTransactionsByAddressResponse } from '@cityofzion/blockchain-service';
+import { TBalanceResponse, IBlockchainDataService, TBSNetwork, TBSToken, type TContractResponse, type TTransaction, type TGetTransactionsByAddressParams, type TGetTransactionsByAddressResponse } from '@cityofzion/blockchain-service';
 import solanaSDK from '@solana/web3.js';
 import { IBSSolana, TBSSolanaNetworkId } from '../../types';
-export declare class TatumRpcBDSSolana<N extends string> implements IBlockchainDataService {
+export declare class TatumRpcBDSSolana<N extends string> implements IBlockchainDataService<N> {
     #private;
     static URL_BY_NETWORK_ID: Record<TBSSolanaNetworkId, string>;
     static getConnection(network: TBSNetwork<TBSSolanaNetworkId>): solanaSDK.Connection;
     readonly maxTimeToConfirmTransactionInMs: number;
     constructor(service: IBSSolana<N>);
-    getTransaction(txid: string): Promise<TTransactionResponse>;
-    getTransactionsByAddress(params: TTransactionsByAddressParams): Promise<TTransactionsByAddressResponse>;
-    getFullTransactionsByAddress(_params: TFullTransactionsByAddressParams): Promise<TFullTransactionsByAddressResponse>;
-    exportFullTransactionsByAddress(_params: TExportTransactionsByAddressParams): Promise<string>;
-    getContract(_contractHash: string): Promise<ContractResponse>;
+    getTransaction(txid: string): Promise<TTransaction<N>>;
+    getTransactionsByAddress(params: TGetTransactionsByAddressParams): Promise<TGetTransactionsByAddressResponse<N>>;
+    getContract(_contractHash: string): Promise<TContractResponse>;
     getTokenInfo(tokenHash: string): Promise<TBSToken>;
     getBalance(address: string): Promise<TBalanceResponse[]>;
     getBlockHeight(): Promise<number>;

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

@@ -96,30 +96,33 @@ class TatumRpcBDSSolana {
                 throw new Error('Block time not found');
             if (!transaction.meta)
                 throw new Error('Transaction meta not found');
-            const transfers = [];
+            const events = [];
             const allInstructions = [
                 ...transaction.transaction.message.instructions,
                 ...((_b = (_a = transaction.meta.innerInstructions) === null || _a === void 0 ? void 0 : _a.flatMap(item => item.instructions)) !== null && _b !== void 0 ? _b : []),
             ].filter((item) => 'parsed' in item);
             for (const instruction of allInstructions) {
                 try {
-                    const transfer = yield __classPrivateFieldGet(this, _TatumRpcBDSSolana_instances, "m", _TatumRpcBDSSolana_parseInstruction).call(this, instruction, allInstructions);
-                    if (transfer)
-                        transfers.push(transfer);
+                    const event = yield __classPrivateFieldGet(this, _TatumRpcBDSSolana_instances, "m", _TatumRpcBDSSolana_parseInstruction).call(this, instruction, allInstructions);
+                    events.push(event);
                 }
                 catch (_c) {
                     /* empty */
                 }
             }
-            const feeBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(transaction.meta.fee, __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").feeToken.decimals);
-            const fee = blockchain_service_1.BSBigNumberHelper.toNumber(feeBn);
+            const txTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getTxTemplateUrl();
+            const txId = transaction.transaction.signatures[0];
+            const txIdUrl = txTemplateUrl === null || txTemplateUrl === void 0 ? void 0 : txTemplateUrl.replace('{txId}', txId);
             return {
                 block: transaction.slot,
-                hash: transaction.transaction.signatures[0],
-                notifications: [],
-                time: new Date(transaction.blockTime).getTime() / 1000,
-                transfers,
-                fee,
+                txId: transaction.transaction.signatures[0],
+                txIdUrl,
+                invocationCount: 0,
+                notificationCount: 0,
+                networkFeeAmount: blockchain_service_1.BSBigNumberHelper.format(blockchain_service_1.BSBigNumberHelper.fromDecimals(transaction.meta.fee, __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").feeToken.decimals), { decimals: __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").feeToken.decimals }),
+                systemFeeAmount: blockchain_service_1.BSBigNumberHelper.format(0, { decimals: __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").feeToken.decimals }),
+                date: new Date(transaction.blockTime).toISOString(),
+                events,
                 type: 'default',
             };
         });
@@ -144,16 +147,6 @@ class TatumRpcBDSSolana {
             };
         });
     }
-    getFullTransactionsByAddress(_params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('Method not supported.');
-        });
-    }
-    exportFullTransactionsByAddress(_params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('Method not supported.');
-        });
-    }
     getContract(_contractHash) {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error('Method not supported.');
@@ -215,7 +208,7 @@ class TatumRpcBDSSolana {
 exports.TatumRpcBDSSolana = TatumRpcBDSSolana;
 _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new WeakMap(), _TatumRpcBDSSolana_functionByProgramIdAndMethod = new WeakMap(), _TatumRpcBDSSolana_instances = new WeakSet(), _TatumRpcBDSSolana_parseSplTransferCheckedInstruction = function _TatumRpcBDSSolana_parseSplTransferCheckedInstruction(instruction, allInstructions) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const info = instruction.parsed.info;
         if (!info.destination || !info.source || !info.mint) {
             throw new Error('Unsupported instruction format');
@@ -234,17 +227,34 @@ _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new
         if (!fromTokenAddress) {
             throw new Error('From account not found');
         }
+        const addressTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getAddressTemplateUrl();
+        const contractTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getContractTemplateUrl();
+        const nftTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getNftTemplateUrl();
         const from = fromTokenAddress.toBase58();
+        const fromUrl = addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', from);
+        const toUrl = addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', to);
+        const contractHashUrl = contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', contractHash);
         if ((metaplex === null || metaplex === void 0 ? void 0 : metaplex.model) === 'nft') {
             if (!((_a = metaplex.collection) === null || _a === void 0 ? void 0 : _a.address)) {
                 throw new Error('Collection address not found');
             }
+            const collectionHash = metaplex.collection.address.toBase58();
+            const nftUrl = nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{tokenHash}', contractHash).replace('{collectionHash}', contractHash);
             return {
-                type: 'nft',
+                eventType: 'nft',
                 from,
+                fromUrl,
                 to,
+                toUrl,
                 tokenHash: contractHash,
-                collectionHash: metaplex.collection.address.toBase58(),
+                collectionHash,
+                collectionHashUrl: contractHashUrl,
+                methodName: 'transferChecked',
+                tokenType: 'spl',
+                amount: '1',
+                nftImageUrl: (_b = metaplex === null || metaplex === void 0 ? void 0 : metaplex.json) === null || _b === void 0 ? void 0 : _b.image,
+                name: metaplex.name,
+                nftUrl,
             };
         }
         const token = {
@@ -256,17 +266,22 @@ _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new
         const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(info.tokenAmount.amount, token.decimals);
         const amount = blockchain_service_1.BSBigNumberHelper.toNumber(amountBn);
         return {
-            type: 'token',
+            eventType: 'token',
             amount,
             contractHash,
+            contractHashUrl,
             from,
+            fromUrl,
             to,
+            toUrl,
             token,
+            methodName: 'transferChecked',
+            tokenType: 'spl',
         };
     });
 }, _TatumRpcBDSSolana_parseSplTransferInstruction = function _TatumRpcBDSSolana_parseSplTransferInstruction(instruction, allInstructions) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const info = instruction.parsed.info;
         if (!info.destination || !info.source || !info.amount) {
             throw new Error('Unsupported instruction format');
@@ -295,16 +310,32 @@ _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new
         if (!fromTokenAddress) {
             throw new Error('From account not found');
         }
+        const addressTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getAddressTemplateUrl();
+        const contractTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getContractTemplateUrl();
+        const nftTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getNftTemplateUrl();
         const from = fromTokenAddress.toBase58();
+        const fromUrl = addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', from);
+        const toUrl = addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', to);
+        const contractHashUrl = contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', contractHash);
         if ((metaplex === null || metaplex === void 0 ? void 0 : metaplex.model) === 'nft') {
             if (!((_a = metaplex.collection) === null || _a === void 0 ? void 0 : _a.address)) {
                 throw new Error('Collection address not found');
             }
+            const nftUrl = nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{tokenHash}', contractHash).replace('{collectionHash}', contractHash);
             return {
-                type: 'nft',
+                eventType: 'nft',
                 from,
+                fromUrl,
                 to,
+                toUrl,
+                tokenType: 'spl',
+                methodName: 'transfer',
+                nftImageUrl: (_b = metaplex === null || metaplex === void 0 ? void 0 : metaplex.json) === null || _b === void 0 ? void 0 : _b.image,
+                name: metaplex.name,
+                nftUrl,
                 collectionHash: metaplex.collection.address.toBase58(),
+                collectionHashUrl: contractHashUrl,
+                amount: '1',
                 tokenHash: contractHash,
             };
         }
@@ -317,11 +348,16 @@ _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new
         const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(info.tokenAmount.amount, token.decimals);
         const amount = blockchain_service_1.BSBigNumberHelper.toNumber(amountBn);
         return {
-            type: 'token',
+            eventType: 'token',
             amount,
             contractHash,
             from,
+            fromUrl,
             to,
+            toUrl,
+            methodName: 'transfer',
+            tokenType: 'spl',
+            contractHashUrl,
             token,
         };
     });
@@ -334,12 +370,25 @@ _TatumRpcBDSSolana_service = new WeakMap(), _TatumRpcBDSSolana_connection = new
         }
         const amountBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(info.lamports, BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.decimals);
         const amount = blockchain_service_1.BSBigNumberHelper.toNumber(amountBn);
+        const addressTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getAddressTemplateUrl();
+        const contractTemplateUrl = __classPrivateFieldGet(this, _TatumRpcBDSSolana_service, "f").explorerService.getContractTemplateUrl();
+        const from = info.source;
+        const to = info.destination;
+        const contractHash = BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash;
+        const fromUrl = addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', from);
+        const toUrl = addressTemplateUrl === null || addressTemplateUrl === void 0 ? void 0 : addressTemplateUrl.replace('{address}', to);
+        const contractHashUrl = contractTemplateUrl === null || contractTemplateUrl === void 0 ? void 0 : contractTemplateUrl.replace('{hash}', contractHash);
         return {
-            type: 'token',
+            eventType: 'token',
             amount,
+            methodName: 'transfer',
+            tokenType: 'native',
             from: info.source,
+            fromUrl,
             to: info.destination,
-            contractHash: BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN.hash,
+            toUrl,
+            contractHash,
+            contractHashUrl,
             token: BSSolanaConstants_1.BSSolanaConstants.NATIVE_TOKEN,
         };
     });

package/dist/services/ledger/Web3LedgerServiceSolana.js

@@ -29,7 +29,6 @@ const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const hw_app_solana_1 = __importDefault(require("@ledgerhq/hw-app-solana"));
 const events_1 = __importDefault(require("events"));
 const web3_js_1 = __importDefault(require("@solana/web3.js"));
-const BSSolanaHelper_1 = require("../../helpers/BSSolanaHelper");
 class Web3LedgerServiceSolana {
     constructor(blockchainService, getLedgerTransport) {
         _Web3LedgerServiceSolana_service.set(this, void 0);
@@ -49,7 +48,7 @@ class Web3LedgerServiceSolana {
     getAccount(transport, index) {
         return __awaiter(this, void 0, void 0, function* () {
             const ledgerApp = new hw_app_solana_1.default(transport);
-            const bip44Path = BSSolanaHelper_1.BSSolanaHelper.getBip44Path(__classPrivateFieldGet(this, _Web3LedgerServiceSolana_service, "f").bip44DerivationPath, index);
+            const bip44Path = blockchain_service_1.BSKeychainHelper.getBip44Path(blockchain_service_1.BSKeychainHelper.fixBip44Path(__classPrivateFieldGet(this, _Web3LedgerServiceSolana_service, "f").bip44DerivationPath), index);
             const publicKey = yield blockchain_service_1.BSUtilsHelper.retry(() => __awaiter(this, void 0, void 0, function* () {
                 const response = yield ledgerApp.getAddress(bip44Path);
                 return new web3_js_1.default.PublicKey(response.address);
@@ -73,7 +72,7 @@ class Web3LedgerServiceSolana {
             const ledgerApp = new hw_app_solana_1.default(transport);
             const serializedTransaction = transaction.compileMessage().serialize();
             (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
-            const bip44Path = BSSolanaHelper_1.BSSolanaHelper.fixBip44Path(account.bip44Path);
+            const bip44Path = blockchain_service_1.BSKeychainHelper.fixBip44Path(account.bip44Path);
             const { signature } = yield ledgerApp.signTransaction(bip44Path, serializedTransaction);
             (_b = this.emitter) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
             transaction.addSignature(new web3_js_1.default.PublicKey(account.address), signature);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-solana",
-  "version": "2.0.11",
+  "version": "3.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -17,14 +17,14 @@
     "bs58": "~6.0.0",
     "@solana/spl-token": "~0.4.14",
     "@bonfida/spl-name-service": "~3.0.16",
-    "@ledgerhq/hw-app-solana": "~7.5.4",
-    "@ledgerhq/hw-transport": "~6.31.11",
+    "@ledgerhq/hw-app-solana": "~7.7.0",
+    "@ledgerhq/hw-transport": "~6.32.0",
     "@metaplex-foundation/js": "~0.20.1",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.22.8"
+    "@cityofzion/blockchain-service": "3.0.0"
   },
   "devDependencies": {
-    "@ledgerhq/hw-transport-node-hid": "~6.29.12",
+    "@ledgerhq/hw-transport-node-hid": "~6.30.0",
     "@types/jest": "~30.0.0",
     "eslint": "~9.36.0",
     "jest": "~30.1.3",
@@ -33,10 +33,11 @@
     "typescript": "~5.9.2"
   },
   "scripts": {
-    "build": "rm -rf ./dist && tsc --project tsconfig.build.json",
+    "build": "rm -rf ./dist && npm run typecheck && tsc --project tsconfig.build.json",
     "test": "jest -i --config jest.config.ts",
     "lint": "eslint .",
     "format": "eslint --fix",
-    "package": "npm run build && npm pack"
+    "package": "npm run build && npm pack",
+    "typecheck": "tsc --noEmit"
   }
 }