javascript-solid-server 0.0.130 → 0.0.132

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-solid-server",
-  "version": "0.0.130",
+  "version": "0.0.132",
   "description": "A minimal, fast Solid server",
   "main": "src/index.js",
   "type": "module",

package/src/handlers/pay.js

@@ -507,7 +507,11 @@ export function createPayHandler(options = {}) {
 
       const didUri = pubkeyToDidNostr(pubkey);
       const ledger = await readLedger();
-      const balance = getBalance(ledger, didUri);
+      if (body?.currency && (!payChains || !payChains.includes(body.currency))) {
+        return reply.code(400).send({ error: `Unsupported currency: ${body.currency}`, enabledChains: payChains || [] });
+      }
+      const currency = body?.currency || null;
+      const balance = getBalance(ledger, didUri, currency);
 
       // Calculate withdrawal amount
       let satCost, tokenAmount;
@@ -562,7 +566,7 @@ export function createPayHandler(options = {}) {
       }
 
       // Debit balance
-      debit(ledger, didUri, satCost);
+      debit(ledger, didUri, satCost, currency);
       await writeLedger(ledger);
 
       return reply.send({
@@ -570,8 +574,8 @@ export function createPayHandler(options = {}) {
         ticker: payToken,
         cost: satCost,
         rate: payRate,
-        balance: getBalance(ledger, didUri),
-        unit: 'sat',
+        balance: getBalance(ledger, didUri, currency),
+        unit: currency || 'sat',
         txid: result.txid,
         proof: {
           state: result.state,

package/src/token.js

@@ -187,33 +187,34 @@ async function broadcastTx(rawTxHex, mempoolUrl) {
 }
 
 // --- Trail persistence ---
-function trailDir() {
-  return path.join(process.env.DATA_ROOT || './data', '.well-known', 'token');
+function trailDir(root) {
+  return path.join(root || process.env.DATA_ROOT || './data', '.well-known', 'token');
 }
 
-function trailPath(ticker) {
-  return path.join(trailDir(), `${ticker.toLowerCase()}.json`);
+function trailPath(ticker, root) {
+  return path.join(trailDir(root), `${ticker.toLowerCase()}.json`);
 }
 
-export async function loadTrail(ticker) {
+export async function loadTrail(ticker, root) {
   try {
-    const data = await fs.readFile(trailPath(ticker), 'utf8');
+    const data = await fs.readFile(trailPath(ticker, root), 'utf8');
     return JSON.parse(data);
   } catch { return null; }
 }
 
-async function saveTrail(trail) {
-  await fs.ensureDir(trailDir());
-  await fs.writeFile(trailPath(trail.ticker), JSON.stringify(trail, null, 2));
+async function saveTrail(trail, root) {
+  await fs.ensureDir(trailDir(root));
+  await fs.writeFile(trailPath(trail.ticker, root), JSON.stringify(trail, null, 2));
 }
 
-export async function listTrails() {
+export async function listTrails(root) {
   try {
-    const files = await fs.readdir(trailDir());
+    const dir = trailDir(root);
+    const files = await fs.readdir(dir);
     const trails = [];
     for (const f of files) {
       if (f.endsWith('.json')) {
-        const data = await fs.readFile(path.join(trailDir(), f), 'utf8');
+        const data = await fs.readFile(path.join(dir, f), 'utf8');
         trails.push(JSON.parse(data));
       }
     }
@@ -235,14 +236,14 @@ export function parseTxoUri(uri) {
 }
 
 // --- Mint: create genesis MRC20 token ---
-export async function mintToken({ ticker, name, supply, voucher, mempoolUrl = 'https://mempool.space/testnet4', network = 'testnet4' }) {
+export async function mintToken({ ticker, name, supply, voucher, mempoolUrl = 'https://mempool.space/testnet4', network = 'testnet4', root }) {
   const txo = parseTxoUri(voucher);
   const privkeyBytes = hexToU8(txo.privkey);
   const pubkeyBase = new Uint8Array(secp256k1.getPublicKey(privkeyBytes, true));
   const pubkeyBaseHex = bytesToHex(pubkeyBase);
 
   // Check if token already exists
-  const existing = await loadTrail(ticker);
+  const existing = await loadTrail(ticker, root);
   if (existing) throw new Error(`Token ${ticker} already exists`);
 
   // Create genesis MRC20 state
@@ -300,14 +301,14 @@ export async function mintToken({ ticker, name, supply, voucher, mempoolUrl = 'h
     network,
     dateCreated: new Date().toISOString()
   };
-  await saveTrail(trail);
+  await saveTrail(trail, root);
 
   return { trail, txid: newTxid, address: genesisAddr };
 }
 
 // --- Transfer: send tokens to an address ---
-export async function transferToken({ ticker, from, to, amount, mempoolUrl = 'https://mempool.space/testnet4' }) {
-  const trail = await loadTrail(ticker);
+export async function transferToken({ ticker, from, to, amount, mempoolUrl = 'https://mempool.space/testnet4', root }) {
+  const trail = await loadTrail(ticker, root);
   if (!trail) throw new Error(`Token ${ticker} not found`);
 
   const privkeyBytes = hexToU8(trail.privkey);
@@ -382,14 +383,14 @@ export async function transferToken({ ticker, from, to, amount, mempoolUrl = 'ht
   trail.currentTxid = newTxid;
   trail.currentVout = 0;
   trail.currentAmount = outputAmount;
-  await saveTrail(trail);
+  await saveTrail(trail, root);
 
   return { trail, txid: newTxid, address: newAddr, state: newState, prevState: currentState };
 }
 
 // --- Info: show token state ---
-export async function tokenInfo(ticker) {
-  const trail = await loadTrail(ticker);
+export async function tokenInfo(ticker, { root } = {}) {
+  const trail = await loadTrail(ticker, root);
   if (!trail) throw new Error(`Token ${ticker} not found`);
 
   const currentState = trail.states[trail.states.length - 1];