update for 100sats/kb fees

Author: sirdeggen

back/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the application
-FROM node:20.9.0 AS builder
+FROM node:20 AS builder
 WORKDIR /app
 COPY package*.json ./
 RUN npm install\
@@ -8,7 +8,7 @@ COPY . .
 RUN tsc
 
 # Stage 2: Run the application
-FROM node:20.9.0
+FROM node:20
 WORKDIR /app
 COPY --from=builder /app/dist ./dist
 COPY package*.json ./

back/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "truth-machine",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "main": "index.js",
   "scripts": {
     "dev": "tsx watch ./src/index.ts",
@@ -12,7 +12,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@bsv/sdk": "^1.6.24",
+    "@bsv/sdk": "^1.9.24",
     "@bsv/templates": "^1.1.0",
     "@types/express": "^5.0.0",
     "cors": "^2.8.5",

back/package.json

@@ -54,7 +54,7 @@ export default async function (req: Request, res: Response) {
       })
     }
 
-    await fundsTx.fee(new SatoshisPerKilobyte(1))
+    await fundsTx.fee(new SatoshisPerKilobyte(100))
     await fundsTx.sign()
     const fundsTxId = fundsTx.id('hex')
 
@@ -93,7 +93,7 @@ export default async function (req: Request, res: Response) {
           lockingScript: new HashPuzzle().lock(pair.hash)
         })
       })
-      await tx.fee(new SatoshisPerKilobyte(1))
+      await tx.fee(new SatoshisPerKilobyte(100))
       await tx.sign()
       tokenCreationTxs.push(tx)
     }
@@ -122,6 +122,7 @@ export default async function (req: Request, res: Response) {
       const satoshis = 1
       const fileHash = null
       const confirmed = false
+      const spent = false
       return {
         txid,
         vout,
@@ -130,6 +131,7 @@ export default async function (req: Request, res: Response) {
         secret,
         fileHash,
         confirmed,
+        spent,
       }
     })
 

back/src/functions/allFunds.ts

@@ -25,7 +25,7 @@ import woc from '../woc'
 export default async function (req: Request, res: Response) {
     try {
         // Count available tokens (UTXOs not yet assigned to files)
-        const tokens = await db.collection('utxos').countDocuments({ fileHash: null, confirmed: true })
+        const tokens = await db.collection('utxos').countDocuments({ fileHash: null, confirmed: true, spent: { $ne: true } })
 
         // Get current UTXO set and calculate total balance
         const utxos = await woc.getUtxos(address)

back/src/functions/checkTreasury.ts

@@ -0,0 +1,123 @@
+/**
+ * UTXO Consolidation Endpoint
+ *
+ * This endpoint consolidates all available hash-locked UTXOs in the database into a single output.
+ * It gathers all the tokens created by the fund endpoint and combines them back into one UTXO
+ * locked to the treasury address.
+ *
+ * Process:
+ * 1. Retrieves all confirmed, unused UTXOs from the database
+ * 2. Creates a transaction with all UTXOs as inputs
+ * 3. Unlocks each input using its stored secret
+ * 4. Creates a single change output locked to the treasury address
+ * 5. Broadcasts the consolidation transaction
+ *
+ * @route POST /api/consolidate
+ * @returns {Object} Consolidation status
+ *          - txid: Transaction ID of the consolidation
+ *          - utxosConsolidated: Number of UTXOs combined
+ *          - totalSatoshis: Total satoshis consolidated
+ *
+ * Use Cases:
+ * - Reclaim unused tokens
+ * - Reduce UTXO fragmentation
+ * - Prepare treasury for new funding rounds
+ */
+
+import { Request, Response } from 'express'
+import { P2PKH, SatoshisPerKilobyte, Transaction } from '@bsv/sdk'
+import HashPuzzle from '../HashPuzzle'
+import db from '../db'
+import Arc from '../arc'
+import { address } from '../functions/address'
+
+export default async function (_req: Request, res: Response) {
+  try {
+    // Retrieve all confirmed, unused UTXOs from the database
+    const utxos = await db.collection('utxos').find({
+      confirmed: true,
+      fileHash: null,
+      invalid: null,
+      spent: { $ne: true }
+    }).toArray()
+
+    console.log({ utxosFound: utxos.length })
+
+    if (utxos.length === 0) {
+      res.send({ error: 'No UTXOs available to consolidate' })
+      return
+    }
+
+    // Calculate total satoshis being consolidated
+    const totalSatoshis = utxos.reduce((sum, utxo) => sum + utxo.satoshis, 0)
+
+    // Create consolidation transaction
+    const tx = new Transaction()
+
+    // Add each UTXO as an input
+    for (const utxo of utxos) {
+      // Retrieve the source transaction from the database
+      const sourceTransactionDoc = await db.collection('txs').findOne({ txid: utxo.txid })
+
+      if (!sourceTransactionDoc) {
+        console.error(`Source transaction not found for UTXO ${utxo.txid}:${utxo.vout}`)
+        continue
+      }
+
+      const sourceTransaction = Transaction.fromHexBEEF(sourceTransactionDoc.beef)
+
+      // Add input with hash puzzle unlock
+      tx.addInput({
+        sourceTransaction,
+        sourceOutputIndex: utxo.vout,
+        unlockingScriptTemplate: new HashPuzzle().unlock(utxo.secret.secret)
+      })
+    }
+
+    // Add single output back to treasury address
+    tx.addOutput({
+      change: true,
+      lockingScript: new P2PKH().lock(address)
+    })
+
+    // Calculate fees and sign transaction
+    await tx.fee(new SatoshisPerKilobyte(100))
+    await tx.sign()
+
+    // Broadcast transaction
+    const initialResponse = await tx.broadcast(Arc)
+    console.log({ initialResponse })
+
+    const txid = tx.id('hex')
+
+    // Store consolidation transaction in database
+    const txDbResponse = await db.collection('txs').insertOne({
+      txid,
+      beef: tx.toHexBEEF(),
+      arc: [initialResponse],
+      type: 'consolidation',
+      utxosConsolidated: utxos.length,
+      totalSatoshis
+    })
+
+    // Mark consolidated UTXOs as spent
+    await db.collection('utxos').updateMany(
+      {
+        _id: { $in: utxos.map(u => u._id) }
+      },
+      {
+        $set: { spent: true, spentInTx: txid }
+      }
+    )
+
+    res.send({
+      txid,
+      utxosConsolidated: utxos.length,
+      totalSatoshis,
+      txDbResponse
+    })
+  } catch (error) {
+    console.error('Failed to consolidate UTXOs', error)
+    res.status(500).json({ error: error.message })
+  }
+}

back/src/functions/consolidate.ts

@@ -75,15 +75,15 @@ export default async function (req: Request, res: Response) {
     })
     for (const pair of secretPairs) {
       tx.addOutput({
-        satoshis: 1,
+        satoshis: 10,
         lockingScript: new HashPuzzle().lock(pair.hash)
       })
     }
     tx.addOutput({
       change: true,
       lockingScript: new P2PKH().lock(address)
     })
-    await tx.fee(new SatoshisPerKilobyte(1))
+    await tx.fee(new SatoshisPerKilobyte(100))
     await tx.sign()
 
     // Broadcast transaction

back/src/functions/fund.ts

@@ -23,3 +23,4 @@ export { default as upload } from './upload'
 export { default as checkTreasury } from './checkTreasury'
 export { default as utxoStatusUpdate } from './utxoStatusUptate'
 export { default as allFunds } from './allFunds'
+export { default as consolidate } from './consolidate'

back/src/functions/index.ts

@@ -75,8 +75,7 @@ export default async function (req: Request, res: Response) {
       const fileHash = Utils.toHex(Hash.sha256(Utils.toArray(file.toString('hex'), 'hex')))
       console.log({ fileHash })
 
-      // For a 32 byte hash fees will always be 1
-      const fees = 1
+      // For a 32 byte hash fees will always be 10
       const utxo = await db.collection('utxos').findOneAndUpdate({ fileHash: null, confirmed: true, invalid: null }, { $set: { fileHash } })
 
       console.log({ utxo })

back/src/functions/upload.ts

@@ -1,5 +1,5 @@
 import express, { Application } from 'express'
-import { upload, download, callback, integrity, fund, checkTreasury, utxoStatusUpdate, allFunds } from './functions'
+import { upload, download, callback, integrity, fund, checkTreasury, utxoStatusUpdate, allFunds, consolidate } from './functions'
 import dotenv from 'dotenv'
 import cors from 'cors'
 dotenv.config()
@@ -38,6 +38,9 @@ app.use(express.json()).get('/checkTreasury', checkTreasury)
 // Update utxo status
 app.get('/utxoStatusUpdate', utxoStatusUpdate)
 
+// Consolidate all available utxos into a single output
+app.get('/consolidate', consolidate)
+
 app.listen(PORT, () => {
   console.log(`http://localhost:${PORT}`);
 })