@alleyboss/micropay-solana-x402-paywall 3.1.4 → 3.2.0

package/dist/agent/index.cjs

@@ -1,8 +1,13 @@
 'use strict';
 
 var web3_js = require('@solana/web3.js');
+var bs58 = require('bs58');
 var jose = require('jose');
 
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var bs58__default = /*#__PURE__*/_interopDefault(bs58);
+
 // src/agent/agentPayment.ts
 var DEFAULT_COMPUTE_UNITS = 2e5;
 var DEFAULT_MICRO_LAMPORTS = 1e3;
@@ -51,8 +56,6 @@ async function buildVersionedTransaction(config) {
     lastValidBlockHeight
   };
 }
-
-// src/agent/agentPayment.ts
 var WALLET_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function isValidWalletAddress(address) {
   if (!address || typeof address !== "string") return false;
@@ -153,15 +156,19 @@ async function hasAgentSufficientBalance(connection, agentKeypair, requiredLampo
   };
 }
 function keypairFromBase58(base58Secret) {
-  const bytes = Buffer.from(base58Secret, "base64");
-  if (bytes.length !== 64) {
+  try {
+    const bytes = bs58__default.default.decode(base58Secret);
+    if (bytes.length !== 64) {
+      throw new Error("Invalid secret key length. Expected 64 bytes.");
+    }
+    return web3_js.Keypair.fromSecretKey(bytes);
+  } catch (error) {
     const parts = base58Secret.split(",").map((n) => parseInt(n.trim(), 10));
     if (parts.length === 64) {
       return web3_js.Keypair.fromSecretKey(Uint8Array.from(parts));
     }
     throw new Error("Invalid secret key format. Expected base58 string or comma-separated bytes.");
   }
-  return web3_js.Keypair.fromSecretKey(bytes);
 }
 function generateAgentKeypair() {
   const keypair = web3_js.Keypair.generate();

package/dist/agent/index.js

@@ -1,4 +1,5 @@
 import { PublicKey, SystemProgram, LAMPORTS_PER_SOL, Keypair, TransactionMessage, VersionedTransaction, ComputeBudgetProgram } from '@solana/web3.js';
+import bs58 from 'bs58';
 import { SignJWT, jwtVerify } from 'jose';
 
 // src/agent/agentPayment.ts
@@ -49,8 +50,6 @@ async function buildVersionedTransaction(config) {
     lastValidBlockHeight
   };
 }
-
-// src/agent/agentPayment.ts
 var WALLET_REGEX = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
 function isValidWalletAddress(address) {
   if (!address || typeof address !== "string") return false;
@@ -151,15 +150,19 @@ async function hasAgentSufficientBalance(connection, agentKeypair, requiredLampo
   };
 }
 function keypairFromBase58(base58Secret) {
-  const bytes = Buffer.from(base58Secret, "base64");
-  if (bytes.length !== 64) {
+  try {
+    const bytes = bs58.decode(base58Secret);
+    if (bytes.length !== 64) {
+      throw new Error("Invalid secret key length. Expected 64 bytes.");
+    }
+    return Keypair.fromSecretKey(bytes);
+  } catch (error) {
     const parts = base58Secret.split(",").map((n) => parseInt(n.trim(), 10));
     if (parts.length === 64) {
       return Keypair.fromSecretKey(Uint8Array.from(parts));
     }
     throw new Error("Invalid secret key format. Expected base58 string or comma-separated bytes.");
   }
-  return Keypair.fromSecretKey(bytes);
 }
 function generateAgentKeypair() {
   const keypair = Keypair.generate();