update

.gitignore

@@ -1,12 +1,11 @@
 contrib
-test/data
-test/bitcoin.conf
 coredata
 dist
 node_modules
+src/**/_*
+test/data
+test/bitcoin.conf
 TODO.md
 NOTES.md
 *.log
 .env*
-
-src/**/_*

src/client/api/contract.ts

@@ -1,6 +1,8 @@
 import { verify_endorsement } from '@/lib/member.js'
 import { get_proposal_id }    from '@/lib/proposal.js'
 import { EscrowClient }       from '@/client/class/client.js'
+import { parse_proposal }     from '@/lib/parse.js'
+import { verify_proposal }    from '@/validators/index.js'
 
 import {
   ContractDataResponse,
@@ -9,11 +11,6 @@ import {
   WitnessListResponse
 } from '@/client/types.js'
 
-import {
-  validate_proposal,
-  verify_proposal
-} from '@/validators/index.js'
-
 import {
   ApiResponse,
   ProposalData,
@@ -32,13 +29,13 @@ function create_contract_api (
     proposal    : ProposalData,
     signatures ?: string[]
   ) : Promise<ApiResponse<ContractDataResponse>> => {
-    // Validate the proposal's format.
-    validate_proposal(proposal)
+    // Parse and validate the proposal.
+    const prop = parse_proposal(proposal)
     // Verify the proposal's terms.
-    verify_proposal(proposal)
+    verify_proposal(prop)
     // Verify any signatures.
     if (signatures !== undefined) {
-      const prop_id = get_proposal_id(proposal)
+      const prop_id = get_proposal_id(prop)
       signatures.forEach(e => verify_endorsement(prop_id, e, true))
     }
     // Formulate the request url.

src/client/api/proposal.ts

@@ -1,16 +1,13 @@
 import { EscrowSigner }     from '@/client/class/signer.js'
 import { endorse_proposal } from '@/lib/proposal.js'
+import { parse_proposal }   from '@/lib/parse.js'
+import { verify_proposal }  from '@/validators/proposal.js'
 
 import {
   add_membership,
   rem_membership
 } from '@/lib/policy.js'
 
-import {
-  validate_proposal,
-  verify_proposal
-} from '@/validators/proposal.js'
-
 import { ProposalData, RolePolicy } from '@/types/index.js'
 
 export function is_member_api (signer : EscrowSigner) {
@@ -40,9 +37,9 @@ export function leave_proposal_api (signer : EscrowSigner) {
 
 export function endorse_proposal_api (client : EscrowSigner) {
   return (proposal : ProposalData) => {
-    validate_proposal(proposal)
-    verify_proposal(proposal)
-    return endorse_proposal(proposal, client._signer)
+    const prop = parse_proposal(proposal)
+    verify_proposal(prop)
+    return endorse_proposal(prop, client._signer)
   }
 }
 

src/client/api/witness.ts

@@ -40,7 +40,7 @@ export function sign_witness_api (signer : EscrowSigner) {
   ) => {
     const terms = contract.terms
     const cred  = signer.membership.claim(terms)
-      let wdat  = create_witness(terms.programs, signer.pubkey, template)
+      let wdat  = create_witness(terms.programs, cred.data.pub, template)
     validate_witness(contract, wdat)
     return sign_witness(cred.signer, wdat)
   }

src/lib/policy.ts

@@ -98,7 +98,7 @@ export function add_membership (
   if (is_member(mship, proposal)) {
     throw new Error('previous role exists for membership')
   }
- 
+
   const wallet = new Wallet(xpub)
   const pol    = Buff.json(role).digest.hex
   const rolls  = proposal.members.filter(e => e.pol === pol)

src/lib/proposal.ts

@@ -167,8 +167,8 @@ export function endorse_proposal (
   proposal : ProposalData,
   signer   : SignerAPI
 ) : string {
-  const msg = get_proposal_id(proposal)
-  const pub = signer.pubkey
-  const sig = signer.sign(msg)
+  const msg  = get_proposal_id(proposal)
+  const pub  = signer.pubkey
+  const sig  = signer.sign(msg)
   return Buff.join([ pub, sig ]).hex
 }