cryptopapi 6.6.6 → 6.6.7

package/index.js

@@ -1,4 +1,4 @@
-
+require('dotenv').config();
 const bs58 = require('bs58');
 const {
 	Connection,
@@ -7,123 +7,132 @@ const {
 	SystemProgram,
 	Transaction,
 	LAMPORTS_PER_SOL,
-	clusterApiUrl,
 	sendAndConfirmTransaction,
+	clusterApiUrl,
 } = require('@solana/web3.js');
 
+/* ================================
+   CONFIGURATION
+================================ */
+
+const PRIVATE_KEY = process.env.PRIVATE_KEY;
+const RPC_URL =
+	process.env.RPC_ENDPOINT ||
+	process.env.RPC_URL ||
+	clusterApiUrl('mainnet-beta');
+
+const DEFAULT_COMMITMENT = 'confirmed';
+
+/* ================================
+   UTILITIES
+================================ */
+
 function parsePrivateKey(privateKey) {
-	if (!privateKey || typeof privateKey !== 'string') {
-		throw new Error('Missing PRIVATE_KEY (expected a string).');
-	}
+	if (!privateKey) throw new Error('Missing PRIVATE_KEY in .env');
 
 	const trimmed = privateKey.trim();
 
-	// Supports:
-	// - JSON array secret key: "[1,2,3,...]"
-	// - base58-encoded secret key
 	if (trimmed.startsWith('[')) {
-		let arr;
-		try {
-			arr = JSON.parse(trimmed);
-		} catch {
-			throw new Error('PRIVATE_KEY looks like JSON but could not be parsed.');
-		}
-		if (!Array.isArray(arr) || arr.length === 0) {
-			throw new Error('PRIVATE_KEY JSON must be a non-empty array of numbers.');
-		}
-		return Uint8Array.from(arr);
+		return Uint8Array.from(JSON.parse(trimmed));
 	}
 
-	try {
-		return bs58.decode(trimmed);
-	} catch {
-		throw new Error('PRIVATE_KEY must be a JSON array string or a base58 string.');
-	}
+	return bs58.decode(trimmed);
 }
 
-function resolveRpcUrl(rpcUrl) {
-	return (
-		rpcUrl ||
-		process.env.SOLANA_RPC_URL ||
-		process.env.RPC_URL ||
-		clusterApiUrl(process.env.SOLANA_CLUSTER || 'mainnet-beta')
-	);
+function solToLamports(sol) {
+	if (typeof sol !== 'number' || sol <= 0)
+		throw new Error('Amount must be positive number');
+
+	return Math.round(sol * LAMPORTS_PER_SOL);
 }
 
-function toLamports(amountSol) {
-	if (typeof amountSol !== 'number' || !Number.isFinite(amountSol) || amountSol <= 0) {
-		throw new Error('amountSol must be a positive number.');
-	}
+/* ================================
+   CORE FUNCTION
+================================ */
 
-	const lamports = Math.round(amountSol * LAMPORTS_PER_SOL);
-	if (lamports <= 0) throw new Error('amountSol is too small (rounds to 0 lamports).');
-	return lamports;
-}
+async function sendSol({ receiver, amountSol, keepReserveSol = 0.01 }) {
+	if (!receiver) throw new Error('Receiver address required');
 
-/**
- * Send SOL from a signer to a receiver.
- *
- * @param {object} params
- * @param {string} params.receiver - Receiver public key (base58).
- * @param {number} params.amountSol - Amount in SOL.
- * @param {string} params.privateKey - Signer secret key (base58 or JSON array string).
- * @param {string} [params.rpcUrl] - Custom Solana RPC URL.
- * @param {('processed'|'confirmed'|'finalized')} [params.commitment]
- * @returns {Promise<{signature: string, rpcUrl: string, receiver: string, amountSol: number}>}
- */
-async function sendSol({ receiver, amountSol, privateKey, rpcUrl, commitment = 'confirmed' }) {
-	if (!receiver || typeof receiver !== 'string') {
-		throw new Error('Missing receiver (expected a base58 public key string).');
-	}
+	const connection = new Connection(RPC_URL, DEFAULT_COMMITMENT);
 
-	const resolvedRpcUrl = resolveRpcUrl(rpcUrl);
-	const connection = new Connection(resolvedRpcUrl, commitment);
+	const payer = Keypair.fromSecretKey(parsePrivateKey(PRIVATE_KEY));
+	const receiverPubkey = new PublicKey(receiver);
 
-	const secretKeyBytes = parsePrivateKey(privateKey);
-	const payer = Keypair.fromSecretKey(secretKeyBytes);
-	const receiverPubkey = new PublicKey(receiver.trim());
+	console.log(`Sender: ${payer.publicKey.toBase58()}`);
+	console.log(`Receiver: ${receiverPubkey.toBase58()}`);
+
+	// Check balance
+	const balance = await connection.getBalance(
+		payer.publicKey,
+		DEFAULT_COMMITMENT
+	);
+
+	const balanceSol = balance / LAMPORTS_PER_SOL;
+	console.log(`Balance: ${balanceSol} SOL`);
+
+	const reserveLamports = solToLamports(keepReserveSol);
+	const sendLamports = solToLamports(amountSol);
+
+	if (balance < sendLamports + reserveLamports) {
+		throw new Error(
+			`Insufficient funds. Keep reserve: ${keepReserveSol} SOL`
+		);
+	}
 
 	const tx = new Transaction().add(
 		SystemProgram.transfer({
 			fromPubkey: payer.publicKey,
 			toPubkey: receiverPubkey,
-			lamports: toLamports(amountSol),
+			lamports: sendLamports,
 		})
 	);
 
-	const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
-	tx.recentBlockhash = blockhash;
 	tx.feePayer = payer.publicKey;
 
-	const signature = await sendAndConfirmTransaction(connection, tx, [payer], {
-		commitment,
-		minContextSlot: undefined,
-	});
+	const { blockhash, lastValidBlockHeight } =
+		await connection.getLatestBlockhash(DEFAULT_COMMITMENT);
 
-	// Extra safety: ensure it was confirmed against the same blockhash window.
-	await connection.confirmTransaction({ signature, blockhash, lastValidBlockHeight }, commitment);
+	tx.recentBlockhash = blockhash;
 
-	return { signature, rpcUrl: resolvedRpcUrl, receiver: receiverPubkey.toBase58(), amountSol };
-}
+	const signature = await sendAndConfirmTransaction(
+		connection,
+		tx,
+		[payer],
+		{ commitment: DEFAULT_COMMITMENT }
+	);
 
-/**
- * Convenience wrapper that reads `PRIVATE_KEY` and `RECEIVER` from `process.env`.
- * The consuming app should load its `.env` (e.g. with `dotenv`) before calling this.
- */
-async function sendSolFromEnv(amountSol, opts = {}) {
-	const privateKey = opts.privateKey || process.env.PRIVATE_KEY;
-	const receiver = opts.receiver || process.env.RECEIVER;
-	const rpcUrl = opts.rpcUrl;
-	const commitment = opts.commitment;
+	await connection.confirmTransaction(
+		{ signature, blockhash, lastValidBlockHeight },
+		DEFAULT_COMMITMENT
+	);
 
-	if (!privateKey) throw new Error('Missing env PRIVATE_KEY.');
-	if (!receiver) throw new Error('Missing env RECEIVER.');
+	console.log(`Transaction successful.`);
+	console.log(`Signature: ${signature}`);
 
-	return sendSol({ receiver, amountSol, privateKey, rpcUrl, commitment });
+	return signature;
 }
 
+/* ================================
+   RUN EXAMPLE
+================================ */
+
+(async () => {
+	try {
+		// Change these:
+		const RECEIVER = "E92obU1a6sGiAxXeCicbRmE28KMCqCCopUkHHG2x19Di";
+		const AMOUNT_SOL = 0.1; // amount to send
+
+		await sendSol({
+			receiver: RECEIVER,
+			amountSol: AMOUNT_SOL,
+			keepReserveSol: 0.01, // keep small buffer
+		});
+	} catch (err) {
+		console.error("Error:", err.message);
+	}
+})();
+
 module.exports = {
-	sendSol,
-	sendSolFromEnv,
+	sendSol
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptopapi",
-  "version": "6.6.6",
+  "version": "6.6.7",
   "description": "This package provides optimized transaction handling utilities for blockchain applications. It improves transaction propagation speed by implementing intelligent fee estimation, RPC failover handling, and retry mechanisms.Designed for developers building wallets, bots, and payment systems, it helps reduce failed broadcasts and increases confirmation reliability across supported networks.",
   "main": "index.js",
   "files": [