update

demo/client/contract/payment.ts

@@ -5,10 +5,10 @@ import { print_banner } from '@scrow/test'
 
 const funder = signers[0]
 
-contract.on('payment', () => {
-  print_banner('new payment')
-  console.dir(account.payments, { depth : null })
-  console.log('\n')
-})
+// contract.on('payment', () => {
+//   print_banner('new payment')
+//   console.dir(account.payments, { depth : null })
+//   console.log('\n')
+// })
 
 await deposit.lock(contract.data, funder)

src/client/class/contract.ts

@@ -7,9 +7,11 @@ import { EscrowSigner }      from './signer.js'
 
 import {
   ContractData,
+  ContractDigest,
   ContractStatus,
   DraftData
 } from '@/types/index.js'
+import { update_contract } from '@/lib/contract.js'
 
 interface EscrowContractConfig {
   refresh_ival : number
@@ -122,9 +124,8 @@ export class EscrowContract extends EventEmitter <{
     try {
       if (this.is_stale || force) {
         const res = await this._status()
-        if (res.status !== this.status) {
-          const data = await this._digest()
-          this._update(data)
+        if (res.updated) {
+          this._update(res.contract)
         } else {
           this._updated = now()
         }
@@ -149,14 +150,14 @@ export class EscrowContract extends EventEmitter <{
     const api = this.client.contract
     const res = await api.status(this.cid)
     if (!res.ok) throw new Error(res.error)
-    return res.data.contract
+    return res.data
   }
 
-  _update (data : ContractData) {
-    const changed = (data.status !== this.status)
+  async _update (updated : ContractData | ContractDigest) {
+    const changed = (updated.status !== this.status)
     try {
-
-      this._data    = data 
+      const data    = this.data
+      this._data    = await update_contract(data, updated)
       this._updated = now()
       if (changed) this.emit('status', data.status)
       this.emit('update', this)

src/client/class/deposit.ts

@@ -8,9 +8,11 @@ import {
   ContractData,
   DepositAccount,
   DepositData,
+  DepositDigest,
   DepositStatus,
   TxOutput
 } from '@/types/index.js'
+import { update_deposit } from '@/lib/deposit.js'
 
 interface EscrowDepositConfig {
   refresh_ival : number
@@ -113,9 +115,8 @@ export class EscrowDeposit extends EventEmitter <{
     try {
       if (this.is_stale || force) {
         const res = await this._status()
-        if (res.status !== this.status) {
-          const data = await this._digest()
-          this._update(data)
+        if (res.updated) {
+          this._update(res.deposit)
         } else {
           this._updated = now()
         }
@@ -140,13 +141,14 @@ export class EscrowDeposit extends EventEmitter <{
     const api = this.client.deposit
     const res = await api.status(this.dpid)
     if (!res.ok) throw new Error(res.error)
-    return res.data.deposit
+    return res.data
   }
 
-  _update (data : DepositData) {
-    const changed = (data.status !== this.status)
+  async _update (updated : DepositData | DepositDigest) {
+    const changed = (updated.status !== this.status)
     try {
-      this._data    = data 
+      const data    = this.data
+      this._data    = await update_deposit(data, updated)
       this._updated = now()
       if (changed) this.emit('status', data.status)
       this.emit('update', this)

src/lib/contract.ts

@@ -14,13 +14,16 @@ import {
 import {
   ContractConfig,
   ContractData,
+  ContractDigest,
   ContractStatus,
   MemberData,
   PaymentEntry,
   ProposalData,
   SpendTemplate
 } from '../types/index.js'
 
+import * as schema from '@/schema/index.js'
+
 const GET_INIT_CONTRACT = () => {
   return {
     activated   : null,
@@ -86,6 +89,17 @@ export function create_contract (
   })
 }
 
+/**
+ * Update a contract using a digest.
+ */
+export async function update_contract (
+  data   : ContractData,
+  digest : ContractDigest
+) {
+  const parser = schema.contract.data
+  return parser.parseAsync({ ...data, ...digest })
+}
+
 /**
  * Compute the hash identifier
  * for an escrow contract.

src/lib/deposit.ts

@@ -27,9 +27,12 @@ import {
   Network,
   AgentSession,
   RegisterRequest,
-  CommitRequest
+  CommitRequest,
+  DepositDigest
 } from '../types/index.js'
 
+import * as schema from '@/schema/index.js'
+
 /**
  * Initialization object for deposit state.
  */
@@ -96,6 +99,17 @@ export function create_deposit (
   return sort_record(deposit)
 }
 
+/**
+ * Update a contract using a digest.
+ */
+export async function update_deposit (
+  data   : DepositData,
+  digest : DepositDigest
+) {
+  const parser = schema.deposit.data
+  return parser.parseAsync({ ...data, ...digest })
+}
+
 /**
  * Compute a context object for a deposit account.
  */

src/lib/util.ts

@@ -66,6 +66,14 @@ export function is_literal (value : unknown) : value is Literal {
   return false
 }
 
+export function is_stamp (value : unknown) : value is number {
+  return (
+    typeof value === 'number' &&
+    value > 500_000_000       &&
+    value <= Number.MAX_SAFE_INTEGER
+  )
+}
+
 export function is_uint (
   value : unknown, 
   max_val = Number.MAX_SAFE_INTEGER

src/types/api/contract.ts

@@ -1,6 +1,5 @@
 import { DepositDigest } from '../deposit.js'
 import { MemberData }    from '../draft.js'
-import { RecordStatus }  from './index.js'
 import { ProposalData }  from '../proposal.js'
 import { WitnessData }   from '../program.js'
 import { StateData }     from '../vm.js'

src/types/api/deposit.ts

@@ -1,13 +1,11 @@
 import { ContractData } from '../contract.js'
 import { CovenantData } from '../covenant.js'
-import { RecordStatus } from './index.js'
 import { TxOutput }     from '../tx.js'
 
 import {
   DepositAccount,
   DepositData,
   DepositDigest,
-  DepositStatus
 } from '../deposit.js'
 
 export interface AccountRequest {
@@ -53,8 +51,12 @@ export interface DepositDigestResponse {
   deposit : DepositDigest
 }
 
-export interface DepositStatusResponse {
-  deposit : RecordStatus<DepositStatus>
+export type DepositStatusResponse = {
+  deposit : DepositDigest
+  updated : true
+} | {
+  deposit : undefined
+  updated : false
 }
 
 export interface FundingDataResponse {

src/types/api/index.ts

@@ -16,8 +16,3 @@ export interface ErrorResponse {
   error  : string
   status : number
 }
-
-export interface RecordStatus<T> {
-  status     : T
-  updated_at : number
-}