@xyo-network/payment-payload-plugins 3.4.2 → 3.4.4

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

@@ -1,5 +1,5 @@
 import { AsObjectFactory } from '@xylabs/object'
-import type { PayloadWithOptionalSources, WithSources } from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
   isPayloadOfSchemaTypeWithSources,
@@ -17,7 +17,7 @@ export interface FixedAmountCouponFields extends CouponFields, AmountFields {}
 /**
  * A coupon that provides a fixed discount amount
  */
-export type FixedAmountCoupon = PayloadWithOptionalSources<FixedAmountCouponFields, FixedAmountCouponSchema>
+export type FixedAmountCoupon = Payload<FixedAmountCouponFields, FixedAmountCouponSchema>
 
 /**
  * Identity function for determining if an object is an FixedAmountCoupon

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

@@ -1,7 +1,5 @@
 import { AsObjectFactory } from '@xylabs/object'
-import type {
-  Payload, PayloadWithOptionalSources, WithSources,
-} from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
   isPayloadOfSchemaTypeWithSources,
@@ -20,7 +18,7 @@ export interface FixedPercentageCouponFields extends CouponFields {
 /**
  * A coupon that provides a fixed discount amount
  */
-export type FixedPercentageCoupon = PayloadWithOptionalSources<Payload<FixedPercentageCouponFields, FixedPercentageCouponSchema>>
+export type FixedPercentageCoupon = Payload<FixedPercentageCouponFields, FixedPercentageCouponSchema>
 
 /**
  * Identity function for determining if an object is an FixedPercentageCoupon

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

@@ -1,5 +1,5 @@
 import { AsObjectFactory } from '@xylabs/object'
-import type { PayloadWithOptionalSources, WithSources } from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
   isPayloadOfSchemaTypeWithSources,
@@ -17,7 +17,7 @@ export interface FixedPriceCouponFields extends CouponFields, AmountFields { }
 /**
  * A coupon that provides a fixed total price
  */
-export type FixedPriceCoupon = PayloadWithOptionalSources<FixedPriceCouponFields, FixedPriceCouponSchema>
+export type FixedPriceCoupon = Payload<FixedPriceCouponFields, FixedPriceCouponSchema>
 
 /**
  * Identity function for determining if an object is an FixedPriceCoupon

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

@@ -1,7 +1,9 @@
 import { AsObjectFactory } from '@xylabs/object'
 
+import type {
+  FixedAmountCoupon, FixedPercentageCoupon, FixedPriceCoupon,
+} from './Coupons/index.ts'
 import {
-  type FixedAmountCoupon, type FixedPercentageCoupon, type FixedPriceCoupon,
   isFixedAmountCoupon, isFixedAmountCouponWithSources, isFixedPercentageCoupon,
   isFixedPercentageCouponWithSources,
   isFixedPriceCoupon,

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

@@ -1,6 +1,7 @@
 import { AsObjectFactory } from '@xylabs/object'
 import { isPayloadOfSchemaType, isPayloadOfSchemaTypeWithSources } from '@xyo-network/payload-model'
-import { type SchemaPayload, SchemaSchema } from '@xyo-network/schema-payload-plugin'
+import type { SchemaPayload } from '@xyo-network/schema-payload-plugin'
+import { SchemaSchema } from '@xyo-network/schema-payload-plugin'
 
 /**
  * The payloads that can be used as conditions for a coupon

package/src/Discount/Payload/Discount.ts

@@ -1,5 +1,5 @@
 import { AsObjectFactory } from '@xylabs/object'
-import type { PayloadWithOptionalSources, WithSources } from '@xyo-network/payload-model'
+import type { Payload, WithSources } from '@xyo-network/payload-model'
 import {
   isPayloadOfSchemaType,
   isPayloadOfSchemaTypeWithSources,
@@ -15,7 +15,7 @@ export interface DiscountFields extends AmountFields { }
 /**
  * The result of a discount
  */
-export type Discount = PayloadWithOptionalSources<DiscountFields, DiscountSchema>
+export type Discount = Payload<DiscountFields, DiscountSchema>
 
 /**
  * Identity function for determining if an object is an Discount

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

@@ -1,5 +1,6 @@
 import type { Hash } from '@xylabs/hex'
-import { type HashLeaseEstimate, isHashLeaseEstimateWithSources } from '@xyo-network/diviner-hash-lease'
+import type { HashLeaseEstimate } from '@xyo-network/diviner-hash-lease'
+import { isHashLeaseEstimateWithSources } from '@xyo-network/diviner-hash-lease'
 import type { Payload, WithSources } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'

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

@@ -1,5 +1,6 @@
 import type { Hash } from '@xylabs/hex'
-import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
+import type { BoundWitness } from '@xyo-network/boundwitness-model'
+import { isBoundWitness } from '@xyo-network/boundwitness-model'
 import type { Payload } from '@xyo-network/payload-model'
 
 import type { EscrowTerms } from '../../Terms/index.ts'

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

@@ -1,6 +1,6 @@
 import type { AccountInstance } from '@xyo-network/account-model'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import type { IdPayload } from '@xyo-network/id-payload-plugin'
+import type { Id } from '@xyo-network/id-payload-plugin'
 
 import type { EscrowTerms } from '../../Terms/index.ts'
 
@@ -11,7 +11,7 @@ import type { EscrowTerms } from '../../Terms/index.ts'
  * @param account The account to create the escrow intent with
  * @returns The escrow intent
  */
-export const createEscrowIntentWithSecret = async (terms: EscrowTerms, secret: IdPayload, account: AccountInstance) => {
+export const createEscrowIntentWithSecret = async (terms: EscrowTerms, secret: Id, account: AccountInstance) => {
   const result = await new BoundWitnessBuilder().signers([account]).payloads([terms, secret]).build()
   return result
 }

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

@@ -1,5 +1,6 @@
 import type { Hash } from '@xylabs/hex'
-import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
+import type { BoundWitness } from '@xyo-network/boundwitness-model'
+import { isBoundWitness } from '@xyo-network/boundwitness-model'
 import type { Payload } from '@xyo-network/payload-model'
 
 import type {

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

@@ -1,6 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
-import { type BoundWitness, isBoundWitness } from '@xyo-network/boundwitness-model'
+import type { BoundWitness } from '@xyo-network/boundwitness-model'
+import { isBoundWitness } from '@xyo-network/boundwitness-model'
 import type { HashLeaseEstimate } from '@xyo-network/diviner-hash-lease'
 import type {
   Payload, SyncPayloadValidationFunction, WithSources,