@xyo-network/xns-record-payload-plugins 3.1.2 → 3.2.0-rc.1

package/src/Hash/Payload.ts

@@ -1,5 +1,5 @@
 import type { Hash } from '@xylabs/hex'
-import type { Payload, WithMeta } from '@xyo-network/payload-model'
+import type { Payload } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 
 import type { DomainFields } from '../Domain/index.ts'
@@ -20,4 +20,3 @@ export interface HashRecordFields extends DomainFields {
 export type HashRecord = Payload<HashRecordFields, HashRecordSchema>
 
 export const isHashRecord = isPayloadOfSchemaType<HashRecord>(HashRecordSchema)
-export const isHashRecordWithMeta = isPayloadOfSchemaType<WithMeta<HashRecord>>(HashRecordSchema)

package/src/diviner/DomainLeaseEstimateDiviner/ErrorDetails/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 { DomainLeaseEstimateDivinerValidationErrorDetailsSchema } from '../Schema.ts'
 
@@ -46,9 +44,3 @@ export const isDomainLeaseEstimateDivinerValidationErrorDetails = isPayloadOfSch
  */
 export const isDomainLeaseEstimateDivinerValidationErrorDetailsWithSources
   = isPayloadOfSchemaTypeWithSources<DomainLeaseEstimateDivinerValidationErrorDetails>(DomainLeaseEstimateDivinerValidationErrorDetailsSchema)
-
-/**
- * Identity function for DomainLeaseEstimateDivinerValidationErrorDetails payload with meta
- */
-export const isDomainLeaseEstimateDivinerValidationErrorDetailsWithMeta
-  = isPayloadOfSchemaTypeWithMeta<DomainLeaseEstimateDivinerValidationErrorDetails>(DomainLeaseEstimateDivinerValidationErrorDetailsSchema)

package/src/diviner/lib/parseEstimatesFromArray.ts

@@ -1,22 +1,19 @@
 import { exists } from '@xylabs/exists'
 import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
 import {
-  type HashLeaseEstimate, HashLeaseEstimateSchema,
-  isHashLeaseEstimateWithMeta,
+  type HashLeaseEstimate, HashLeaseEstimateSchema, isHashLeaseEstimate,
 } from '@xyo-network/diviner-hash-lease'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type {
-  Payload, WithMeta, WithOptionalMeta, WithSources,
-} from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 
 import {
-  type DomainRegistrationLease, DomainRegistrationLeaseSchema, isDomainRegistrationLeaseWithMeta,
+  type DomainRegistrationLease, DomainRegistrationLeaseSchema, isDomainRegistrationLease,
 } from '../../DomainRegistration/index.ts'
 
 export type Estimate = [
-  WithOptionalMeta<BoundWitness>,
-  WithOptionalMeta<WithSources<HashLeaseEstimate>>,
-  WithOptionalMeta<WithSources<DomainRegistrationLease>>,
+  BoundWitness,
+  WithSources<HashLeaseEstimate>,
+  WithSources<DomainRegistrationLease>,
 ]
 
 /**
@@ -38,14 +35,14 @@ export const parseEstimatesFromArray = async (payloads?: Payload[]): Promise<Est
       bw,
       HashLeaseEstimateSchema,
       hashMap,
-      isHashLeaseEstimateWithMeta,
+      isHashLeaseEstimate,
     )
     if (!hashLeaseEstimate) return
     const domainLease = getPayloadBySchemaFromBoundWitness<DomainRegistrationLease>(
       bw,
       DomainRegistrationLeaseSchema,
       hashMap,
-      isDomainRegistrationLeaseWithMeta,
+      isDomainRegistrationLease,
     )
     if (!domainLease) return
     return [bw, hashLeaseEstimate, domainLease]
@@ -74,8 +71,8 @@ const getPayloadBySchemaFromBoundWitness = <T extends Payload = Payload>(
   bw: BoundWitness,
   schema: string,
   hashMap: Awaited<ReturnType<typeof PayloadBuilder.toHashMap>>,
-  identity: (payload: Payload) => payload is WithMeta<T>,
-): WithMeta<T> | undefined => {
+  identity: (payload: Payload) => payload is T,
+): T | undefined => {
   const schemaIndex = bw.payload_schemas.indexOf(schema)
   if (schemaIndex === -1) return
   const hash = bw.payload_hashes[schemaIndex]