@xyo-network/payment-payload-plugins 3.1.2 → 3.2.0-rc.2

package/src/Discount/Payload/Coupon/Coupons/FixedPercentage.ts

@@ -1,7 +1,7 @@
-import type { PayloadWithSources } from '@xyo-network/payload-model'
+import { AsObjectFactory } from '@xylabs/object'
+import type { Payload, PayloadWithOptionalSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -18,19 +18,16 @@ export interface FixedPercentageCouponFields extends CouponFields {
 /**
  * A coupon that provides a fixed discount amount
  */
-export type FixedPercentageCoupon = PayloadWithSources<FixedPercentageCouponFields, FixedPercentageCouponSchema>
+export type FixedPercentageCoupon = PayloadWithOptionalSources<Payload<FixedPercentageCouponFields, FixedPercentageCouponSchema>>
 
 /**
  * Identity function for determining if an object is an FixedPercentageCoupon
  */
 export const isFixedPercentageCoupon = isPayloadOfSchemaType<FixedPercentageCoupon>(FixedPercentageCouponSchema)
+export const asFixedPercentageCoupon = AsObjectFactory.create(isFixedPercentageCoupon)
 
 /**
  * Identity function for determining if an object is an FixedPercentageCoupon with sources
- */
+*/
 export const isFixedPercentageCouponWithSources = isPayloadOfSchemaTypeWithSources<FixedPercentageCoupon>(FixedPercentageCouponSchema)
-
-/**
- * Identity function for determining if an object is an FixedPercentageCoupon with meta
- */
-export const isFixedPercentageCouponWithMeta = isPayloadOfSchemaTypeWithMeta<FixedPercentageCoupon>(FixedPercentageCouponSchema)
+export const asFixedPercentageCouponWithSources = AsObjectFactory.create(isFixedPercentageCouponWithSources)

package/src/Discount/Payload/Coupon/Coupons/FixedPrice.ts

@@ -1,7 +1,7 @@
-import type { PayloadWithSources } from '@xyo-network/payload-model'
+import { AsObjectFactory } from '@xylabs/object'
+import type { PayloadWithOptionalSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -17,19 +17,16 @@ export interface FixedPriceCouponFields extends CouponFields, AmountFields { }
 /**
  * A coupon that provides a fixed total price
  */
-export type FixedPriceCoupon = PayloadWithSources<FixedPriceCouponFields, FixedPriceCouponSchema>
+export type FixedPriceCoupon = PayloadWithOptionalSources<FixedPriceCouponFields, FixedPriceCouponSchema>
 
 /**
  * Identity function for determining if an object is an FixedPriceCoupon
  */
 export const isFixedPriceCoupon = isPayloadOfSchemaType<FixedPriceCoupon>(FixedPriceCouponSchema)
+export const asFixedPriceCoupon = AsObjectFactory.create(isFixedPriceCoupon)
 
 /**
  * Identity function for determining if an object is an FixedPriceCoupon with sources
- */
+*/
 export const isFixedPriceCouponWithSources = isPayloadOfSchemaTypeWithSources<FixedPriceCoupon>(FixedPriceCouponSchema)
-
-/**
- * Identity function for determining if an object is an FixedPriceCoupon with meta
- */
-export const isFixedPriceCouponWithMeta = isPayloadOfSchemaTypeWithMeta<FixedPriceCoupon>(FixedPriceCouponSchema)
+export const asFixedPriceCouponWithSources = AsObjectFactory.create(isFixedPriceCouponWithSources)

package/src/Discount/Payload/Coupon/Payload.ts

@@ -1,10 +1,10 @@
+import { AsObjectFactory } from '@xylabs/object'
+
 import {
   type FixedAmountCoupon, type FixedPercentageCoupon, type FixedPriceCoupon,
-  isFixedAmountCoupon, isFixedAmountCouponWithMeta, isFixedAmountCouponWithSources, isFixedPercentageCoupon,
-  isFixedPercentageCouponWithMeta,
+  isFixedAmountCoupon, isFixedAmountCouponWithSources, isFixedPercentageCoupon,
   isFixedPercentageCouponWithSources,
   isFixedPriceCoupon,
-  isFixedPriceCouponWithMeta,
   isFixedPriceCouponWithSources,
 } from './Coupons/index.ts'
 
@@ -23,6 +23,7 @@ export const isCoupon = (x?: unknown | null) =>
   isFixedAmountCoupon(x)
   || isFixedPercentageCoupon(x)
   || isFixedPriceCoupon(x)
+export const asCoupon = AsObjectFactory.create(isCoupon)
 
 /**
  * Identity function for determining if an object is an Coupon with sources
@@ -31,11 +32,4 @@ export const isCouponWithSources = (x?: unknown | null) =>
   isFixedAmountCouponWithSources(x)
   || isFixedPercentageCouponWithSources(x)
   || isFixedPriceCouponWithSources(x)
-
-/**
- * Identity function for determining if an object is an Coupon with meta
- */
-export const isCouponWithMeta = (x?: unknown | null) =>
-  isFixedAmountCouponWithMeta(x)
-  || isFixedPercentageCouponWithMeta(x)
-  || isFixedPriceCouponWithMeta(x)
+export const asCouponWithSources = AsObjectFactory.create(isCouponWithSources)

package/src/Discount/Payload/Coupon/types/Condition.ts

@@ -1,24 +1,20 @@
-import {
-  isPayloadOfSchemaType, isPayloadOfSchemaTypeWithMeta, isPayloadOfSchemaTypeWithSources, type WithMeta, type WithOptionalMeta,
-} from '@xyo-network/payload-model'
+import { AsObjectFactory } from '@xylabs/object'
+import { isPayloadOfSchemaType, isPayloadOfSchemaTypeWithSources } from '@xyo-network/payload-model'
 import { type SchemaPayload, SchemaSchema } from '@xyo-network/schema-payload-plugin'
 
 /**
  * The payloads that can be used as conditions for a coupon
  */
-export type Condition = SchemaPayload | WithOptionalMeta<SchemaPayload> | WithMeta<SchemaPayload>
+export type Condition = SchemaPayload
 
 /**
  * Identity function for determining if an object is a Condition payload
  */
 export const isCondition = isPayloadOfSchemaType<Condition>(SchemaSchema)
+export const asCondition = AsObjectFactory.create(isCondition)
 
 /**
  * Identity function for determining if an object is a Condition payload with sources
- */
+*/
 export const isConditionWithSources = isPayloadOfSchemaTypeWithSources<Condition>(SchemaSchema)
-
-/**
- * Identity function for determining if an object is a Condition payload with meta
- */
-export const isConditionWithMeta = isPayloadOfSchemaTypeWithMeta<Condition>(SchemaSchema)
+export const asConditionWithSources = AsObjectFactory.create(isConditionWithSources)

package/src/Discount/Payload/Discount.ts

@@ -1,7 +1,6 @@
-import type { PayloadWithSources } from '@xyo-network/payload-model'
+import type { PayloadWithOptionalSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -15,7 +14,7 @@ export interface DiscountFields extends AmountFields { }
 /**
  * The result of a discount
  */
-export type Discount = PayloadWithSources<DiscountFields, DiscountSchema>
+export type Discount = PayloadWithOptionalSources<DiscountFields, DiscountSchema>
 
 /**
  * Identity function for determining if an object is an Discount
@@ -26,8 +25,3 @@ export const isDiscount = isPayloadOfSchemaType<Discount>(DiscountSchema)
  * Identity function for determining if an object is an Discount with sources
  */
 export const isDiscountWithSources = isPayloadOfSchemaTypeWithSources<Discount>(DiscountSchema)
-
-/**
- * Identity function for determining if an object is an Discount with meta
- */
-export const isDiscountWithMeta = isPayloadOfSchemaTypeWithMeta<Discount>(DiscountSchema)

package/src/Escrow/Outcome.ts

@@ -2,7 +2,6 @@ import type { Hash } from '@xylabs/hex'
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -35,8 +34,3 @@ export const isEscrowOutcome = isPayloadOfSchemaType<EscrowOutcome>(EscrowOutcom
  * Identity function for determining if an object is an EscrowOutcome with sources
  */
 export const isEscrowOutcomeWithSources = isPayloadOfSchemaTypeWithSources<EscrowOutcome>(EscrowOutcomeSchema)
-
-/**
- * Identity function for determining if an object is an EscrowOutcome with meta
- */
-export const isEscrowOutcomeWithMeta = isPayloadOfSchemaTypeWithMeta<EscrowOutcome>(EscrowOutcomeSchema)

package/src/Escrow/Terms/Terms.ts

@@ -1,8 +1,6 @@
 import type { Address, Hash } from '@xylabs/hex'
 import type { Payload } from '@xyo-network/payload-model'
-import {
-  isPayloadOfSchemaType, isPayloadOfSchemaTypeWithMeta, isPayloadOfSchemaTypeWithSources,
-} from '@xyo-network/payload-model'
+import { isPayloadOfSchemaType, isPayloadOfSchemaTypeWithSources } from '@xyo-network/payload-model'
 
 import { EscrowSchema } from '../Schema.ts'
 
@@ -75,8 +73,3 @@ export const isEscrowTerms = isPayloadOfSchemaType<EscrowTerms>(EscrowTermsSchem
  * Identity function for determining if an object is an EscrowTerms with sources
  */
 export const isEscrowTermsWithSources = isPayloadOfSchemaTypeWithSources<EscrowTerms>(EscrowTermsSchema)
-
-/**
- * Identity function for determining if an object is an EscrowTerms with meta
- */
-export const isEscrowTermsWithMeta = isPayloadOfSchemaTypeWithMeta<EscrowTerms>(EscrowTermsSchema)

package/src/Escrow/util/appraisal/getAppraisalsByAsset.ts

@@ -1,8 +1,6 @@
 import type { Hash } from '@xylabs/hex'
 import { type HashLeaseEstimate, isHashLeaseEstimateWithSources } from '@xyo-network/diviner-hash-lease'
-import type {
-  Payload, WithMeta, WithSources,
-} from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'
 
@@ -12,18 +10,18 @@ import type { EscrowTerms } from '../../Terms/index.ts'
  * @param dictionary The dictionary of payloads associated with the escrow terms
  * @returns A dictionary of asset hashes and their associated appraisals
  */
-export const getAppraisalsByAsset = (terms: EscrowTerms, dictionary: Record<Hash, WithMeta<Payload>>): Record<Hash, WithSources<HashLeaseEstimate>[]> => {
+export const getAppraisalsByAsset = (terms: EscrowTerms, dictionary: Record<Hash, Payload>): Record<Hash, WithSources<HashLeaseEstimate>[]> => {
   const assets = terms.assets
   if (!assets || assets.length === 0) return {}
   const appraisals = Object.values(dictionary).filter(isHashLeaseEstimateWithSources) as unknown as WithSources<HashLeaseEstimate>[]
   const appraisalsByAsset: Record<Hash, WithSources<HashLeaseEstimate>[]> = {}
   for (const estimate of appraisals) {
-    const { sources } = estimate
-    if (sources === undefined || sources.length === 0) {
+    const { $sources } = estimate
+    if ($sources === undefined || $sources.length === 0) {
       continue
     }
     for (const asset of assets) {
-      if (sources.includes(asset)) {
+      if ($sources.includes(asset)) {
         if (!appraisalsByAsset[asset]) appraisalsByAsset[asset] = []
         appraisalsByAsset[asset].push(estimate)
       }

package/src/Escrow/util/appraisal/getSignaturesByAppraisal.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/hex'
-import { type BoundWitness, isBoundWitnessWithMeta } from '@xyo-network/boundwitness-model'
-import type { Payload, WithMeta } from '@xyo-network/payload-model'
+import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
+import type { Payload } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'
 
@@ -13,8 +13,8 @@ import type { EscrowTerms } from '../../Terms/index.ts'
  */
 export const getSignaturesByAppraisal = (
   terms: EscrowTerms,
-  dictionary: Record<Hash, WithMeta<Payload>>,
-): Record<Hash, WithMeta<BoundWitness>[]> => {
+  dictionary: Record<Hash, Payload>,
+): Record<Hash, BoundWitness[]> => {
   // Validate inputs
   const appraisals = terms.appraisals
   if (!appraisals || appraisals.length === 0) return {}
@@ -24,10 +24,10 @@ export const getSignaturesByAppraisal = (
   // Validate the appraisals are signed by valid appraisal authorities. Validation criteria:
   // - The bw includes the appraisal hash from the escrow terms appraisal
   // - The bw is signed by an approved appraisal authority from the escrow terms appraisalAuthorities
-  const appraisalBWsValid: Record<Hash, WithMeta<BoundWitness>[]> = Object.fromEntries(
-    appraisals.map<[Hash, WithMeta<BoundWitness>[]]>(hash => [hash, []]),
+  const appraisalBWsValid: Record<Hash, BoundWitness[]> = Object.fromEntries(
+    appraisals.map<[Hash, BoundWitness[]]>(hash => [hash, []]),
   )
-  for (const bw of Object.values(dictionary).filter(isBoundWitnessWithMeta)) {
+  for (const bw of Object.values(dictionary).filter(isBoundWitness)) {
     for (const appraisal of appraisals) {
       if (bw.payload_hashes.includes(appraisal) && bw.addresses.some(address => appraisalAuthorities.includes(address))) {
         appraisalBWsValid[appraisal].push(bw)

package/src/Escrow/util/secret/createEscrowIntent.ts

@@ -12,6 +12,6 @@ import type { EscrowTerms } from '../../Terms/index.ts'
  * @returns The escrow intent
  */
 export const createEscrowIntentWithSecret = async (terms: EscrowTerms, secret: IdPayload, account: AccountInstance) => {
-  const result = await new BoundWitnessBuilder({ accounts: [account] }).payloads([terms, secret]).build()
+  const result = await new BoundWitnessBuilder().signers([account]).payloads([terms, secret]).build()
   return result
 }

package/src/Escrow/util/secret/findEscrowPartySecretSignatures.ts

@@ -1,7 +1,6 @@
 import type { Hash } from '@xylabs/hex'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { isBoundWitnessWithMeta } from '@xyo-network/boundwitness-model'
-import type { Payload, WithMeta } from '@xyo-network/payload-model'
+import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
+import type { Payload } from '@xyo-network/payload-model'
 
 import type {
   EscrowParty, EscrowPartySecret, EscrowTerms,
@@ -23,7 +22,7 @@ const getLogPrefix = (party: EscrowParty) => {
  * @param party The party to get the secret signatures for
  * @returns An array of BoundWitnesses containing the secret signed by all the parties
  */
-export const findEscrowPartySecretSignatures = (terms: EscrowTerms, dictionary: Record<Hash, WithMeta<Payload>>, party: EscrowParty): BoundWitness[] => {
+export const findEscrowPartySecretSignatures = (terms: EscrowTerms, dictionary: Record<Hash, Payload>, party: EscrowParty): BoundWitness[] => {
   const partyAddresses = terms[party]
   if (partyAddresses === undefined || partyAddresses.length === 0) {
     console.log(`${getLogPrefix(party)}: No ${party}: ${terms[party]}`)
@@ -38,7 +37,7 @@ export const findEscrowPartySecretSignatures = (terms: EscrowTerms, dictionary:
   // BWs containing the secret signed by all the parties
   const partySignedBWs = Object.values(dictionary)
     // Find all BoundWitnesses
-    .filter(isBoundWitnessWithMeta)
+    .filter(isBoundWitness)
     // That contain the seller secret
     .filter(bw => bw.payload_hashes.includes(secretHash))
     // That are signed by all the parties

package/src/Escrow/validators/common/SecretValidators/getPartySecretSignedValidator.ts

@@ -1,8 +1,6 @@
 import type { Hash } from '@xylabs/hex'
 import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'
-import type {
-  AsyncPayloadValidationFunction, Payload, WithMeta,
-} from '@xyo-network/payload-model'
+import type { AsyncPayloadValidationFunction, Payload } from '@xyo-network/payload-model'
 
 import type {
   EscrowParty, EscrowPartySecret, EscrowTerms,
@@ -24,7 +22,7 @@ const getLogPrefix = (party: EscrowParty) => {
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for the existence of the party secret signed by the party
  */
-export const getPartySecretSignedValidator = (dictionary: Record<Hash, WithMeta<Payload>>, party: EscrowParty): AsyncPayloadValidationFunction<EscrowTerms> => {
+export const getPartySecretSignedValidator = (dictionary: Record<Hash, Payload>, party: EscrowParty): AsyncPayloadValidationFunction<EscrowTerms> => {
   const partySecret: EscrowPartySecret = party === 'seller' ? 'sellerSecret' : 'buyerSecret'
   return async (terms: EscrowTerms): Promise<boolean> => {
     // Party-signed party secret BWs

package/src/Escrow/validators/escrow/appraisal.ts

@@ -1,10 +1,9 @@
 import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
-import type { BoundWitness } from '@xyo-network/boundwitness-model'
-import { isBoundWitnessWithMeta } from '@xyo-network/boundwitness-model'
+import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
 import type { HashLeaseEstimate } from '@xyo-network/diviner-hash-lease'
 import type {
-  Payload, SyncPayloadValidationFunction, WithMeta, WithSources,
+  Payload, SyncPayloadValidationFunction, WithSources,
 } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'
@@ -32,7 +31,7 @@ export const appraisalsExistValidator: SyncPayloadValidationFunction<EscrowTerms
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for appraisals which are from valid authorities
  */
-export const getAppraisalsFromValidAuthoritiesValidator = (dictionary: Record<Hash, WithMeta<Payload>>): SyncPayloadValidationFunction<EscrowTerms> => {
+export const getAppraisalsFromValidAuthoritiesValidator = (dictionary: Record<Hash, Payload>): SyncPayloadValidationFunction<EscrowTerms> => {
   return (terms: EscrowTerms) => {
     const appraisals = assertEx(terms.appraisals, () => `${name}: No appraisals: ${terms.appraisals}`)
     const appraisalAuthorities = assertEx(terms.appraisalAuthorities, () => `${name}: No appraisalAuthorities: ${terms.appraisalAuthorities}`)
@@ -40,10 +39,10 @@ export const getAppraisalsFromValidAuthoritiesValidator = (dictionary: Record<Ha
     // Validate the appraisals are signed by valid appraisal authorities. Validation criteria:
     // - We have a bw for each of the appraisal
     // - The bw is signed by an approved appraisal authority
-    const appraisalBWsValid: Record<Hash, WithMeta<BoundWitness>[]> = Object.fromEntries(
-      appraisals.map<[Hash, WithMeta<BoundWitness>[]]>(hash => [hash, []]),
+    const appraisalBWsValid: Record<Hash, BoundWitness[]> = Object.fromEntries(
+      appraisals.map<[Hash, BoundWitness[]]>(hash => [hash, []]),
     )
-    for (const bw of Object.values(dictionary).filter(isBoundWitnessWithMeta)) {
+    for (const bw of Object.values(dictionary).filter(isBoundWitness)) {
       for (const appraisal of appraisals) {
         if (bw.payload_hashes.includes(appraisal) && bw.addresses.some(address => appraisalAuthorities.includes(address))) {
           appraisalBWsValid[appraisal].push(bw)
@@ -68,7 +67,7 @@ export const getAppraisalsFromValidAuthoritiesValidator = (dictionary: Record<Ha
  * @returns A function that validates the escrow terms for appraisals which are valid
  */
 export const getAppraisalsValidValidator = (
-  dictionary: Record<Hash, WithMeta<Payload>>,
+  dictionary: Record<Hash, Payload>,
   minimumExp: number,
 ): SyncPayloadValidationFunction<EscrowTerms> => {
   return (terms: EscrowTerms) => {
@@ -94,7 +93,7 @@ export const getAppraisalsValidValidator = (
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for appraisals
  */
-export const getAppraisalsForAllAssetsValidator = (dictionary: Record<Hash, WithMeta<Payload>>): SyncPayloadValidationFunction<EscrowTerms> => {
+export const getAppraisalsForAllAssetsValidator = (dictionary: Record<Hash, Payload>): SyncPayloadValidationFunction<EscrowTerms> => {
   return (terms: EscrowTerms) => {
     // Verify we have an estimate for each of the assets
     const assets = assertEx(terms.assets, () => `${name}: No assets: ${terms.assets}`)

package/src/Escrow/validators/escrow/buyerSecret.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
 import type {
-  AsyncPayloadValidationFunction, Payload, SyncPayloadValidationFunction, WithMeta,
+  AsyncPayloadValidationFunction, Payload, SyncPayloadValidationFunction,
 } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'
@@ -28,7 +28,7 @@ export const buyerSecretExistsValidator: SyncPayloadValidationFunction<EscrowTer
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for the existence of the buyerSecret in the dictionary
  */
-export const getBuyerSecretSuppliedValidator = (dictionary: Record<Hash, WithMeta<Payload>>): SyncPayloadValidationFunction<EscrowTerms> => {
+export const getBuyerSecretSuppliedValidator = (dictionary: Record<Hash, Payload>): SyncPayloadValidationFunction<EscrowTerms> => {
   return (terms: EscrowTerms) => {
     const buyerSecret = assertEx(terms.buyerSecret, () => `${name}: No buyerSecret: ${terms.buyerSecret}`)
     if (!dictionary[buyerSecret]) {
@@ -44,6 +44,6 @@ export const getBuyerSecretSuppliedValidator = (dictionary: Record<Hash, WithMet
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for the existence of the buyerSecret signed by the buyer
  */
-export const getBuyerSecretSignedValidator = (dictionary: Record<Hash, WithMeta<Payload>>): AsyncPayloadValidationFunction<EscrowTerms> => {
+export const getBuyerSecretSignedValidator = (dictionary: Record<Hash, Payload>): AsyncPayloadValidationFunction<EscrowTerms> => {
   return getPartySecretSignedValidator(dictionary, 'buyer')
 }

package/src/Escrow/validators/escrow/sellerSecret.ts

@@ -1,7 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
 import type {
-  AsyncPayloadValidationFunction, Payload, SyncPayloadValidationFunction, WithMeta,
+  AsyncPayloadValidationFunction, Payload, SyncPayloadValidationFunction,
 } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'
@@ -28,7 +28,7 @@ export const sellerSecretExistsValidator: SyncPayloadValidationFunction<EscrowTe
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for the existence of the sellerSecret in the dictionary
  */
-export const getSellerSecretSuppliedValidator = (dictionary: Record<Hash, WithMeta<Payload>>): SyncPayloadValidationFunction<EscrowTerms> => {
+export const getSellerSecretSuppliedValidator = (dictionary: Record<Hash, Payload>): SyncPayloadValidationFunction<EscrowTerms> => {
   return (terms: EscrowTerms) => {
     const sellerSecret = assertEx(terms.sellerSecret, () => `${name}: No sellerSecret: ${terms.sellerSecret}`)
     if (!dictionary[sellerSecret]) {
@@ -44,6 +44,6 @@ export const getSellerSecretSuppliedValidator = (dictionary: Record<Hash, WithMe
  * @param dictionary Payload dictionary of the escrow terms
  * @returns A function that validates the escrow terms for the existence of the sellerSecret signed by the seller
  */
-export const getSellerSecretSignedValidator = (dictionary: Record<Hash, WithMeta<Payload>>): AsyncPayloadValidationFunction<EscrowTerms> => {
+export const getSellerSecretSignedValidator = (dictionary: Record<Hash, Payload>): AsyncPayloadValidationFunction<EscrowTerms> => {
   return getPartySecretSignedValidator(dictionary, 'seller')
 }

package/src/Payment/Instrument/Card/Payload.ts

@@ -1,7 +1,5 @@
 import type { Payload } from '@xyo-network/payload-model'
-import {
-  isPayloadOfSchemaType, isPayloadOfSchemaTypeWithMeta, isPayloadOfSchemaTypeWithSources,
-} from '@xyo-network/payload-model'
+import { isPayloadOfSchemaType, isPayloadOfSchemaTypeWithSources } from '@xyo-network/payload-model'
 
 import { PaymentCardSchema } from './Schema.ts'
 
@@ -45,8 +43,3 @@ export const isPaymentCard = isPayloadOfSchemaType<PaymentCard>(PaymentCardSchem
  * Identity function for determine if an object is a PaymentCard with sources
  */
 export const isPaymentCardWithSources = isPayloadOfSchemaTypeWithSources<PaymentCard>(PaymentCardSchema)
-
-/**
- * Identity function for determine if an object is a PaymentCard with meta
- */
-export const isPaymentCardWithMeta = isPayloadOfSchemaTypeWithMeta<PaymentCard>(PaymentCardSchema)

package/src/Payment/Payload.ts

@@ -1,7 +1,6 @@
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -33,8 +32,3 @@ export const isPayment = isPayloadOfSchemaType<Payment>(PaymentSchema)
  * Identity function for determine if an object is a Payment with sources
  */
 export const isPaymentWithSources = isPayloadOfSchemaTypeWithSources<Payment>(PaymentSchema)
-
-/**
- * Identity function for determine if an object is a Payment with meta
- */
-export const isPaymentWithMeta = isPayloadOfSchemaTypeWithMeta<Payment>(PaymentSchema)

package/src/Payment/Status/Payload.ts

@@ -1,7 +1,6 @@
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -33,8 +32,3 @@ export const isPaymentStatus = isPayloadOfSchemaType<PaymentStatus>(PaymentStatu
  * Identity function for determine if an object is a PaymentStatus with sources
  */
 export const isPaymentStatusWithSources = isPayloadOfSchemaTypeWithSources<PaymentStatus>(PaymentStatusSchema)
-
-/**
- * Identity function for determine if an object is a PaymentStatus with meta
- */
-export const isPaymentStatusWithMeta = isPayloadOfSchemaTypeWithMeta<PaymentStatus>(PaymentStatusSchema)

package/src/Purchase/Payload.ts

@@ -2,7 +2,6 @@ import type { Hash } from '@xylabs/hex'
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -34,8 +33,3 @@ export const isPurchase = isPayloadOfSchemaType<Purchase>(PurchaseSchema)
  * Identity function for determine if an object is a Purchase with sources
  */
 export const isPurchaseWithSources = isPayloadOfSchemaTypeWithSources<Purchase>(PurchaseSchema)
-
-/**
- * Identity function for determine if an object is a Purchase with meta
- */
-export const isPurchaseWithMeta = isPayloadOfSchemaTypeWithMeta<Purchase>(PurchaseSchema)

package/src/Receipt/Payload.ts

@@ -1,7 +1,6 @@
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -33,8 +32,3 @@ export const isReceipt = isPayloadOfSchemaType<Receipt>(ReceiptSchema)
  * Identity function for determine if an object is a Receipt with sources
  */
 export const isReceiptWithSources = isPayloadOfSchemaTypeWithSources<Receipt>(ReceiptSchema)
-
-/**
- * Identity function for determine if an object is a Receipt with meta
- */
-export const isReceiptWithMeta = isPayloadOfSchemaTypeWithMeta<Receipt>(ReceiptSchema)

package/src/Subtotal/Diviner/Payload.ts

@@ -1,7 +1,6 @@
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -26,8 +25,3 @@ export const isSubtotal = isPayloadOfSchemaType<Subtotal>(SubtotalSchema)
  * Identity function for determining if an object is an Subtotal with sources
  */
 export const isSubtotalWithSources = isPayloadOfSchemaTypeWithSources<Subtotal>(SubtotalSchema)
-
-/**
- * Identity function for determining if an object is an Subtotal with meta
- */
-export const isSubtotalWithMeta = isPayloadOfSchemaTypeWithMeta<Subtotal>(SubtotalSchema)

package/src/Total/Diviner/Payload.ts

@@ -1,7 +1,6 @@
 import type { PayloadWithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
-  isPayloadOfSchemaTypeWithMeta,
   isPayloadOfSchemaTypeWithSources,
 } from '@xyo-network/payload-model'
 
@@ -26,8 +25,3 @@ export const isTotal = isPayloadOfSchemaType<Total>(TotalSchema)
  * Identity function for determining if an object is an Total with sources
  */
 export const isTotalWithSources = isPayloadOfSchemaTypeWithSources<Total>(TotalSchema)
-
-/**
- * Identity function for determining if an object is an Total with meta
- */
-export const isTotalWithMeta = isPayloadOfSchemaTypeWithMeta<Total>(TotalSchema)