@xyo-network/xl1-protocol 1.25.1 → 1.25.3

package/src/block/signed/SignedBlockBoundWitnessWithStorageMeta.ts

@@ -1,12 +1,12 @@
 import {
   zodAsFactory, zodIsFactory, zodToFactory,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder, StorageMetaZod } from '@xyo-network/sdk-js'
+import { PayloadBuilder, WithStorageMetaZod } from '@xyo-network/sdk-js'
 import type { z } from 'zod'
 
 import { isSignedBlockBoundWitness, SignedBlockBoundWitnessZod } from './SignedBlockBoundWitness.ts'
 
-export const SignedBlockBoundWitnessWithStorageMetaZod = SignedBlockBoundWitnessZod.safeExtend(StorageMetaZod.shape)
+export const SignedBlockBoundWitnessWithStorageMetaZod = WithStorageMetaZod(SignedBlockBoundWitnessZod)
 
 export type SignedBlockBoundWitnessWithStorageMeta = z.infer<typeof SignedBlockBoundWitnessWithStorageMetaZod>
 

package/src/model/Context/BlockContext.zod.ts

@@ -1,18 +1,17 @@
-import type { Payload, WithStorageMeta } from '@xyo-network/sdk-js'
+import type {
+  Payload,
+  ReadArchivist, WriteArchivist,
+} from '@xyo-network/sdk-js'
 import z from 'zod'
 
-import type { PayloadMapRead, PayloadMapWrite } from '../PayloadMap.ts'
 import { CachingContextZod } from './CachingContext.zod.ts'
 
 export const BlockContextReadZod = CachingContextZod.extend(
-  { chainMap: z.custom<PayloadMapRead<WithStorageMeta<Payload>>>(val => val && typeof val === 'object' && ('get' in val || 'set' in val)) },
+  { chainMap: z.custom<ReadArchivist<Payload>>(val => val && typeof val === 'object' && ('get' in val)) },
 )
 
 export const BlockContextWriteZod = CachingContextZod.extend(
-  { chainMap: z.custom<PayloadMapWrite<WithStorageMeta<Payload>>>(val => val && typeof val === 'object' && ('get' in val || 'set' in val)) },
+  { chainMap: z.custom<WriteArchivist<Payload>>(val => val && typeof val === 'object' && ('get' in val && 'insert' in val)) },
 )
 
-export const BlockContextZod = z.intersection(
-  BlockContextReadZod,
-  BlockContextWriteZod,
-)
+export const BlockContextZod = BlockContextWriteZod

package/src/model/Context/ChainContext.zod.ts

@@ -1,19 +1,14 @@
-import z from 'zod'
-
-import { BlockContextReadZod, BlockContextWriteZod } from './BlockContext.zod.ts'
+import {
+  BlockContextReadZod, BlockContextWriteZod, BlockContextZod,
+} from './BlockContext.zod.ts'
 import { HeadContextBaseZod } from './HeadContext.zod.ts'
 
-export const ChainContextReadZod = z.intersection(
-  HeadContextBaseZod,
-  BlockContextReadZod,
-)
+export const ChainContextReadZod = BlockContextReadZod.safeExtend(HeadContextBaseZod.shape)
 
-export const ChainContextWriteZod = z.intersection(
-  HeadContextBaseZod,
-  BlockContextWriteZod,
+export const ChainContextWriteZod = BlockContextWriteZod.safeExtend(
+  HeadContextBaseZod.shape,
 )
 
-export const ChainContextZod = z.intersection(
-  ChainContextReadZod,
-  ChainContextWriteZod,
+export const ChainContextZod = BlockContextZod.safeExtend(
+  HeadContextBaseZod.shape,
 )

package/src/model/Context/HeadContext.zod.ts

@@ -8,4 +8,4 @@ export const HeadContextBaseZod = z.object(
   { head: WithHashMetaZod(BlockBoundWitnessZod) },
 )
 
-export const HeadContextZod = z.intersection(CachingContextZod, HeadContextBaseZod)
+export const HeadContextZod = CachingContextZod.safeExtend(HeadContextBaseZod.shape)

package/src/model/HydratedTransaction.ts

@@ -2,6 +2,7 @@ import {
   zodAsFactory, zodIsFactory, zodToFactory,
 } from '@xylabs/sdk-js'
 import {
+  PayloadZod,
   PayloadZodLoose, WithHashMetaZod,
   WithStorageMetaZod,
 } from '@xyo-network/sdk-js'
@@ -96,7 +97,7 @@ export const toSignedHydratedTransaction = zodToFactory(SignedHydratedTransactio
 
 export const SignedHydratedTransactionWithHashMetaZod = z.tuple([
   WithHashMetaZod(SignedTransactionBoundWitnessZod),
-  z.array(WithHashMetaZod(PayloadZodLoose)),
+  z.array(WithHashMetaZod(PayloadZod).loose()),
 ])
 
 export type SignedHydratedTransactionWithHashMeta = z.infer<typeof SignedHydratedTransactionWithHashMetaZod>
@@ -107,7 +108,7 @@ export const toSignedHydratedTransactionWithHashMeta = zodToFactory(SignedHydrat
 
 export const SignedHydratedTransactionWithStorageMetaZod = z.tuple([
   WithStorageMetaZod(SignedTransactionBoundWitnessZod),
-  z.array(WithStorageMetaZod(PayloadZodLoose)),
+  z.array(WithStorageMetaZod(PayloadZod).loose()),
 ])
 
 export type SignedHydratedTransactionWithStorageMeta = z.infer<typeof SignedHydratedTransactionWithStorageMetaZod>