improved tests, added fee stimation web

Author: KyrylR

Cargo.lock

@@ -40,7 +40,7 @@ simplicity-contracts = { workspace = true }
 anyhow = "1"
 cargo-husky = { workspace = true }
 lwk_common = "0.15.0"
-lwk_simplicity = { git = "https://github.com/KyrylR/lwk", rev = "fd33ba1", features = ["wallet_abi_test_utils"] }
+lwk_simplicity = { path = "../../../lwk/lwk_simplicity", features = ["wallet_abi_test_utils"] }
 lwk_wollet = { version = "0.15.0", default-features = false, features = ["electrum", "esplora"] }
 minreq = "2.14.1"
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "time"] }

crates/contracts/Cargo.toml

@@ -471,6 +471,7 @@ impl LendingScenario {
                 ],
             ))
             .await?;
+        harness.mine_and_sync(1).await?;
         let principal_lend_utxo = harness.find_output(&split_tx, |tx_out| {
             tx_out.script_pubkey == *harness.wallet_script_25()
                 && tx_out.asset.explicit() == Some(principal_asset_id)

crates/contracts/tests/support/wallet_abi_lending_support.rs

@@ -33,7 +33,7 @@ function shortId(value: string, head = 8, tail = 4): string {
 }
 
 function WalletSessionMenu() {
-  const { signingXOnlyPubkey, network, disconnect } = useWalletAbiSession()
+  const { signingXOnlyPubkey, network, reconnect, disconnect } = useWalletAbiSession()
   const [open, setOpen] = useState(false)
   const ref = useRef<HTMLDivElement | null>(null)
 
@@ -66,14 +66,25 @@ function WalletSessionMenu() {
           </p>
           <p className="mt-3 text-sm text-neutral-600">Network: {network ?? 'unknown'}</p>
           <p className="mt-2 break-all font-mono text-xs text-neutral-800">{signingXOnlyPubkey}</p>
+          <button
+            type="button"
+            onClick={(event: ReactMouseEvent<HTMLButtonElement>) => {
+              event.preventDefault()
+              setOpen(false)
+              void reconnect()
+            }}
+            className="mt-4 w-full rounded-full bg-neutral-950 px-4 py-2 text-sm font-medium text-white hover:bg-neutral-800"
+          >
+            Reconnect
+          </button>
           <button
             type="button"
             onClick={(event: ReactMouseEvent<HTMLButtonElement>) => {
               event.preventDefault()
               setOpen(false)
               void disconnect()
             }}
-            className="mt-4 w-full rounded-full border border-neutral-300 bg-white px-4 py-2 text-sm font-medium text-neutral-800 hover:bg-neutral-50"
+            className="mt-3 w-full rounded-full border border-neutral-300 bg-white px-4 py-2 text-sm font-medium text-neutral-800 hover:bg-neutral-50"
           >
             Disconnect
           </button>

web/src/App.tsx

@@ -0,0 +1,62 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { DEFAULT_FEE_RATE_SAT_KVB, EsploraClient, resolveWalletFeeRateSatKvb } from './esplora'
+
+describe('Esplora fee estimates', () => {
+  const fetchMock = vi.fn()
+
+  beforeEach(() => {
+    vi.stubGlobal('fetch', fetchMock)
+  })
+
+  afterEach(() => {
+    fetchMock.mockReset()
+    vi.unstubAllGlobals()
+  })
+
+  it('uses the exact target when Esplora returns it', async () => {
+    fetchMock.mockResolvedValueOnce(
+      new Response(JSON.stringify({ 1: 0.25, 6: 0.1 }), { status: 200 })
+    )
+
+    const client = new EsploraClient('https://esplora.example')
+
+    await expect(client.getFeeRateSatKvb(1)).resolves.toBe(250)
+    expect(fetchMock).toHaveBeenCalledWith('https://esplora.example/fee-estimates', {
+      signal: expect.any(AbortSignal),
+    })
+  })
+
+  it('falls back to the next higher target when the exact one is missing', async () => {
+    fetchMock.mockResolvedValueOnce(
+      new Response(JSON.stringify({ 2: 0.5, 144: 0.1 }), { status: 200 })
+    )
+
+    const client = new EsploraClient('https://esplora.example')
+
+    await expect(client.getFeeRateSatKvb(1)).resolves.toBe(500)
+  })
+
+  it('uses any available numeric target when no higher target exists', async () => {
+    fetchMock.mockResolvedValueOnce(new Response(JSON.stringify({ 144: 0.2 }), { status: 200 }))
+
+    const client = new EsploraClient('https://esplora.example')
+
+    await expect(client.getFeeRateSatKvb(1008)).resolves.toBe(200)
+  })
+
+  it('returns the hardcoded fallback when fee estimates are unusable', async () => {
+    fetchMock.mockResolvedValueOnce(new Response(JSON.stringify({ foo: 'bar' }), { status: 200 }))
+
+    const client = new EsploraClient('https://esplora.example')
+
+    await expect(resolveWalletFeeRateSatKvb(client)).resolves.toBe(DEFAULT_FEE_RATE_SAT_KVB)
+  })
+
+  it('returns the hardcoded fallback when the fee request fails', async () => {
+    fetchMock.mockRejectedValueOnce(new Error('network down'))
+
+    const client = new EsploraClient('https://esplora.example')
+
+    await expect(resolveWalletFeeRateSatKvb(client)).resolves.toBe(DEFAULT_FEE_RATE_SAT_KVB)
+  })
+})

web/src/api/esplora.test.ts

@@ -10,6 +10,8 @@ import { getEsploraApiBaseUrl, getEsploraExplorerBaseUrl } from '../config/runti
 
 /** Default request timeout in milliseconds. */
 export const DEFAULT_TIMEOUT_MS = 30_000
+export const DEFAULT_ESPLORA_FEE_TARGET_BLOCKS = 1
+export const DEFAULT_FEE_RATE_SAT_KVB = 100
 
 function normalizeBaseUrl(value?: string): string | undefined {
   if (typeof value !== 'string' || !value.trim()) {
@@ -30,6 +32,41 @@ function getExplorerBaseUrl(apiBaseUrl: string): string {
   return apiBaseUrl
 }
 
+function isValidFeeEstimateEntry(target: number, rate: number): boolean {
+  return Number.isInteger(target) && target > 0 && Number.isFinite(rate) && rate > 0
+}
+
+function parseFeeEstimateEntries(
+  estimates: Record<string, number>
+): Array<readonly [number, number]> {
+  return Object.entries(estimates)
+    .map(([target, rate]) => [Number(target), rate] as const)
+    .filter(([target, rate]) => isValidFeeEstimateEntry(target, rate))
+    .sort(([leftTarget], [rightTarget]) => leftTarget - rightTarget)
+}
+
+export function selectFeeRateSatVb(
+  estimates: Record<string, number>,
+  targetBlocks: number
+): number {
+  const entries = parseFeeEstimateEntries(estimates)
+  if (entries.length === 0) {
+    throw new EsploraApiError('No fee estimates available')
+  }
+
+  const exactEntry = entries.find(([target]) => target === targetBlocks)
+  if (exactEntry) {
+    return exactEntry[1]
+  }
+
+  const higherTargetEntry = entries.find(([target]) => target > targetBlocks)
+  if (higherTargetEntry) {
+    return higherTargetEntry[1]
+  }
+
+  return entries[0][1]
+}
+
 export class EsploraApiError extends Error {
   readonly status: number | undefined
   readonly body: string | undefined
@@ -162,6 +199,39 @@ export class EsploraClient {
     return height
   }
 
+  /** GET /fee-estimates — confirmation target to fee rate map in sat/vB. */
+  async getFeeEstimates(): Promise<Record<string, number>> {
+    const body = await this.get('/fee-estimates')
+    try {
+      const raw = JSON.parse(body) as unknown
+      if (raw === null || typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new EsploraApiError('Expected fee estimate object')
+      }
+
+      return Object.fromEntries(
+        Object.entries(raw).filter(
+          ([target, rate]) =>
+            Number.isInteger(Number(target)) &&
+            Number(target) > 0 &&
+            typeof rate === 'number' &&
+            Number.isFinite(rate) &&
+            rate > 0
+        )
+      )
+    } catch (e) {
+      if (e instanceof EsploraApiError) throw e
+      throw new EsploraApiError(
+        `Failed to parse fee estimates: ${e instanceof Error ? e.message : String(e)}`
+      )
+    }
+  }
+
+  /** Resolve a fee rate for the target in sats/kvB. */
+  async getFeeRateSatKvb(targetBlocks: number): Promise<number> {
+    const feeRateSatVb = selectFeeRateSatVb(await this.getFeeEstimates(), targetBlocks)
+    return feeRateSatVb * 1000
+  }
+
   /** Block hash at a given height. */
   async getBlockHashAtHeight(blockHeight: number): Promise<string> {
     const body = await this.get(`/block-height/${blockHeight}`)
@@ -383,6 +453,18 @@ export interface EsploraOutspend {
   [key: string]: unknown
 }
 
+export async function resolveWalletFeeRateSatKvb(
+  esplora: Pick<EsploraClient, 'getFeeRateSatKvb'>,
+  targetBlocks: number = DEFAULT_ESPLORA_FEE_TARGET_BLOCKS,
+  fallbackFeeRateSatKvb: number = DEFAULT_FEE_RATE_SAT_KVB
+): Promise<number> {
+  try {
+    return await esplora.getFeeRateSatKvb(targetBlocks)
+  } catch {
+    return fallbackFeeRateSatKvb
+  }
+}
+
 /**
  * Hash script_pubkey (hex) to 32-byte script hash (SHA256).
  * Matches Rust hash_script; use this for PreLockArguments script hashes.