@relay-federation/bridge 0.1.2 → 0.3.1

package/cli.js

@@ -6,7 +6,7 @@ import { PeerManager } from './lib/peer-manager.js'
 import { HeaderRelay } from './lib/header-relay.js'
 import { TxRelay } from './lib/tx-relay.js'
 import { StatusServer } from './lib/status-server.js'
-import { fetchUtxos, broadcastTx } from '@relay-federation/common/network'
+// network.js import removed — register/deregister now use local UTXOs + P2P broadcast
 
 const command = process.argv[2]
 
@@ -23,9 +23,18 @@ switch (command) {
   case 'status':
     await cmdStatus()
     break
+  case 'fund':
+    await cmdFund()
+    break
   case 'deregister':
     await cmdDeregister()
     break
+  case 'secret':
+    await cmdSecret()
+    break
+  case 'backfill':
+    await cmdBackfill()
+    break
   default:
     console.log('relay-bridge — Federated SPV relay mesh bridge\n')
     console.log('Commands:')
@@ -33,7 +42,10 @@ switch (command) {
     console.log('  register    Register this bridge on-chain')
     console.log('  start       Start the bridge server')
     console.log('  status      Show running bridge status')
+    console.log('  fund        Import a funding transaction (raw hex)')
     console.log('  deregister  Deregister this bridge from the mesh')
+    console.log('  secret      Show your operator secret for dashboard login')
+    console.log('  backfill    Scan historical blocks for inscriptions/tokens')
     console.log('')
     console.log('Usage: relay-bridge <command> [options]')
     process.exit(command ? 1 : 0)
@@ -51,15 +63,167 @@ async function cmdInit () {
   const config = await initConfig(dir)
 
   console.log('Bridge initialized!\n')
-  console.log(`  Config: ${dir}/config.json`)
-  console.log(`  Pubkey: ${config.pubkeyHex}`)
+  console.log(`  Name:     ${config.name}`)
+  console.log(`  Config:   ${dir}/config.json`)
+  console.log(`  Endpoint: ${config.endpoint}`)
+  console.log(`  Pubkey:   ${config.pubkeyHex}`)
+  console.log(`  Address:  ${config.address}`)
+  console.log(`  Secret:   ${config.statusSecret}`)
+  console.log('')
+  console.log('  Save your operator secret! You need it to log into the dashboard.')
   console.log('')
   console.log('Next steps:')
-  console.log('  1. Edit config.json — set your WSS endpoint and API key')
-  console.log('  2. Fund your bridge address with BSV')
+  console.log(`  1. Fund your bridge: send BSV to ${config.address}`)
+  console.log('  2. Import the funding tx: relay-bridge fund <rawTxHex>')
   console.log('  3. Run: relay-bridge register')
 }
 
+async function cmdSecret () {
+  const dir = defaultConfigDir()
+
+  if (!(await configExists(dir))) {
+    console.log('No config found. Run: relay-bridge init')
+    process.exit(1)
+  }
+
+  const config = await loadConfig(dir)
+
+  if (!config.statusSecret) {
+    console.log('No operator secret found in config.')
+    console.log('Add "statusSecret" to your config.json or re-initialize.')
+    process.exit(1)
+  }
+
+  console.log(`Operator secret: ${config.statusSecret}`)
+  console.log('')
+  console.log('Use this to log into the dashboard operator panel.')
+}
+
+async function cmdBackfill () {
+  const dir = defaultConfigDir()
+
+  if (!(await configExists(dir))) {
+    console.log('No config found. Run: relay-bridge init')
+    process.exit(1)
+  }
+
+  const config = await loadConfig(dir)
+  const { PersistentStore } = await import('./lib/persistent-store.js')
+  const { parseTx } = await import('./lib/output-parser.js')
+
+  const dataDir = config.dataDir || join(dir, 'data')
+  const store = new PersistentStore(dataDir)
+  await store.open()
+
+  // Parse CLI args: --from=HEIGHT --to=HEIGHT
+  const args = {}
+  for (const arg of process.argv.slice(3)) {
+    const [k, v] = arg.replace(/^--/, '').split('=')
+    if (k && v) args[k] = v
+  }
+
+  const fromHeight = parseInt(args.from || '800000', 10)
+  const toHeight = args.to === 'latest' || !args.to ? null : parseInt(args.to, 10)
+  const resumeHeight = await store.getMeta('backfill_height', null)
+  const startHeight = resumeHeight ? resumeHeight + 1 : fromHeight
+
+  console.log(`Backfill: scanning from block ${startHeight}${toHeight ? ' to ' + toHeight : ' to tip'}`)
+  if (resumeHeight) console.log(`  Resuming from height ${resumeHeight + 1}`)
+
+  let indexed = 0
+  let blocksScanned = 0
+  let height = startHeight
+
+  try {
+    while (true) {
+      // Get block hash for this height
+      const hashResp = await fetch(`https://api.whatsonchain.com/v1/bsv/main/block/height/${height}`)
+      if (!hashResp.ok) {
+        if (hashResp.status === 404) {
+          console.log(`  Height ${height} not found — reached chain tip`)
+          break
+        }
+        console.log(`  WoC error at height ${height}: ${hashResp.status}, retrying in 5s...`)
+        await new Promise(r => setTimeout(r, 5000))
+        continue
+      }
+      const blockInfo = await hashResp.json()
+      const blockHash = blockInfo.hash || blockInfo
+      const blockTime = blockInfo.time || 0
+
+      // Get block txid list
+      await new Promise(r => setTimeout(r, 350)) // rate limit
+      const txListResp = await fetch(`https://api.whatsonchain.com/v1/bsv/main/block/${blockHash}/page/1`)
+      if (!txListResp.ok) {
+        console.log(`  Failed to get tx list for block ${height}, skipping`)
+        height++
+        continue
+      }
+      const txids = await txListResp.json()
+
+      // For each txid, check if already applied, then fetch + parse
+      for (const txid of txids) {
+        // Idempotency: skip if already processed
+        const applied = await store.getMeta(`applied!${txid}`, null)
+        if (applied) continue
+
+        // Check if we already have this tx
+        let rawHex = await store.getTx(txid)
+        if (!rawHex) {
+          await new Promise(r => setTimeout(r, 350)) // rate limit
+          const txResp = await fetch(`https://api.whatsonchain.com/v1/bsv/main/tx/${txid}/hex`)
+          if (!txResp.ok) continue
+          rawHex = await txResp.text()
+          await store.putTx(txid, rawHex)
+        }
+
+        // Parse and check for inscriptions/BSV-20
+        const parsed = parseTx(rawHex)
+        let hasInterest = false
+
+        for (const output of parsed.outputs) {
+          if (output.type === 'ordinal' && output.parsed) {
+            await store.putInscription({
+              txid,
+              vout: output.vout,
+              contentType: output.parsed.contentType || null,
+              contentSize: output.parsed.content ? output.parsed.content.length / 2 : 0,
+              content: output.parsed.content || null,
+              isBsv20: output.parsed.isBsv20 || false,
+              bsv20: output.parsed.bsv20 || null,
+              timestamp: (blockTime || 0) * 1000,
+              address: output.hash160 || null
+            })
+            indexed++
+            hasInterest = true
+          }
+        }
+
+        // Mark tx as confirmed (trusting WoC block placement)
+        await store.updateTxStatus(txid, 'confirmed', { blockHash, height, source: 'backfill' })
+        await store.putMeta(`applied!${txid}`, { height, blockHash })
+      }
+
+      await store.putMeta('backfill_height', height)
+      blocksScanned++
+
+      if (blocksScanned % 100 === 0) {
+        console.log(`  Block ${height} — ${blocksScanned} scanned, ${indexed} inscriptions indexed`)
+      }
+
+      if (toHeight && height >= toHeight) break
+      height++
+    }
+  } catch (err) {
+    console.log(`  Backfill error at height ${height}: ${err.message}`)
+    console.log(`  Progress saved — resume with: relay-bridge backfill`)
+  } finally {
+    await store.close()
+  }
+
+  console.log(`Backfill complete: ${blocksScanned} blocks scanned, ${indexed} inscriptions indexed`)
+}
+
 async function cmdRegister () {
   const dir = defaultConfigDir()
 
@@ -75,18 +239,30 @@ async function cmdRegister () {
     process.exit(1)
   }
 
+  const { PersistentStore } = await import('./lib/persistent-store.js')
+  const { runRegister } = await import('./lib/actions.js')
+
+  const dataDir = config.dataDir || join(dir, 'data')
+  const store = new PersistentStore(dataDir)
+  await store.open()
+
   console.log('Registration details:\n')
-  console.log(`  Pubkey:       ${config.pubkeyHex}`)
-  console.log(`  Endpoint:     ${config.endpoint}`)
-  console.log(`  Mesh:         ${config.meshId}`)
-  console.log(`  Capabilities: ${config.capabilities.join(', ')}`)
-  console.log(`  SPV Endpoint: ${config.spvEndpoint}`)
-  console.log('')
-  console.log('On-chain registration requires:')
-  console.log('  - Funded wallet (stake bond + tx fees)')
-  console.log('  - Valid API key for SPV bridge access')
-  console.log('')
-  console.log('Broadcast support coming in Phase 2.')
+
+  try {
+    const result = await runRegister({
+      config,
+      store,
+      log: (type, msg) => console.log(type === 'done' ? msg : `  ${msg}`)
+    })
+    console.log('')
+    console.log('Your bridge will appear in peer lists on next scan cycle.')
+  } catch (err) {
+    console.log(`Registration failed: ${err.message}`)
+    await store.close()
+    process.exit(1)
+  }
+
+  await store.close()
 }
 
 async function cmdStart () {
@@ -98,18 +274,421 @@ async function cmdStart () {
   }
 
   const config = await loadConfig(dir)
-  const peerArg = process.argv[3] // optional: ws://host:port
+  const rawPeerArg = process.argv[3] // optional: ws://host:port
+  const peerArg = (rawPeerArg && !rawPeerArg.startsWith('-')) ? rawPeerArg : null
+
+  // ── 1. Open persistent store ──────────────────────────────
+  const { PersistentStore } = await import('./lib/persistent-store.js')
+  const { PrivateKey } = await import('@bsv/sdk')
+
+  const dataDir = config.dataDir || join(dir, 'data')
+  const store = new PersistentStore(dataDir)
+  await store.open()
+  console.log(`Database opened: ${dataDir}`)
+
+  // Load persisted balance
+  const balance = await store.getBalance()
+  if (balance > 0) {
+    console.log(`  Wallet balance: ${balance} satoshis`)
+  }
 
+  // ── 2. Core components ────────────────────────────────────
   const peerManager = new PeerManager({ maxPeers: config.maxPeers })
   const headerRelay = new HeaderRelay(peerManager)
   const txRelay = new TxRelay(peerManager)
 
-  // Start server
-  await peerManager.startServer({ port: config.port, host: '0.0.0.0' })
+  // ── 2b. Phase 2: Security layer ────────────────────────────
+  const { PeerScorer } = await import('./lib/peer-scorer.js')
+  const { ScoreActions } = await import('./lib/score-actions.js')
+  const { DataValidator } = await import('./lib/data-validator.js')
+  const { PeerHealth } = await import('./lib/peer-health.js')
+  const { AnchorManager } = await import('./lib/anchor-manager.js')
+  const { createHandshake } = await import('./lib/handshake.js')
+
+  const scorer = new PeerScorer()
+  const scoreActions = new ScoreActions(scorer, peerManager)
+  const dataValidator = new DataValidator(peerManager, scorer)
+  const peerHealth = new PeerHealth()
+  const anchorManager = new AnchorManager(peerManager, {
+    anchors: config.anchorBridges || []
+  })
+
+  const handshake = createHandshake({
+    wif: config.wif,
+    pubkeyHex: config.pubkeyHex,
+    endpoint: config.endpoint
+  })
+
+  // Wire peer health tracking
+  peerManager.on('peer:connect', ({ pubkeyHex }) => {
+    peerHealth.recordSeen(pubkeyHex)
+    scorer.setStakeAge(pubkeyHex, 7)
+  })
+
+  peerManager.on('peer:disconnect', ({ pubkeyHex }) => {
+    peerHealth.recordOffline(pubkeyHex)
+  })
+
+  // Wire peer:message → health.recordSeen (any message = peer is alive)
+  peerManager.on('peer:message', ({ pubkeyHex }) => {
+    peerHealth.recordSeen(pubkeyHex)
+  })
+
+  // Ping infrastructure — 60s interval, measures latency for scoring
+  const PING_INTERVAL_MS = 60000
+  const pendingPings = new Map() // pubkeyHex → timestamp
+
+  peerManager.on('peer:message', ({ pubkeyHex, message }) => {
+    if (message.type === 'ping') {
+      // Respond with pong
+      const conn = peerManager.peers.get(pubkeyHex)
+      if (conn) conn.send({ type: 'pong', nonce: message.nonce })
+    } else if (message.type === 'pong') {
+      // Record latency
+      const sentAt = pendingPings.get(pubkeyHex)
+      if (sentAt) {
+        const latency = Date.now() - sentAt
+        pendingPings.delete(pubkeyHex)
+        if (!peerHealth.isInGracePeriod(pubkeyHex)) {
+          scorer.recordPing(pubkeyHex, latency)
+        }
+      }
+    }
+  })
+
+  const pingTimer = setInterval(() => {
+    const nonce = Date.now().toString(36)
+    for (const [pubkeyHex, conn] of peerManager.peers) {
+      if (conn.connected) {
+        // Check for timed-out previous pings
+        if (pendingPings.has(pubkeyHex)) {
+          if (!peerHealth.isInGracePeriod(pubkeyHex)) {
+            scorer.recordPingTimeout(pubkeyHex)
+          }
+          pendingPings.delete(pubkeyHex)
+        }
+        pendingPings.set(pubkeyHex, Date.now())
+        conn.send({ type: 'ping', nonce })
+      }
+    }
+  }, PING_INTERVAL_MS)
+  if (pingTimer.unref) pingTimer.unref()
+
+  // Health check — every 10 minutes, detect inactive peers
+  const HEALTH_CHECK_INTERVAL_MS = 10 * 60 * 1000
+  const healthTimer = setInterval(() => {
+    const { grace, inactive } = peerHealth.checkAll()
+    for (const pk of inactive) {
+      console.log(`Peer inactive (7d+): ${pk.slice(0, 16)}...`)
+    }
+  }, HEALTH_CHECK_INTERVAL_MS)
+  if (healthTimer.unref) healthTimer.unref()
+
+  // Start anchor monitoring
+  anchorManager.startMonitoring()
+
+  console.log(`  Security: scoring, validation, health, anchors active`)
+
+  // ── 3. Address watcher — watch our own address + beacon ──
+  const { AddressWatcher } = await import('./lib/address-watcher.js')
+  const { addressToHash160 } = await import('./lib/output-parser.js')
+  const { BEACON_ADDRESS } = await import('@relay-federation/common/protocol')
+  const watcher = new AddressWatcher(txRelay, store)
+  watcher.watchPubkey(config.pubkeyHex, 'self')
+  const beaconHash160 = addressToHash160(BEACON_ADDRESS)
+  watcher.watchHash160(beaconHash160, 'beacon')
+  console.log(`  Watching own address + beacon (${BEACON_ADDRESS})`)
+
+  // ── 4. Gossip manager — P2P peer discovery ────────────────
+  const { GossipManager } = await import('./lib/gossip.js')
+  const privKey = PrivateKey.fromWif(config.wif)
+  const gossipManager = new GossipManager(peerManager, {
+    privKey,
+    pubkeyHex: config.pubkeyHex,
+    endpoint: config.endpoint,
+    meshId: config.meshId
+  })
+
+  // Add seed peers to gossip directory
+  const seedPeers = config.seedPeers || []
+  for (const seed of seedPeers) {
+    gossipManager.addSeed(seed)
+  }
+
+  // ── 4a. Registry — track registered pubkeys for handshake gating ──
+  const registeredPubkeys = new Set()
+  registeredPubkeys.add(config.pubkeyHex) // always trust self
+  const seedEndpoints = new Set()
+  for (const seed of seedPeers) {
+    if (seed.pubkeyHex) registeredPubkeys.add(seed.pubkeyHex)
+    const ep = typeof seed === 'string' ? seed : seed.endpoint
+    if (ep) seedEndpoints.add(ep)
+  }
+  console.log(`  Registry: ${registeredPubkeys.size} trusted pubkeys (self + seeds)`)
+
+  // ── 4b. Beacon address watcher — detect on-chain registrations ──
+  const { extractOpReturnData, decodePayload, PROTOCOL_PREFIX } = await import('../registry/lib/cbor.js')
+  const { Transaction: BsvTx } = await import('@bsv/sdk')
+
+  watcher.on('utxo:received', async ({ txid, hash160 }) => {
+    if (hash160 !== beaconHash160) return
+
+    try {
+      const rawHex = await store.getTx(txid)
+      if (!rawHex) return
+
+      const tx = BsvTx.fromHex(rawHex)
+      const opReturnOutput = tx.outputs.find(out =>
+        out.satoshis === 0 && out.lockingScript.toHex().startsWith('006a')
+      )
+      if (!opReturnOutput) return
+
+      const { prefix, cborBytes } = extractOpReturnData(opReturnOutput.lockingScript)
+      if (prefix !== PROTOCOL_PREFIX) return
+
+      const entry = decodePayload(cborBytes)
+
+      if (entry.action === 'register') {
+        const pubHex = Buffer.from(entry.pubkey).toString('hex')
+        if (pubHex === config.pubkeyHex) return // skip self
+
+        registeredPubkeys.add(pubHex)
+        gossipManager.addSeed({
+          pubkeyHex: pubHex,
+          endpoint: entry.endpoint,
+          meshId: entry.mesh_id
+        })
+        console.log(`Beacon: new registration detected — ${pubHex.slice(0, 16)}... @ ${entry.endpoint}`)
+        const stakeAgeDays = Math.max(0, (Date.now() / 1000 - entry.timestamp) / 86400)
+        scorer.setStakeAge(pubHex, stakeAgeDays)
+      } else if (entry.action === 'deregister') {
+        const pubHex = Buffer.from(entry.pubkey).toString('hex')
+        registeredPubkeys.delete(pubHex)
+        console.log(`Beacon: deregistration detected — ${pubHex.slice(0, 16)}...`)
+      }
+    } catch {
+      // Skip unparseable beacon txs
+    }
+  })
+
+
+  // ── Outbound handshake helper ──────────────────────────────
+  function performOutboundHandshake (conn) {
+    const { message: helloMsg, nonce } = handshake.createHello()
+    conn.send(helloMsg)
+
+    const onMessage = (msg) => {
+      if (msg.type === 'challenge_response') {
+        conn.removeListener('message', onMessage)
+        clearTimeout(timeout)
+        const result = handshake.handleChallengeResponse(msg, nonce, conn.isSeed ? null : registeredPubkeys)
+        if (result.error) {
+          console.log(`Handshake failed with ${conn.pubkeyHex.slice(0, 16)}...: ${result.error}`)
+          conn.destroy()
+          return
+        }
+        // Re-key if we didn't know their real pubkey
+        if (result.peerPubkey !== conn.pubkeyHex) {
+          peerManager.peers.delete(conn.pubkeyHex)
+          conn.pubkeyHex = result.peerPubkey
+        }
+
+        // Tie-break duplicate connections (inbound may have been accepted during handshake)
+        const existing = peerManager.peers.get(result.peerPubkey)
+        if (existing && existing !== conn) {
+          if (config.pubkeyHex > result.peerPubkey) {
+            // Higher pubkey drops outbound — keep existing inbound
+            console.log(`  Duplicate: keeping inbound from ${result.peerPubkey.slice(0, 16)}...`)
+            conn._shouldReconnect = false
+            conn.destroy()
+            return
+          }
+          // Lower pubkey keeps outbound — drop existing inbound
+          console.log(`  Duplicate: keeping outbound to ${result.peerPubkey.slice(0, 16)}...`)
+          existing._shouldReconnect = false
+          existing.destroy()
+        }
+
+        peerManager.peers.set(result.peerPubkey, conn)
+        // Learn seed pubkeys so future inbound connections from them pass registry check
+        if (conn.isSeed && !registeredPubkeys.has(result.peerPubkey)) {
+          registeredPubkeys.add(result.peerPubkey)
+          console.log(`  Seed pubkey learned: ${result.peerPubkey.slice(0, 16)}...`)
+        }
+        console.log(`  Peer identified: ${result.peerPubkey.slice(0, 16)}... (v${result.selectedVersion})`)
+
+        // Send verify to complete handshake
+        conn.send(result.message)
+        // Handshake complete — now safe to announce peer:connect
+        peerManager.emit('peer:connect', { pubkeyHex: conn.pubkeyHex, endpoint: conn.endpoint })
+      }
+    }
+    conn.on('message', onMessage)
+
+    // Timeout: if no challenge_response within 10s, drop
+    const timeout = setTimeout(() => {
+      conn.removeListener('message', onMessage)
+      if (!conn.connected) return
+      console.log(`Handshake timeout: ${conn.pubkeyHex.slice(0, 16)}...`)
+      conn.destroy()
+    }, 10000)
+    if (timeout.unref) timeout.unref()
+
+    // Clean up on close — prevent stale handler on reconnect
+    conn.once('close', () => {
+      clearTimeout(timeout)
+      conn.removeListener('message', onMessage)
+    })
+  }
+
+  // ── 5. Start server ───────────────────────────────────────
+  await peerManager.startServer({ port: config.port, host: '0.0.0.0', pubkeyHex: config.pubkeyHex, endpoint: config.endpoint, handshake, registeredPubkeys, seedEndpoints })
   console.log(`Bridge listening on port ${config.port}`)
   console.log(`  Pubkey: ${config.pubkeyHex}`)
   console.log(`  Mesh:   ${config.meshId}`)
 
+  // ── 6. Persistence layer — save headers/txs to LevelDB ───
+  headerRelay.on('header:new', async (header) => {
+    try { await store.putHeader(header) } catch {}
+  })
+
+  headerRelay.on('header:sync', async ({ headers }) => {
+    if (headers && headers.length) {
+      try { await store.putHeaders(headers) } catch {}
+    }
+  })
+
+  txRelay.on('tx:new', async ({ txid, rawHex }) => {
+    try { await store.putTx(txid, rawHex) } catch {}
+    try { await store.updateTxStatus(txid, 'mempool', { source: 'p2p' }) } catch {}
+    // Index inscriptions
+    try {
+      const { parseTx } = await import('./lib/output-parser.js')
+      const parsed = parseTx(rawHex)
+      for (const output of parsed.outputs) {
+        if (output.type === 'ordinal' && output.parsed) {
+          await store.putInscription({
+            txid,
+            vout: output.vout,
+            contentType: output.parsed.contentType || null,
+            contentSize: output.parsed.content ? output.parsed.content.length / 2 : 0,
+            isBsv20: output.parsed.isBsv20 || false,
+            bsv20: output.parsed.bsv20 || null,
+            timestamp: Date.now(),
+            address: output.hash160 || null
+          })
+        }
+      }
+    } catch {}
+  })
+
+  // ── 6b. BSV P2P header sync — connect to BSV nodes ──────
+  const { BSVNodeClient } = await import('./lib/bsv-node-client.js')
+  const bsvNode = new BSVNodeClient()
+
+  bsvNode.on('headers', async ({ headers, count }) => {
+    // Feed into HeaderRelay for peer propagation
+    const added = headerRelay.addHeaders(headers)
+    if (added > 0) {
+      console.log(`BSV P2P: synced ${added} headers (height: ${headerRelay.bestHeight})`)
+      // Persist to LevelDB
+      try { await store.putHeaders(headers) } catch {}
+      // Announce to federation peers
+      headerRelay.announceToAll()
+    }
+  })
+
+  bsvNode.on('connected', ({ host }) => {
+    console.log(`BSV P2P: connected to ${host}:8333`)
+  })
+
+  bsvNode.on('handshake', ({ userAgent, startHeight }) => {
+    console.log(`BSV P2P: handshake complete (${userAgent}, height: ${startHeight})`)
+  })
+
+  bsvNode.on('disconnected', () => {
+    console.log('BSV P2P: disconnected, will reconnect...')
+  })
+
+  bsvNode.on('error', (err) => {
+    // Don't crash — just log
+    if (err.code !== 'ECONNREFUSED' && err.code !== 'ETIMEDOUT') {
+      console.log(`BSV P2P: ${err.message}`)
+    }
+  })
+
+  // Auto-detect incoming payments: request txs announced via INV
+  bsvNode.on('tx:inv', ({ txids }) => {
+    for (const txid of txids) {
+      if (txRelay.seen.has(txid)) continue
+      bsvNode.getTx(txid, 10000).then(({ txid: id, rawHex }) => {
+        txRelay.broadcastTx(id, rawHex)
+      }).catch(() => {}) // ignore fetch failures
+    }
+  })
+
+  // Feed raw txs from BSV P2P into the mesh relay + address watcher
+  bsvNode.on('tx', ({ txid, rawHex }) => {
+    if (!txRelay.seen.has(txid)) {
+      txRelay.broadcastTx(txid, rawHex)
+    }
+  })
+
+  // Start the BSV P2P connection
+  bsvNode.connect()
+
+  // ── 7. Connect to peers ───────────────────────────────────
+  let gossipStarted = false
+
+  // Start gossip after first peer connection completes.
+  // With crypto handshake, peer:connect fires AFTER handshake verification,
+  // so gossip won't race the handshake anymore.
+  peerManager.on('peer:connect', () => {
+    if (!gossipStarted) {
+      gossipStarted = true
+      gossipManager.start()
+      gossipManager.requestPeersFromAll()
+      console.log('Gossip started')
+
+      // Periodic peer refresh — re-request peer lists every 10 minutes
+      // Catches registrations missed during downtime or initial gossip
+      const PEER_REFRESH_MS = 10 * 60 * 1000
+      const refreshTimer = setInterval(() => {
+        gossipManager.requestPeersFromAll()
+      }, PEER_REFRESH_MS)
+      if (refreshTimer.unref) refreshTimer.unref()
+    }
+  })
+
+  // Auto-connect to newly discovered peers (with reachability probe + IP diversity)
+  const { probeEndpoint } = await import('./lib/endpoint-probe.js')
+  const { checkIpDiversity } = await import('./lib/ip-diversity.js')
+
+  gossipManager.on('peer:discovered', async ({ pubkeyHex, endpoint }) => {
+    if (peerManager.peers.has(pubkeyHex) || pubkeyHex === config.pubkeyHex) return
+
+    // IP diversity check — prevent all peers clustering in one datacenter
+    const connectedEndpoints = [...peerManager.peers.values()]
+      .filter(c => c.endpoint).map(c => c.endpoint)
+    const diversity = checkIpDiversity(connectedEndpoints, endpoint)
+    if (!diversity.allowed) {
+      console.log(`IP diversity blocked: ${pubkeyHex.slice(0, 16)}... — ${diversity.reason}`)
+      return
+    }
+
+    const reachable = await probeEndpoint(endpoint)
+    if (!reachable) {
+      console.log(`Probe failed: ${pubkeyHex.slice(0, 16)}... ${endpoint} — skipping`)
+      return
+    }
+
+    console.log(`Discovered peer via gossip: ${pubkeyHex.slice(0, 16)}... ${endpoint}`)
+    const conn = peerManager.connectToPeer({ pubkeyHex, endpoint })
+    if (conn) {
+      conn.on('open', () => performOutboundHandshake(conn))
+    }
+  })
+
   if (peerArg) {
     // Manual peer connection
     console.log(`Connecting to peer: ${peerArg}`)
@@ -118,17 +697,24 @@ async function cmdStart () {
       endpoint: peerArg
     })
     if (conn) {
-      conn.on('open', () => {
-        conn.send({
-          type: 'hello',
-          pubkey: config.pubkeyHex,
-          endpoint: config.endpoint
-        })
-      })
+      conn.on('open', () => performOutboundHandshake(conn))
+    }
+  } else if (seedPeers.length > 0) {
+    // Connect to seed peers (accept both string URLs and {pubkeyHex, endpoint} objects)
+    console.log(`Connecting to ${seedPeers.length} seed peer(s)...`)
+    for (let i = 0; i < seedPeers.length; i++) {
+      const seed = seedPeers[i]
+      const endpoint = typeof seed === 'string' ? seed : seed.endpoint
+      const pubkey = typeof seed === 'string' ? `seed_${i}` : seed.pubkeyHex
+      const conn = peerManager.connectToPeer({ pubkeyHex: pubkey, endpoint })
+      if (conn) {
+        conn.isSeed = true
+        conn.on('open', () => performOutboundHandshake(conn))
+      }
     }
   } else if (config.apiKey) {
-    // Scan chain for peers
-    console.log('Scanning chain for peers...')
+    // Fallback: scan chain for peers (legacy mode)
+    console.log('No seed peers configured. Scanning chain for peers...')
     try {
       const { scanRegistry } = await import('../registry/lib/scanner.js')
       const { buildPeerList, excludeSelf } = await import('../registry/lib/discovery.js')
@@ -151,13 +737,7 @@ async function cmdStart () {
       for (const peer of peers) {
         const conn = peerManager.connectToPeer(peer)
         if (conn) {
-          conn.on('open', () => {
-            conn.send({
-              type: 'hello',
-              pubkey: config.pubkeyHex,
-              endpoint: config.endpoint
-            })
-          })
+          conn.on('open', () => performOutboundHandshake(conn))
         }
       }
     } catch (err) {
@@ -165,44 +745,105 @@ async function cmdStart () {
       console.log('Start with manual peer: relay-bridge start ws://peer:port')
     }
   } else {
-    console.log('No peer specified and no API key configured.')
+    console.log('No seed peers, no manual peer, and no API key configured.')
     console.log('Usage: relay-bridge start ws://peer:port')
+    console.log('   or: Add seedPeers to config.json')
   }
 
-  // Start status server (localhost only)
+  // ── 8. Status server ──────────────────────────────────────
   const statusPort = config.statusPort || 9333
   const statusServer = new StatusServer({
     port: statusPort,
     peerManager,
     headerRelay,
     txRelay,
-    config
+    config,
+    scorer,
+    peerHealth,
+    bsvNodeClient: bsvNode,
+    store,
+    performOutboundHandshake,
+    registeredPubkeys,
+    gossipManager
   })
   await statusServer.start()
+  statusServer.startAppMonitoring()
   console.log(`  Status: http://127.0.0.1:${statusPort}/status`)
 
-  // Log events
+  // ── 9. Log events (dual: console + status server ring buffer) ──
   peerManager.on('peer:connect', ({ pubkeyHex }) => {
-    console.log(`Peer connected: ${pubkeyHex}`)
+    const msg = `Peer connected: ${pubkeyHex.slice(0, 16)}...`
+    console.log(msg)
+    statusServer.addLog(msg)
   })
 
   peerManager.on('peer:disconnect', ({ pubkeyHex }) => {
-    console.log(`Peer disconnected: ${pubkeyHex}`)
+    const msg = `Peer disconnected: ${pubkeyHex ? pubkeyHex.slice(0, 16) + '...' : 'unknown'}`
+    console.log(msg)
+    statusServer.addLog(msg)
   })
 
   headerRelay.on('header:sync', ({ pubkeyHex, added, bestHeight }) => {
-    console.log(`Synced ${added} headers from ${pubkeyHex} (height: ${bestHeight})`)
+    const msg = `Synced ${added} headers from ${pubkeyHex.slice(0, 16)}... (height: ${bestHeight})`
+    console.log(msg)
+    statusServer.addLog(msg)
   })
 
   txRelay.on('tx:new', ({ txid }) => {
-    console.log(`New tx: ${txid}`)
+    const msg = `New tx: ${txid}`
+    console.log(msg)
+    statusServer.addLog(msg)
+  })
+
+  watcher.on('utxo:received', ({ txid, vout, satoshis }) => {
+    const msg = `UTXO received: ${txid}:${vout} (${satoshis} sat)`
+    console.log(msg)
+    statusServer.addLog(msg)
+  })
+
+  watcher.on('utxo:spent', ({ txid, vout, spentByTxid }) => {
+    const msg = `UTXO spent: ${txid.slice(0, 16)}...:${vout} by ${spentByTxid.slice(0, 16)}...`
+    console.log(msg)
+    statusServer.addLog(msg)
+  })
+
+  // Phase 2 events
+  scoreActions.on('peer:disconnected', ({ pubkeyHex, score }) => {
+    console.log(`Score disconnect: ${pubkeyHex.slice(0, 16)}... (score: ${score.toFixed(2)})`)
+  })
+
+  scoreActions.on('peer:blacklisted', ({ pubkeyHex, score }) => {
+    console.log(`Blacklisted: ${pubkeyHex.slice(0, 16)}... (score: ${score.toFixed(2)}, 24h)`)
+  })
+
+  dataValidator.on('validation:fail', ({ pubkeyHex, type, reason }) => {
+    console.log(`Bad data from ${pubkeyHex.slice(0, 16)}...: ${type} — ${reason}`)
+  })
+
+  anchorManager.on('anchor:disconnect', ({ pubkeyHex }) => {
+    console.log(`Anchor disconnected: ${pubkeyHex.slice(0, 16)}...`)
   })
 
-  // Graceful shutdown
+  anchorManager.on('anchor:low_score', ({ pubkeyHex, score }) => {
+    console.log(`Anchor low score: ${pubkeyHex.slice(0, 16)}... (${score.toFixed(2)})`)
+  })
+
+  peerHealth.on('peer:recovered', ({ pubkeyHex }) => {
+    console.log(`Peer recovered: ${pubkeyHex.slice(0, 16)}...`)
+  })
+
+  // ── 10. Graceful shutdown ─────────────────────────────────
   const shutdown = async () => {
     console.log('\nShutting down...')
+    clearInterval(pingTimer)
+    clearInterval(healthTimer)
+    anchorManager.stopMonitoring()
+    bsvNode.disconnect()
+    gossipManager.stop()
     await statusServer.stop()
     await peerManager.shutdown()
+    await store.close()
+    console.log('Database closed.')
     process.exit(0)
   }
 
@@ -266,9 +907,34 @@ async function cmdStatus () {
   console.log('  Transactions')
   console.log(`    Mempool: ${status.txs.mempool}`)
   console.log(`    Seen:    ${status.txs.seen}`)
+
+  // BSV Node
+  if (status.bsvNode) {
+    console.log('')
+    console.log('  BSV Node')
+    console.log(`    Status: ${status.bsvNode.connected ? 'Connected' : 'Disconnected'}`)
+    console.log(`    Host:   ${status.bsvNode.host || '-'}`)
+    console.log(`    Height: ${status.bsvNode.height || '-'}`)
+  }
+
+  // Wallet
+  if (status.wallet) {
+    console.log('')
+    console.log('  Wallet')
+    console.log(`    Balance: ${status.wallet.balanceSats !== null ? status.wallet.balanceSats + ' sats' : '-'}`)
+  }
 }
 
-async function cmdDeregister () {
+async function cmdFund () {
+  const rawHex = process.argv[3]
+  if (!rawHex) {
+    console.log('Usage: relay-bridge fund <rawTxHex>')
+    console.log('')
+    console.log('  Provide the raw hex of a transaction that pays to this bridge.')
+    console.log('  Get the raw hex from your wallet or a block explorer after sending BSV.')
+    process.exit(1)
+  }
+
   const dir = defaultConfigDir()
 
   if (!(await configExists(dir))) {
@@ -277,50 +943,64 @@ async function cmdDeregister () {
   }
 
   const config = await loadConfig(dir)
+  const { PersistentStore } = await import('./lib/persistent-store.js')
+  const { runFund } = await import('./lib/actions.js')
 
-  if (!config.apiKey) {
-    console.log('Error: API key required for deregistration (broadcasts via SPV bridge).')
-    console.log('Set "apiKey" in config.json.')
+  const dataDir = config.dataDir || join(dir, 'data')
+  const store = new PersistentStore(dataDir)
+  await store.open()
+
+  try {
+    await runFund({
+      config,
+      store,
+      rawHex,
+      log: (type, msg) => console.log(`  ${msg}`)
+    })
+  } catch (err) {
+    console.log(`Fund failed: ${err.message}`)
     process.exit(1)
+  } finally {
+    await store.close()
   }
+}
 
-  const reason = process.argv[3] || 'shutdown'
-
-  console.log('Deregistration details:\n')
-  console.log(`  Pubkey: ${config.pubkeyHex}`)
-  console.log(`  Reason: ${reason}`)
-  console.log(`  SPV:    ${config.spvEndpoint}`)
-  console.log('')
+async function cmdDeregister () {
+  const dir = defaultConfigDir()
 
-  try {
-    const { buildDeregistrationTx } = await import('../registry/lib/registration.js')
+  if (!(await configExists(dir))) {
+    console.log('No config found. Run: relay-bridge init')
+    process.exit(1)
+  }
 
-    // Fetch UTXOs from SPV bridge
-    const utxos = await fetchUtxos(config.spvEndpoint, config.apiKey, config.pubkeyHex)
+  const config = await loadConfig(dir)
+  const reason = process.argv[3] || 'shutdown'
 
-    if (!utxos.length) {
-      console.log('Error: No UTXOs found. Wallet needs funding for tx fees.')
-      process.exit(1)
-    }
+  const { PersistentStore } = await import('./lib/persistent-store.js')
+  const { runDeregister } = await import('./lib/actions.js')
 
-    // Build deregistration tx
-    const { txHex, txid } = await buildDeregistrationTx({
-      wif: config.wif,
-      utxos,
-      reason
-    })
+  const dataDir = config.dataDir || join(dir, 'data')
+  const store = new PersistentStore(dataDir)
+  await store.open()
 
-    // Broadcast via SPV bridge
-    await broadcastTx(config.spvEndpoint, config.apiKey, txHex)
+  console.log('Deregistration details:\n')
 
-    console.log('Deregistration broadcast successful!')
-    console.log(`  txid: ${txid}`)
+  try {
+    await runDeregister({
+      config,
+      store,
+      reason,
+      log: (type, msg) => console.log(type === 'done' ? msg : `  ${msg}`)
+    })
     console.log('')
     console.log('Your bridge will be removed from peer lists on next scan cycle.')
   } catch (err) {
     console.log(`Deregistration failed: ${err.message}`)
+    await store.close()
     process.exit(1)
   }
+
+  await store.close()
 }
 
 function formatUptime (seconds) {