@xyo-network/chain-validation 1.5.35 → 1.5.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-validation",
-  "version": "1.5.35",
+  "version": "1.5.36",
   "description": "XYO Layer One SDK Validation",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -34,36 +34,38 @@
     "deploy3": "echo Deploy3 not allowed!"
   },
   "dependencies": {
-    "@xylabs/arraybuffer": "^4.11.21",
-    "@xylabs/hex": "^4.11.21",
-    "@xylabs/typeof": "^4.11.21",
-    "@xyo-network/boundwitness-builder": "^3.18.8",
-    "@xyo-network/boundwitness-model": "^3.18.8",
-    "@xyo-network/boundwitness-validator": "^3.18.8",
-    "@xyo-network/chain-protocol": "^1.5.35",
-    "@xyo-network/chain-schema": "^1.5.35",
-    "@xyo-network/chain-utils": "^1.5.35",
-    "@xyo-network/payload-builder": "^3.18.8",
-    "@xyo-network/payload-model": "^3.18.8",
-    "@xyo-network/schema-payload-plugin": "^3.18.8",
-    "@xyo-network/xl1-protocol": "^1.4.36",
+    "@xylabs/arraybuffer": "^4.12.29",
+    "@xylabs/hex": "^4.12.29",
+    "@xylabs/object": "^4.12.29",
+    "@xylabs/typeof": "^4.12.29",
+    "@xyo-network/boundwitness-builder": "^3.18.10",
+    "@xyo-network/boundwitness-model": "^3.18.10",
+    "@xyo-network/boundwitness-validator": "^3.18.10",
+    "@xyo-network/chain-protocol": "^1.5.36",
+    "@xyo-network/chain-schema": "^1.5.36",
+    "@xyo-network/chain-utils": "^1.5.36",
+    "@xyo-network/payload-builder": "^3.18.10",
+    "@xyo-network/payload-model": "^3.18.10",
+    "@xyo-network/schema-payload-plugin": "^3.18.10",
+    "@xyo-network/xl1-protocol": "^1.5.16",
+    "@xyo-network/xl1-protocol-sdk": "^1.5.36",
     "ajv": "^8.17.1"
   },
   "devDependencies": {
-    "@types/node": "^24.0.1",
-    "@xylabs/assert": "^4.11.21",
-    "@xylabs/promise": "^4.11.21",
-    "@xylabs/ts-scripts-yarn3": "^6.5.8",
-    "@xylabs/tsconfig": "^6.5.8",
-    "@xyo-network/account": "^3.18.8",
-    "@xyo-network/account-model": "^3.18.8",
-    "@xyo-network/archivist-memory": "^3.18.8",
-    "@xyo-network/archivist-model": "^3.18.8",
-    "@xyo-network/wallet": "^3.18.8",
-    "@xyo-network/xl1-protocol-sdk": "^1.5.35",
-    "knip": "^5.61.0",
+    "@types/node": "^24.0.8",
+    "@xylabs/assert": "^4.12.29",
+    "@xylabs/promise": "^4.12.29",
+    "@xylabs/ts-scripts-yarn3": "^6.5.12",
+    "@xylabs/tsconfig": "^6.5.12",
+    "@xyo-network/account": "^3.18.10",
+    "@xyo-network/account-model": "^3.18.10",
+    "@xyo-network/archivist-memory": "^3.18.10",
+    "@xyo-network/archivist-model": "^3.18.10",
+    "@xyo-network/wallet": "^3.18.10",
+    "@xyo-network/xl1-protocol-sdk": "^1.5.36",
+    "knip": "^5.61.3",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.3"
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": ">=22.3 <23"

package/src/block/validateBlock.ts

@@ -12,11 +12,14 @@ import {
 export const validateBlock: BlockValidatorFunction = async (
   block: BlockBoundWitness,
   chainId?: Address,
-): Promise<(BlockValidationError | Error)[]> => {
-  const errors: Error[] = []
+): Promise<BlockValidationError[]> => {
+  const errors: BlockValidationError[] = []
   try {
+    const bwErrors = await BoundWitnessSignaturesValidator(block)
+    for (const bwError of bwErrors) {
+      errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'BoundWitness validation failed', bwError))
+    }
     const validators: BlockValidatorFunction[] = [
-      BoundWitnessSignaturesValidator,
       BlockFieldsValidator,
       BlockPreviousHashValidator,
       BlockJsonSchemaValidator(),
@@ -26,7 +29,7 @@ export const validateBlock: BlockValidatorFunction = async (
       validators.map(validator => validator(block, chainId)),
     )).flat())
   } catch (ex) {
-    errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'validation excepted'), ex as Error)
+    errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'validation excepted', ex))
   }
   return errors
 }

package/src/block/validators/AllowedPayloadSchemas.ts

@@ -7,7 +7,7 @@ import {
 export const BlockAllowedPayloadSchemasValidator: BlockValidatorFunction = (
   block: BlockBoundWitness,
 ) => {
-  const errors: (BlockValidationError | Error)[] = []
+  const errors: BlockValidationError[] = []
   try {
     for (const schema of block.payload_schemas) {
       if (!isAllowedBlockPayloadSchema(schema)) {
@@ -18,11 +18,12 @@ export const BlockAllowedPayloadSchemasValidator: BlockValidatorFunction = (
         ))
       }
     }
-  } catch (e) {
+  } catch (ex) {
     errors.push(new BlockValidationError(
       (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
       block,
-      `Failed BlockAllowedPayloadSchemasValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `validation excepted: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/block/validators/Fields.ts

@@ -12,7 +12,7 @@ export const BlockFieldsValidator: BlockValidatorFunction = (
   block: BlockBoundWitness,
   chainId?: Address,
 ) => {
-  const errors: (BlockValidationError | Error)[] = []
+  const errors: BlockValidationError[] = []
   try {
     if (isDefined(chainId) && block.chain !== chainId.toLowerCase()) {
       errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'Invalid chain id'))
@@ -34,11 +34,12 @@ export const BlockFieldsValidator: BlockValidatorFunction = (
         `Duplicate Transaction Hashes: ${txHashes}`,
       ))
     }
-  } catch (e) {
+  } catch (ex) {
     errors.push(new BlockValidationError(
       (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
       block,
-      `Failed BlockFieldsValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `validation excepted: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/block/validators/JsonSchema.ts

@@ -1,5 +1,4 @@
 import { ZERO_HASH } from '@xylabs/hex'
-import { toJsonString } from '@xylabs/object'
 import { BlockBoundWitnessWithStorageMetaJsonSchema } from '@xyo-network/chain-schema'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
 import {
@@ -8,29 +7,33 @@ import {
 import type { AnySchema } from 'ajv'
 import { Ajv } from 'ajv'
 
-export const BlockJsonSchemaValidator = (jsonSchema: AnySchema = BlockBoundWitnessWithStorageMetaJsonSchema): BlockValidatorFunction => async (
-  block: BlockBoundWitness,
-) => {
-  const errors: (BlockValidationError | Error)[] = []
-  try {
-    const ajv = new Ajv({ allErrors: true, strict: true })
-    // see if you can export the super set
-    const validate = ajv.compile(jsonSchema)
-    await validate(block)
-    if ((validate.errors ?? []).length > 0) {
+export const BlockJsonSchemaValidator = (jsonSchema: AnySchema = BlockBoundWitnessWithStorageMetaJsonSchema): BlockValidatorFunction => {
+  const ajv = new Ajv({ allErrors: true, strict: true })
+  const validate = ajv.compile(jsonSchema)
+  return async (
+    block: BlockBoundWitness,
+  ) => {
+    const errors: BlockValidationError[] = []
+    try {
+      await validate(block)
+      if ((validate.errors ?? []).length > 0) {
+        const error = new BlockValidationError(
+          (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
+          block,
+          `failed JSON schema validation: ${ajv.errorsText(validate.errors, { separator: '\n' })}`,
+        )
+        error.cause = validate.errors
+        errors.push(error)
+      }
+    } catch (ex) {
       const error = new BlockValidationError(
         (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
         block,
-        `failed JSON schema validation: ${toJsonString(block, 10)} ${toJsonString(validate.errors, 10)}`,
+        `validation excepted: ${ex}`,
       )
-      errors.push(error, ...validate.errors?.map(e => new Error(`  ${e.instancePath} ${e.message ?? ''}`)) ?? [])
+      error.cause = ex
+      errors.push(error)
     }
-  } catch (e) {
-    errors.push(new BlockValidationError(
-      (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
-      block,
-      `Failed BlockJsonSchemaValidator: ${e instanceof Error ? e.message : String(e)}`,
-    ))
+    return errors
   }
-  return errors
 }

package/src/block/validators/PreviousHash.ts

@@ -6,7 +6,7 @@ import { BlockValidationError } from '@xyo-network/xl1-protocol'
 export const BlockPreviousHashValidator: BlockValidatorFunction = (
   block: BlockBoundWitness,
 ) => {
-  const errors: (BlockValidationError | Error)[] = []
+  const errors: BlockValidationError[] = []
   try {
     const blockNumber = block.block
     if (blockNumber > 0n) {
@@ -23,12 +23,14 @@ export const BlockPreviousHashValidator: BlockValidatorFunction = (
     // we have a negative block number
       errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'invalid block number'))
     }
-  } catch (e) {
-    errors.push(new BlockValidationError(
+  } catch (ex) {
+    const error = new BlockValidationError(
       (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
       block,
-      `Failed BlockPreviousHashValidator: ${e instanceof Error ? e.message : String(e)}`,
-    ))
+      `Failed BlockPreviousHashValidator: ${ex}`,
+    )
+    error.cause = ex
+    errors.push(error)
   }
   return errors
 }

package/src/boundwitness/validators/BoundWitnessReferences.ts

@@ -18,8 +18,8 @@ export const BoundWitnessReferencesValidator
 // eslint-disable-next-line complexity
 = <T extends BoundWitness = BoundWitness>(allowedSchemas?: Schema[]): HydratedBoundWitnessValidationFunction<T> => (
   [bw, payloadSet]: HydratedBoundWitnessWithHashStorageMeta<T>,
-): Promisable<(HydratedBoundWitnessValidationError | Error)[]> => {
-  const errors: (HydratedBoundWitnessValidationError | Error)[] = []
+): Promisable<HydratedBoundWitnessValidationError[]> => {
+  const errors: HydratedBoundWitnessValidationError[] = []
   try {
     const payloads = getPayloadsFromPayloadArray(payloadSet, bw.payload_hashes)
     if (payloads.length !== bw.payload_hashes.length) {
@@ -49,7 +49,9 @@ export const BoundWitnessReferencesValidator
       }
     }
   } catch (ex) {
-    errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], 'validation excepted'), ex as Error)
+    const error = new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], `validation excepted: ${ex}`)
+    error.cause = ex
+    errors.push(error)
   }
   return errors
 }

package/src/boundwitness/validators/BoundWitnessSignatures.ts

@@ -10,17 +10,19 @@ import { BoundWitnessValidationError } from '@xyo-network/xl1-protocol'
 export const BoundWitnessSignaturesValidator: BoundWitnessValidationFunction = async (
   bw: BoundWitness,
 ) => {
-  const errors: (BoundWitnessValidationError | Error)[] = []
+  const errors: BoundWitnessValidationError[] = []
   try {
     const dataHash = await BoundWitnessBuilder.dataHash(bw)
-    const results: [Address, (Error | BoundWitnessValidationError)[]][] = await Promise.all(bw.addresses.map(async (address, index) => {
+    const results: [Address, Error[]][] = await Promise.all(bw.addresses.map(async (address, index) => {
       return [address, await BoundWitnessValidator.validateSignature(toArrayBuffer(dataHash), toArrayBuffer(address), toArrayBuffer(bw.$signatures[index]))]
     }))
     for (const [, bwErrors] of results) {
-      errors.push(...bwErrors)
+      for (const bwError of bwErrors) {
+        errors.push(new BoundWitnessValidationError((bw as WithStorageMeta<BoundWitness>)?._hash ?? ZERO_HASH, bw, 'validation errors', bwError))
+      }
     }
   } catch (ex) {
-    errors.push(new BoundWitnessValidationError((bw as WithStorageMeta<BoundWitness>)?._hash ?? ZERO_HASH, bw, 'validation excepted'), ex as Error)
+    errors.push(new BoundWitnessValidationError((bw as WithStorageMeta<BoundWitness>)?._hash ?? ZERO_HASH, bw, 'validation excepted', ex))
   }
   return errors
 }

package/src/elevatedPayload/lib/validateElevatedFromBlock.ts

@@ -1,20 +1,25 @@
-import type { Promisable } from '@xylabs/promise'
-import { transactionsFromHydratedBlock } from '@xyo-network/chain-protocol'
 import type { HydratedBlock, InBlockPayloadValidationFunction } from '@xyo-network/xl1-protocol'
+import { InBlockPayloadValidationError } from '@xyo-network/xl1-protocol'
+import { transactionsFromHydratedBlock } from '@xyo-network/xl1-protocol-sdk'
 
 export const validateElevatedFromBlock: InBlockPayloadValidationFunction = (
   payload,
   block: HydratedBlock,
-): Promisable<Error[]> => {
-  const errors: Error[] = []
+) => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
     const txs = transactionsFromHydratedBlock(block)
     const allTxPayloadHashes = new Set(txs.flatMap(tx => tx.payload_hashes))
     if (allTxPayloadHashes.has(payload._hash)) {
-      errors.push(new Error(`Transaction may not include block payload hash [${payload.schema}]: ${payload._hash}`))
+      errors.push(new InBlockPayloadValidationError(
+        block[0]?._hash,
+        block,
+        payload,
+        `Transaction may not include block payload hash [${payload.schema}]: ${payload._hash}`,
+      ))
     }
-  } catch (e) {
-    errors.push(new Error(`Failed validateElevatedFromBlock: ${e instanceof Error ? e.message : String(e)}`))
+  } catch (ex) {
+    errors.push(new InBlockPayloadValidationError(block[0]?._hash, block, payload, `validation excepted: ${ex}`, ex))
   }
   return errors
 }

package/src/elevatedPayload/lib/validateElevatedFromTransaction.ts

@@ -1,24 +1,30 @@
-import type { Promisable } from '@xylabs/promise'
-import { transactionsFromHydratedBlock } from '@xyo-network/chain-protocol'
 import type { HydratedBlock, InBlockPayloadValidationFunction } from '@xyo-network/xl1-protocol'
+import { InBlockPayloadValidationError } from '@xyo-network/xl1-protocol'
+import { transactionsFromHydratedBlock } from '@xyo-network/xl1-protocol-sdk'
 
 export const validateElevatedFromTransaction: InBlockPayloadValidationFunction = (
   payload,
   block: HydratedBlock,
-): Promisable<Error[]> => {
-  const errors: Error[] = []
+) => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
     const txs = transactionsFromHydratedBlock(block)
     if (txs.length > 0) {
       const hashes = txs.flatMap(tx => tx.payload_hashes)
       if (!hashes.includes(payload._hash)) {
-        errors.push(new Error('Transaction does not include payload'))
+        errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, 'Transaction does not include payload'))
       }
     } else {
-      errors.push(new Error('No Transactions in block'))
+      errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, 'No Transactions in block'))
     }
-  } catch (e) {
-    errors.push(new Error(`Failed validateElevatedFromTransaction: ${e instanceof Error ? e.message : String(e)}`))
+  } catch (ex) {
+    errors.push(new InBlockPayloadValidationError(
+      payload._hash,
+      block,
+      payload,
+      `Failed validateElevatedFromTransaction: ${ex}`,
+      ex,
+    ))
   }
   return errors
 }

package/src/elevatedPayload/lib/validateIncludedInBlock.ts

@@ -7,8 +7,8 @@ export const validateIncludedInBlock = (payload: WithStorageMeta<Payload>, block
     if (!block.payload_hashes.includes(payload._hash)) {
       errors.push(new Error('Payload not included in block'))
     }
-  } catch (e) {
-    errors.push(new Error(`Failed validateIncludedInBlock: ${e instanceof Error ? e.message : String(e)}`))
+  } catch (ex) {
+    errors.push(new Error(`Failed validateIncludedInBlock: ${ex}`))
   }
   return errors
 }

package/src/elevatedPayload/lib/validateTransactionInBlock.ts

@@ -1,22 +1,26 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import { isStorageMeta } from '@xyo-network/payload-model'
 import type { HydratedBlock, InBlockPayloadValidationFunction } from '@xyo-network/xl1-protocol'
-import { isTransactionBoundWitness } from '@xyo-network/xl1-protocol'
+import { InBlockPayloadValidationError, isTransactionBoundWitness } from '@xyo-network/xl1-protocol'
 
 import { BoundWitnessSignaturesValidator } from '../../boundwitness/index.ts'
 
 export const validateTransactionInBlock: InBlockPayloadValidationFunction = async (
   payload,
-  _block: HydratedBlock,
-): Promise<Error[]> => {
-  const errors: Error[] = []
+  block: HydratedBlock,
+): Promise<InBlockPayloadValidationError[]> => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
     if (isTransactionBoundWitness(payload) && isStorageMeta(payload)) {
-      errors.push(...await BoundWitnessSignaturesValidator(payload))
+      const txErrors = await BoundWitnessSignaturesValidator(payload)
+      for (const txError of txErrors) {
+        errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, `BoundWitnessSignaturesValidator error: ${txError}`, txError))
+      }
     } else {
-      errors.push(new Error('Payload failed isTransactionBoundWitness or isStorageMeta'))
+      errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, 'Payload failed isTransactionBoundWitness or isStorageMeta'))
     }
-  } catch (e) {
-    errors.push(new Error(`Failed validateTransactionInBlock: ${e instanceof Error ? e.message : String(e)}`))
+  } catch (ex) {
+    errors.push(new InBlockPayloadValidationError(payload._hash ?? ZERO_HASH, block, payload, `validation excepted: ${ex}`, ex))
   }
   return errors
 }

package/src/elevatedPayload/lib/validateTypedPayloadInBlock.ts

@@ -23,8 +23,8 @@ export const validateTypedPayloadInBlock = async <T extends Payload>(
     } else {
       errors.push(new Error('Payload failed identityFunction or isElevated or isStorageMeta'))
     }
-  } catch (e) {
-    errors.push(new Error(`Failed validateTypedPayloadInBlock: ${e instanceof Error ? e.message : String(e)}`))
+  } catch (ex) {
+    errors.push(new Error(`Failed validateTypedPayloadInBlock: ${ex}`))
   }
   return errors
 }

package/src/elevatedPayload/payloads/validateChainStakeIntentInBlock.ts

@@ -7,16 +7,20 @@ import { validateTypedPayloadInBlock } from '../lib/index.ts'
 export const validateChainStakeIntentInBlock: InBlockPayloadValidationFunction = async (
   payload,
   block: HydratedBlock,
-): Promise<(InBlockPayloadValidationError | Error)[]> => {
-  const errors: (InBlockPayloadValidationError | Error)[] = []
+) => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
-    errors.push(...await validateTypedPayloadInBlock(payload, block, isChainStakeIntent))
-  } catch (e) {
+    const typedErrors = await validateTypedPayloadInBlock(payload, block, isChainStakeIntent)
+    for (const typedError of typedErrors) {
+      errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, `validateTypedPayloadInBlock error: ${typedError}`, typedError))
+    }
+  } catch (ex) {
     errors.push(new InBlockPayloadValidationError(
       block[0]?._hash ?? ZERO_HASH,
       block,
       payload,
-      `Failed validateChainStakeIntentInBlock: ${e instanceof Error ? e.message : String(e)}`,
+      `validation excepted: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/elevatedPayload/payloads/validateHashInBlock.ts

@@ -7,16 +7,20 @@ import { validateTypedPayloadInBlock } from '../lib/index.ts'
 export const validateHashInBlock: InBlockPayloadValidationFunction = async (
   payload,
   block: HydratedBlock,
-): Promise<(InBlockPayloadValidationError | Error)[]> => {
-  const errors: (InBlockPayloadValidationError | Error)[] = []
+) => {
+  const errors: (InBlockPayloadValidationError)[] = []
   try {
-    errors.push(...await validateTypedPayloadInBlock(payload, block, isHashPayload))
-  } catch (e) {
+    const typedErrors = await validateTypedPayloadInBlock(payload, block, isHashPayload)
+    for (const typedError of typedErrors) {
+      errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, `validateTypedPayloadInBlock error: ${typedError}`, typedError))
+    }
+  } catch (ex) {
     errors.push(new InBlockPayloadValidationError(
       (block?.[0])?._hash ?? ZERO_HASH,
       block,
       payload,
-      `Failed validateHashInBlock: ${e instanceof Error ? e.message : String(e)}`,
+      `validation excepted: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/elevatedPayload/payloads/validateSchemaInBlock.ts

@@ -8,16 +8,20 @@ import { validateTypedPayloadInBlock } from '../lib/index.ts'
 export const validateSchemaInBlock: InBlockPayloadValidationFunction = async (
   payload,
   block: HydratedBlock,
-): Promise<(InBlockPayloadValidationError | Error)[]> => {
-  const errors: Error[] = []
+) => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
-    errors.push(...await validateTypedPayloadInBlock(payload, block, isSchemaPayload))
-  } catch (e) {
+    const typedErrors = await validateTypedPayloadInBlock(payload, block, isSchemaPayload)
+    for (const typedError of typedErrors) {
+      errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, `validateTypedPayloadInBlock error: ${typedError}`, typedError))
+    }
+  } catch (ex) {
     errors.push(new InBlockPayloadValidationError(
       (block?.[0])?._hash ?? ZERO_HASH,
       block,
       payload,
-      `Failed validateSchemaInBlock: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed validateSchemaInBlock: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/elevatedPayload/payloads/validateTransferInBlock.ts

@@ -10,16 +10,20 @@ import { validateTypedPayloadInBlock } from '../lib/index.ts'
 export const validateTransferInBlock: InBlockPayloadValidationFunction = async (
   payload,
   block: HydratedBlock,
-): Promise<Error[]> => {
-  const errors: (InBlockPayloadValidationError | Error)[] = []
+) => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
-    errors.push(...await validateTypedPayloadInBlock(payload, block, isTransfer))
-  } catch (e) {
+    const typedErrors = await validateTypedPayloadInBlock(payload, block, isTransfer)
+    for (const typedError of typedErrors) {
+      errors.push(new InBlockPayloadValidationError(payload._hash, block, payload, `validateTypedPayloadInBlock error: ${typedError}`, typedError))
+    }
+  } catch (ex) {
     errors.push(new InBlockPayloadValidationError(
       (block?.[0])?._hash ?? ZERO_HASH,
       block,
       payload,
-      `Failed validateTransferInBlock: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed validateTransferInBlock: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/elevatedPayload/validatePayloadInBlock.ts

@@ -27,8 +27,8 @@ const payloadValidators: Partial<Record<Schema, InBlockPayloadValidationFunction
 export const validatePayloadInBlock: InBlockPayloadValidationFunction = async (
   payload,
   block: HydratedBlock,
-): Promise<(InBlockPayloadValidationError | Error)[]> => {
-  const errors: (InBlockPayloadValidationError | Error)[] = []
+): Promise<InBlockPayloadValidationError[]> => {
+  const errors: InBlockPayloadValidationError[] = []
   try {
     const validator = payloadValidators[payload.schema]
     if (validator) {
@@ -36,13 +36,15 @@ export const validatePayloadInBlock: InBlockPayloadValidationFunction = async (
     } else {
       errors.push(new InBlockPayloadValidationError((block?.[0])?._hash ?? ZERO_HASH, block, payload, `Unsupported payload schema: ${payload.schema}`))
     }
-  } catch (e) {
-    errors.push(new InBlockPayloadValidationError(
+  } catch (ex) {
+    const error = new InBlockPayloadValidationError(
       (block?.[0])?._hash ?? ZERO_HASH,
       block,
       payload,
-      `Failed validatePayloadInBlock: ${e instanceof Error ? e.message : String(e)}`,
-    ))
+      `validation excepted: ${ex}`,
+    )
+    error.cause = ex
+    errors.push(error)
   }
   return errors
 }

package/src/hydratedBlock/validateHydratedBlock.ts

@@ -10,21 +10,28 @@ export const validateHydratedBlock: HydratedBlockValidationFunction = async (
   hydratedBlock: HydratedBlock,
   chainId?: Address,
   additionalValidators: HydratedBlockValidationFunction[] = [],
-): Promise<(HydratedBlockValidationError | Error)[]> => {
-  const errors: Error[] = []
+) => {
+  const errors: HydratedBlockValidationError[] = []
   try {
-    errors.push(...await validateBlock(hydratedBlock[0], chainId))
+    const validateBlockErrors = await validateBlock(hydratedBlock[0], chainId)
+    for (const validateBlockError of validateBlockErrors) {
+      errors.push(new HydratedBlockValidationError(hydratedBlock[0]._hash, hydratedBlock, `validateBlock error: ${validateBlockError}`, validateBlockError))
+    }
+    const bwRefErrors = await BoundWitnessReferencesValidator()(hydratedBlock)
+    for (const bwRefError of bwRefErrors) {
+      errors.push(new HydratedBlockValidationError(hydratedBlock[0]._hash, hydratedBlock, `boundwitness reference error: ${bwRefError}`, bwRefError))
+    }
     const validators: HydratedBlockValidationFunction[] = [
-      BoundWitnessReferencesValidator(),
       PayloadsInBlockValidator,
       ...additionalValidators,
     ]
     errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainId)))).flat())
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedBlockValidationError(
       hydratedBlock?.[0]?._hash ?? ZERO_HASH,
       hydratedBlock,
-      `Failed validateHydratedBlock: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed validateHydratedBlock: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/hydratedBlock/validators/Payloads.ts

@@ -11,7 +11,7 @@ import { validatePayloadInBlock } from '../../elevatedPayload/validatePayloadInB
 export const PayloadsInBlockValidator: HydratedBlockValidationFunction = async (
   [block, payloads]: HydratedBlock,
 ) => {
-  const errors: (HydratedBlockValidationError | Error)[] = []
+  const errors: HydratedBlockValidationError[] = []
   try {
     const payloadMap: Partial<Record<Hash, WithHashStorageMeta<Payload>>> = {}
     for (const payload of payloads) {
@@ -25,7 +25,15 @@ export const PayloadsInBlockValidator: HydratedBlockValidationFunction = async (
       const schema = block.payload_schemas[i]
       const payload = payloadMap[hash]
       if (payload) {
-        errors.push(...await validatePayloadInBlock(payload, [block, payloads]))
+        const payloadInBlockErrors = await validatePayloadInBlock(payload, [block, payloads])
+        for (const payloadInBlockError of payloadInBlockErrors) {
+          errors.push(new HydratedBlockValidationError(
+            block?._hash ?? ZERO_HASH,
+            [block, payloads],
+            `validatePayloadInBlock error: ${payloadInBlockError}`,
+            payloadInBlockError,
+          ))
+        }
         delete remainingPayloads[hash]
       } else {
         errors.push(new HydratedBlockValidationError(block?._hash ?? ZERO_HASH, [block, payloads], `missing payload ${hash} ${schema}`))
@@ -35,11 +43,12 @@ export const PayloadsInBlockValidator: HydratedBlockValidationFunction = async (
     if (Object.keys(remainingPayloads).length > 0) {
       errors.push(new HydratedBlockValidationError(block?._hash ?? ZERO_HASH, [block, payloads], `extra payloads ${Object.keys(payloadMap).join(', ')}`))
     }
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedBlockValidationError(
       block?._hash ?? ZERO_HASH,
       [block, payloads],
-      `Failed PayloadsInBlockValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed PayloadsInBlockValidator: ${ex}`,
+      ex,
     ))
   }