update

Author: cmd

src/client/class/contract.ts

@@ -31,14 +31,14 @@ export class EscrowContract extends EventEmitter {
   }
 
   get tab () {
-    const { agent_fee, balance, pending, terms, subtotal, txfee, total } = this.data
+    const { agent_fee, balance, pending, terms, subtotal, est_txfee, total } = this.data
     return {
       balance,
       agent_fee : agent_fee[0],
       payments  : terms.payments.reduce((a, b) => a + b[0], 0),
       pending,
       subtotal,
-      txfee,
+      txfee     : est_txfee,
       total
     }
   }

src/lib/contract.ts

@@ -30,8 +30,8 @@ export function create_contract (
   const published  = config.published  ?? now()
   const signatures = config.signatures ?? []
   const subtotal   = terms.value + agent_fee[0]
-  const txout_size = outputs[0][1].length / 2
-  const txfee      = txout_size * feerate
+  const vout_size  = outputs[0][1].length / 2
+  const txfee      = vout_size * feerate
 
   return sort_record({
     ...config.agent,
@@ -40,6 +40,8 @@ export function create_contract (
     balance     : 0,
     cid         : config.cid,
     deadline    : get_deadline(terms, published),
+    est_txfee   : txfee,
+    est_txsize  : vout_size,
     expires_at  : null,
     feerate     : feerate,
     moderator   : config.moderator ?? null,
@@ -58,11 +60,9 @@ export function create_contract (
     subtotal    : subtotal,
     terms       : terms,
     total       : subtotal + txfee,
-    txfee       : txfee,
-    txvin_size  : 0,
-    txout_size  : txout_size,
     updated_at  : published,
-    vm_state    : null
+    vm_state    : null,
+    vout_size   : vout_size
   })
 }
 

src/lib/return.ts

@@ -29,7 +29,7 @@ import {
 
 import * as assert from '../assert.js'
 
-const MIN_RECOVER_FEE = 10000
+const MIN_RECOVER_FEE = 1000
 
 /**
  * Computes and returns a context 

src/schema/contract.ts

@@ -28,6 +28,8 @@ const data = z.object({
   balance     : num,
   cid         : hash,
   deadline    : stamp,
+  est_txfee   : num,
+  est_txsize  : num,
   expires_at  : stamp.nullable(),
   feerate     : num,
   outputs     : output.array(),
@@ -41,11 +43,9 @@ const data = z.object({
   subtotal    : num,
   terms,
   total       : num,
-  txfee       : num,
-  txvin_size  : num,
-  txout_size  : num,
   updated_at  : stamp,
   vm_state    : vm.data.nullable(),
+  vout_size   : num
 }).and(agent).and(spend_state).and(close_state)
 
 export default { agent, data, output, request, status }

src/types/contract.ts

@@ -38,6 +38,8 @@ export interface ContractBase {
   balance     : number
   cid         : string
   deadline    : number
+  est_txfee   : number
+  est_txsize  : number
   expires_at  : null | number
   feerate     : number
   moderator   : string | null
@@ -51,11 +53,9 @@ export interface ContractBase {
   subtotal    : number
   terms       : ProposalData
   total       : number
-  txfee       : number
-  txvin_size  : number
-  txout_size  : number
   updated_at  : number
   vm_state    : null | StateData
+  vout_size   : number
 }
 
 export type ContractRequest = {

test/client/proposal/configure_clients.ts

@@ -7,7 +7,7 @@ import {
 
 const config = {
   hostname : 'http://localhost:3000',
-  oracle   : 'http://172.21.0.3:3000'
+  oracle   : 'http://172.21.0.3:3300'
 }
 
 const aliases = [ 'alice', 'bob', 'carol', 'david' ]

test/client/scripts/full_demo.ts

@@ -24,7 +24,7 @@ const VERBOSE = process.env.VERBOSE === 'true'
 
 // Startup a local process of Bitcoin Core for testing.
 
-const config = CONFIG.mutiny
+const config = CONFIG.regtest
 const core   = CoreUtil.get_daemon(config.core)
 const cli    = await core.startup()
 
@@ -120,76 +120,84 @@ if (VERBOSE) {
   console.dir(contract, { depth : null })
 }
 
-// Request an account for the member to use.
-const account_res = await client.deposit.request({
-  pubkey   : a_mbr.pubkey,
-  locktime : 60 * 60 // 1 hour locktime
-})
+const is_regtest = config.core.network === 'regtest'
 
-// Check the response is valid.
-if (!account_res.ok) throw new Error(account_res.error)
+const deposits : [ EscrowSigner, number ][] = [
+  [ a_mbr, 10_000 ],
+  [ b_mbr, 6_980  ]
+]
 
-// Unpack some of the terms.
-const { account } = account_res.data
+for (const [ mbr, amt ] of deposits) {
 
-if (VERBOSE) {
-  print_banner('NEW ACCOUNT')
-  console.dir(account, { depth : null })
-}
+  // Request an account for the member to use.
+  const account_res = await client.deposit.request({
+    pubkey   : a_mbr.pubkey,
+    locktime : 60 * 60 // 1 hour locktime
+  })
 
-const { address, agent_id } = account
+  // Check the response is valid.
+  if (!account_res.ok) throw new Error(account_res.error)
 
-// Use our utility methods to fund the address and get the utxo.
-const is_regtest = config.core.network === 'regtest'
-const txid = await CoreUtil.fund_address(cli, 'faucet', address, 20_000, is_regtest)
+  // Unpack some of the terms.
+  const { account } = account_res.data
 
-if (VERBOSE) {
-  print_banner('DEPOSIT TXID')
-  console.log(txid)
-  console.log('\nsleeping for 2s while tx propagates...')
-}
+  if (VERBOSE) {
+    print_banner(`NEW ACCOUNT`)
+    console.dir(account, { depth : null })
+  }
 
-await sleep(2000)
-
-const limit = 10
-  let fails = 0,
-      utxo  = await client.oracle.get_utxo({ txid, address })
-
-while (!is_regtest && utxo === null && fails < limit) {
-  try {
-    console.log('sleeping for 5s...')
-    await sleep(5000)
-    console.log('fetching utxo...')
-    utxo = await client.oracle.get_utxo({ txid, address })
-    if (utxo === null) throw 'utxo not found'
-  } catch (err) {
-    console.log(err)
-    fails += 1
-    continue
+  const { address, agent_id } = account
+
+  const txid = await CoreUtil.fund_address(cli, 'faucet', address, amt, is_regtest)
+
+  if (VERBOSE) {
+    print_banner('DEPOSIT TXID')
+    console.log(txid)
+    console.log('\nsleeping for 2s while tx propagates...')
   }
-}
 
-if (utxo === null) throw new Error('utxo not found')
+  await sleep(2000)
+
+  const limit = 10
+    let fails = 0,
+        utxo  = await client.oracle.get_utxo({ txid, address })
+
+  while (!is_regtest && utxo === null && fails < limit) {
+    try {
+      console.log('sleeping for 5s...')
+      await sleep(5000)
+      console.log('fetching utxo...')
+      utxo = await client.oracle.get_utxo({ txid, address })
+      if (utxo === null) throw 'utxo not found'
+    } catch (err) {
+      console.log(err)
+      fails += 1
+      continue
+    }
+  }
 
-// Request the member to sign
-const return_tx = await a_mbr.deposit.register_utxo(account, utxo.txspend)
-const covenant  = await a_mbr.deposit.commit_utxo(account, contract, utxo.txspend)
+  if (utxo === null) throw new Error('utxo not found')
 
-// Fund the contract directly with the API.
-const deposit_res = await client.deposit.fund(agent_id, return_tx, covenant)
+  // Request the member to sign
+  const return_tx = await a_mbr.deposit.register_utxo(account, utxo.txspend)
+  const covenant  = await a_mbr.deposit.commit_utxo(account, contract, utxo.txspend)
 
-// Check the response is valid.
-if (!deposit_res.ok) throw new Error(deposit_res.error)
+  // Fund the contract directly with the API.
+  const deposit_res = await client.deposit.fund(agent_id, return_tx, covenant)
 
-let deposit = deposit_res.data.deposit
+  // Check the response is valid.
+  if (!deposit_res.ok) throw new Error(deposit_res.error)
 
-contract = deposit_res.data.contract
+  const deposit = deposit_res.data.deposit
 
-if (VERBOSE) {
-  print_banner('NEW DEPOSIT')
-  console.dir(deposit, { depth : null })
-  print_banner('UPDATED CONTRACT')
-  console.dir(contract, { depth : null })
+  contract = deposit_res.data.contract
+
+  if (VERBOSE) {
+    print_banner(`NEW DEPOSIT FROM ${mbr.pubkey}`)
+    console.dir(deposit, { depth : null })
+    print_banner('UPDATED CONTRACT')
+    console.dir(contract, { depth : null })
+  }
 }
 
 if (contract.status !== 'active') {

test/demo/07_fund_contract.ts

@@ -6,10 +6,13 @@ import { account }      from './06_request_deposit.js'
 
 const { address, agent_id } = account
 
+const vin_fee   = contract.feerate * 65
+const amt_total = contract.total + vin_fee
+
 print_banner('make a deposit')
 
 console.log('copy this address :', address)
-console.log('send this amount  :', contract.total, 'sats')
+console.log('send this amount  :', amt_total, 'sats')
 if (contract.terms.network === 'signet') {
   console.log('get funds here    : https://faucet.mutinynet.com')
 } else if (contract.terms.network === 'testnet') {