@xyo-network/chain-validation 1.5.32 → 1.5.34

package/src/block/validators/JsonSchema.ts

@@ -1,4 +1,7 @@
+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 {
   type BlockBoundWitness, BlockValidationError, type BlockValidatorFunction,
 } from '@xyo-network/xl1-protocol'
@@ -15,11 +18,19 @@ export const BlockJsonSchemaValidator = (jsonSchema: AnySchema = BlockBoundWitne
     const validate = ajv.compile(jsonSchema)
     await validate(block)
     if ((validate.errors ?? []).length > 0) {
-      const error = new BlockValidationError(block, 'failed JSON schema validation: ')
+      const error = new BlockValidationError(
+        (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
+        block,
+        `failed JSON schema validation: ${toJsonString(block, 10)} ${toJsonString(validate.errors, 10)}`,
+      )
       errors.push(error, ...validate.errors?.map(e => new Error(`  ${e.instancePath} ${e.message ?? ''}`)) ?? [])
     }
   } catch (e) {
-    errors.push(new BlockValidationError(block, `Failed BlockJsonSchemaValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new BlockValidationError(
+      (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
+      block,
+      `Failed BlockJsonSchemaValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/block/validators/PreviousHash.ts

@@ -1,4 +1,5 @@
-import { isHash } from '@xylabs/hex'
+import { isHash, ZERO_HASH } from '@xylabs/hex'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
 import type { BlockBoundWitness, BlockValidatorFunction } from '@xyo-network/xl1-protocol'
 import { BlockValidationError } from '@xyo-network/xl1-protocol'
 
@@ -11,19 +12,23 @@ export const BlockPreviousHashValidator: BlockValidatorFunction = (
     if (blockNumber > 0n) {
     // if this is not the first block, validate previous hashes
       if (!isHash(block.previous)) {
-        errors.push(new BlockValidationError(block, 'previous hash is missing or invalid'))
+        errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'previous hash is missing or invalid'))
       }
     } else if (blockNumber === 0) {
     // if this is the first block, validate previous hashes
       if (block.previous !== null) {
-        errors.push(new BlockValidationError(block, 'previous hash should not be set'))
+        errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'previous hash should not be set'))
       }
     } else {
     // we have a negative block number
-      errors.push(new BlockValidationError(block, 'invalid block number'))
+      errors.push(new BlockValidationError((block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH, block, 'invalid block number'))
     }
   } catch (e) {
-    errors.push(new BlockValidationError(block, `Failed BlockPreviousHashValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new BlockValidationError(
+      (block as WithStorageMeta<BlockBoundWitness>)?._hash ?? ZERO_HASH,
+      block,
+      `Failed BlockPreviousHashValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/boundwitness/validators/BoundWitnessReferences.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import { type Hash, ZERO_HASH } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 import type { BoundWitness } from '@xyo-network/boundwitness-model'
 import type {
@@ -15,6 +15,7 @@ function getPayloadsFromPayloadArray(payloads: WithHashStorageMeta<Payload>[], h
 }
 
 export const BoundWitnessReferencesValidator
+// eslint-disable-next-line complexity
 = <T extends BoundWitness = BoundWitness>(allowedSchemas?: Schema[]): HydratedBoundWitnessValidationFunction<T> => (
   [bw, payloadSet]: HydratedBoundWitnessWithHashStorageMeta<T>,
 ): Promisable<(HydratedBoundWitnessValidationError | Error)[]> => {
@@ -22,7 +23,7 @@ export const BoundWitnessReferencesValidator
   try {
     const payloads = getPayloadsFromPayloadArray(payloadSet, bw.payload_hashes)
     if (payloads.length !== bw.payload_hashes.length) {
-      errors.push(new HydratedBoundWitnessValidationError([bw, payloadSet], 'unable to locate payloads'))
+      errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], 'unable to locate payloads'))
     }
 
     // check if payloads are valid and if their schemas match the declared schemas
@@ -32,23 +33,23 @@ export const BoundWitnessReferencesValidator
         const payloadDataHashIndex = bw.payload_hashes.indexOf(payload._dataHash)
         const payloadIndex = Math.max(payloadHashIndex, payloadDataHashIndex)
         if (payloadIndex === -1) {
-          errors.push(new HydratedBoundWitnessValidationError([bw, payloadSet], 'payload hash not found'))
+          errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], 'payload hash not found'))
         }
 
         const declaredSchema = bw.payload_schemas[payloadIndex]
         if (declaredSchema !== payload.schema) {
-          errors.push(new HydratedBoundWitnessValidationError([bw, payloadSet], 'mismatched schema'))
+          errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], 'mismatched schema'))
         }
 
         if (allowedSchemas && !allowedSchemas.includes(payload.schema)) {
-          errors.push(new HydratedBoundWitnessValidationError([bw, payloadSet], `disallowed schema [${payload.schema}]`))
+          errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], `disallowed schema [${payload.schema}]`))
         }
       } else {
-        errors.push(new HydratedBoundWitnessValidationError([bw, payloadSet], 'invalid payload'))
+        errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], 'invalid payload'))
       }
     }
   } catch (ex) {
-    errors.push(new HydratedBoundWitnessValidationError([bw, payloadSet], 'validation excepted'), ex as Error)
+    errors.push(new HydratedBoundWitnessValidationError(bw?._hash ?? ZERO_HASH, [bw, payloadSet], 'validation excepted'), ex as Error)
   }
   return errors
 }

package/src/boundwitness/validators/BoundWitnessSignatures.ts

@@ -1,8 +1,9 @@
 import { toArrayBuffer } from '@xylabs/arraybuffer'
-import type { Address } from '@xylabs/hex'
+import { type Address, ZERO_HASH } from '@xylabs/hex'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
 import type { BoundWitness } from '@xyo-network/boundwitness-model'
 import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
 import type { BoundWitnessValidationFunction } from '@xyo-network/xl1-protocol'
 import { BoundWitnessValidationError } from '@xyo-network/xl1-protocol'
 
@@ -19,7 +20,7 @@ export const BoundWitnessSignaturesValidator: BoundWitnessValidationFunction = a
       errors.push(...bwErrors)
     }
   } catch (ex) {
-    errors.push(new BoundWitnessValidationError(bw, 'validation excepted'), ex as Error)
+    errors.push(new BoundWitnessValidationError((bw as WithStorageMeta<BoundWitness>)?._hash ?? ZERO_HASH, bw, 'validation excepted'), ex as Error)
   }
   return errors
 }

package/src/elevatedPayload/payloads/validateChainStakeIntentInBlock.ts

@@ -1,3 +1,4 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import type { HydratedBlock, InBlockPayloadValidationFunction } from '@xyo-network/xl1-protocol'
 import { InBlockPayloadValidationError, isChainStakeIntent } from '@xyo-network/xl1-protocol'
 
@@ -11,7 +12,12 @@ export const validateChainStakeIntentInBlock: InBlockPayloadValidationFunction =
   try {
     errors.push(...await validateTypedPayloadInBlock(payload, block, isChainStakeIntent))
   } catch (e) {
-    errors.push(new InBlockPayloadValidationError(block, payload, `Failed validateChainStakeIntentInBlock: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new InBlockPayloadValidationError(
+      block[0]?._hash ?? ZERO_HASH,
+      block,
+      payload,
+      `Failed validateChainStakeIntentInBlock: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/elevatedPayload/payloads/validateHashInBlock.ts

@@ -1,3 +1,4 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import type { HydratedBlock, InBlockPayloadValidationFunction } from '@xyo-network/xl1-protocol'
 import { InBlockPayloadValidationError, isHashPayload } from '@xyo-network/xl1-protocol'
 
@@ -11,7 +12,12 @@ export const validateHashInBlock: InBlockPayloadValidationFunction = async (
   try {
     errors.push(...await validateTypedPayloadInBlock(payload, block, isHashPayload))
   } catch (e) {
-    errors.push(new InBlockPayloadValidationError(block, payload, `Failed validateHashInBlock: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new InBlockPayloadValidationError(
+      (block?.[0])?._hash ?? ZERO_HASH,
+      block,
+      payload,
+      `Failed validateHashInBlock: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/elevatedPayload/payloads/validateSchemaInBlock.ts

@@ -1,3 +1,4 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import { isSchemaPayload } from '@xyo-network/schema-payload-plugin'
 import type { HydratedBlock, InBlockPayloadValidationFunction } from '@xyo-network/xl1-protocol'
 import { InBlockPayloadValidationError } from '@xyo-network/xl1-protocol'
@@ -12,7 +13,12 @@ export const validateSchemaInBlock: InBlockPayloadValidationFunction = async (
   try {
     errors.push(...await validateTypedPayloadInBlock(payload, block, isSchemaPayload))
   } catch (e) {
-    errors.push(new InBlockPayloadValidationError(block, payload, `Failed validateSchemaInBlock: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new InBlockPayloadValidationError(
+      (block?.[0])?._hash ?? ZERO_HASH,
+      block,
+      payload,
+      `Failed validateSchemaInBlock: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/elevatedPayload/payloads/validateTransferInBlock.ts

@@ -1,3 +1,4 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import type {
   HydratedBlock,
   InBlockPayloadValidationFunction,
@@ -14,7 +15,12 @@ export const validateTransferInBlock: InBlockPayloadValidationFunction = async (
   try {
     errors.push(...await validateTypedPayloadInBlock(payload, block, isTransfer))
   } catch (e) {
-    errors.push(new InBlockPayloadValidationError(block, payload, `Failed validateTransferInBlock: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new InBlockPayloadValidationError(
+      (block?.[0])?._hash ?? ZERO_HASH,
+      block,
+      payload,
+      `Failed validateTransferInBlock: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/elevatedPayload/validatePayloadInBlock.ts

@@ -1,3 +1,4 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import { BoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import type { Schema } from '@xyo-network/payload-model'
 import { SchemaSchema } from '@xyo-network/schema-payload-plugin'
@@ -33,10 +34,15 @@ export const validatePayloadInBlock: InBlockPayloadValidationFunction = async (
     if (validator) {
       errors.push(...await validator(payload, block))
     } else {
-      errors.push(new InBlockPayloadValidationError(block, payload, `Unsupported payload schema: ${payload.schema}`))
+      errors.push(new InBlockPayloadValidationError((block?.[0])?._hash ?? ZERO_HASH, block, payload, `Unsupported payload schema: ${payload.schema}`))
     }
   } catch (e) {
-    errors.push(new InBlockPayloadValidationError(block, payload, `Failed validatePayloadInBlock: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new InBlockPayloadValidationError(
+      (block?.[0])?._hash ?? ZERO_HASH,
+      block,
+      payload,
+      `Failed validatePayloadInBlock: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/hydratedBlock/validateHydratedBlock.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import { type Address, ZERO_HASH } from '@xylabs/hex'
 import type { HydratedBlock, HydratedBlockValidationFunction } from '@xyo-network/xl1-protocol'
 import { HydratedBlockValidationError } from '@xyo-network/xl1-protocol'
 
@@ -21,7 +21,11 @@ export const validateHydratedBlock: HydratedBlockValidationFunction = async (
     ]
     errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainId)))).flat())
   } catch (e) {
-    errors.push(new HydratedBlockValidationError(hydratedBlock, `Failed validateHydratedBlock: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new HydratedBlockValidationError(
+      hydratedBlock?.[0]?._hash ?? ZERO_HASH,
+      hydratedBlock,
+      `Failed validateHydratedBlock: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/hydratedBlock/validators/Payloads.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import { type Hash, ZERO_HASH } from '@xylabs/hex'
 import type { Payload, WithHashStorageMeta } from '@xyo-network/payload-model'
 import type {
   HydratedBlock,
@@ -28,15 +28,19 @@ export const PayloadsInBlockValidator: HydratedBlockValidationFunction = async (
         errors.push(...await validatePayloadInBlock(payload, [block, payloads]))
         delete remainingPayloads[hash]
       } else {
-        errors.push(new HydratedBlockValidationError([block, payloads], `missing payload ${hash} ${schema}`))
+        errors.push(new HydratedBlockValidationError(block?._hash ?? ZERO_HASH, [block, payloads], `missing payload ${hash} ${schema}`))
       }
     }
 
     if (Object.keys(remainingPayloads).length > 0) {
-      errors.push(new HydratedBlockValidationError([block, payloads], `extra payloads ${Object.keys(payloadMap).join(', ')}`))
+      errors.push(new HydratedBlockValidationError(block?._hash ?? ZERO_HASH, [block, payloads], `extra payloads ${Object.keys(payloadMap).join(', ')}`))
     }
   } catch (e) {
-    errors.push(new HydratedBlockValidationError([block, payloads], `Failed PayloadsInBlockValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new HydratedBlockValidationError(
+      block?._hash ?? ZERO_HASH,
+      [block, payloads],
+      `Failed PayloadsInBlockValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
 
   return errors

package/src/hydratedBlockState/validateHydratedBlockState.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import { type Address, ZERO_HASH } from '@xylabs/hex'
 import type {
   AccountBalanceService, HydratedBlock, HydratedBlockStateValidationFunction,
 } from '@xyo-network/xl1-protocol'
@@ -23,6 +23,7 @@ export const validateHydratedBlockState: HydratedBlockStateValidationFunction =
     errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainId, services)))).flat())
   } catch (e) {
     errors.push(new HydratedBlockStateValidationError(
+      hydratedBlock?.[0]?._hash ?? ZERO_HASH,
       chainId,
       hydratedBlock,
       `Failed validateHydratedBlockState: ${e instanceof Error ? e.message : String(e)}`,

package/src/hydratedBlockState/validators/RequiredBalance.ts

@@ -1,4 +1,6 @@
-import { type Address, hexToBigInt } from '@xylabs/hex'
+import {
+  type Address, hexToBigInt, ZERO_HASH,
+} from '@xylabs/hex'
 import { netBalancesForPayloads } from '@xyo-network/chain-protocol'
 import { XYO_ZERO_ADDRESS } from '@xyo-network/chain-utils'
 import type {
@@ -24,12 +26,18 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
       }
     }
     const previous = block[0].previous
-    if (previous === null) return [new HydratedBlockStateValidationError(chainId, block, 'Insufficient funds because first block')]
+    if (previous === null) return [new HydratedBlockStateValidationError(
+      block?.[0]?._hash ?? ZERO_HASH,
+      chainId,
+      block,
+      'Insufficient funds because first block',
+    )]
 
     for (const [address, reqBalance] of Object.entries(requiredBalances) as [Address, bigint][]) {
       const balance = hexToBigInt(services.accountBalance.getBalance(address))
       if (address !== XYO_ZERO_ADDRESS && reqBalance > balance) {
         errors.push(new HydratedBlockStateValidationError(
+          block?.[0]?._hash ?? ZERO_HASH,
           chainId,
           block,
           `insufficient balance for ${address} ${balance} < ${requiredBalances[address]}`,
@@ -38,6 +46,7 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
     }
   } catch (e) {
     errors.push(new HydratedBlockStateValidationError(
+      block?.[0]?._hash ?? ZERO_HASH,
       chainId,
       block,
       `Failed RequiredBalanceBlockStateValidator: ${e instanceof Error ? e.message : String(e)}`,

package/src/transaction/validators/TransactionDurationValidator.ts

@@ -1,21 +1,31 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import type {
   HydratedTransaction, HydratedTransactionValidationFunction, TransactionBoundWitness,
 } from '@xyo-network/xl1-protocol'
 import { HydratedTransactionValidationError } from '@xyo-network/xl1-protocol'
 
+// eslint-disable-next-line complexity
 export const TransactionDurationValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
   const errors: (HydratedTransactionValidationError | Error)[] = []
   try {
     const { exp, nbf } = tx[0]
-    if (nbf < 0) errors.push(new HydratedTransactionValidationError(tx, 'Transaction nbf must be positive'))
+    if (nbf < 0) errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'Transaction nbf must be positive'))
 
-    if (exp < 0) errors.push(new HydratedTransactionValidationError(tx, 'Transaction exp must be positive'))
-    if (exp <= nbf) errors.push(new HydratedTransactionValidationError(tx, 'Transaction exp must greater than nbf'))
-    if (exp - nbf > 10_000) errors.push(new HydratedTransactionValidationError(tx, 'Transaction exp must not be too far in the future'))
+    if (exp < 0) errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'Transaction exp must be positive'))
+    if (exp <= nbf) errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'Transaction exp must greater than nbf'))
+    if (exp - nbf > 10_000) errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      'Transaction exp must not be too far in the future',
+    ))
   } catch (e) {
-    errors.push(new HydratedTransactionValidationError(tx, `Failed TransactionDurationValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      `Failed TransactionDurationValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
 
   return errors

package/src/transaction/validators/TransactionElevationValidator.ts

@@ -1,3 +1,4 @@
+import { ZERO_HASH } from '@xylabs/hex'
 import { extractElevatedHashes } from '@xyo-network/chain-protocol'
 import type {
   HydratedTransaction, HydratedTransactionValidationFunction, TransactionBoundWitness,
@@ -12,10 +13,14 @@ export const TransactionElevationValidator: HydratedTransactionValidationFunctio
     try {
       extractElevatedHashes(tx)
     } catch {
-      errors.push(new HydratedTransactionValidationError(tx, 'Hydrated transaction does not include all script hashes'))
+      errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'Hydrated transaction does not include all script hashes'))
     }
   } catch (e) {
-    errors.push(new HydratedTransactionValidationError(tx, `Failed TransactionElevationValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      `Failed TransactionElevationValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/transaction/validators/TransactionFromValidator.ts

@@ -1,4 +1,4 @@
-import { asAddress } from '@xylabs/hex'
+import { asAddress, ZERO_HASH } from '@xylabs/hex'
 import { addressesContains } from '@xyo-network/boundwitness-validator'
 import type {
   HydratedTransaction, HydratedTransactionValidationFunction, TransactionBoundWitness,
@@ -11,10 +11,22 @@ export const TransactionFromValidator: HydratedTransactionValidationFunction<Tra
   const errors: (HydratedTransactionValidationError | Error)[] = []
   try {
     const from = asAddress(tx[0].from)
-    if (from === undefined)errors.push(new HydratedTransactionValidationError(tx, 'Transaction from is not a valid address'))
-    else if (!addressesContains(tx[0], from)) errors.push(new HydratedTransactionValidationError(tx, 'Transaction from address must be listed in addresses'))
+    if (from === undefined)errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      'Transaction from is not a valid address',
+    ))
+    else if (!addressesContains(tx[0], from)) errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      'Transaction from address must be listed in addresses',
+    ))
   } catch (e) {
-    errors.push(new HydratedTransactionValidationError(tx, `Failed TransactionFromValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      `Failed TransactionFromValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/transaction/validators/TransactionGasValidator.ts

@@ -1,4 +1,4 @@
-import { hexToBigInt } from '@xylabs/hex'
+import { hexToBigInt, ZERO_HASH } from '@xylabs/hex'
 import type {
   HydratedTransaction,
   HydratedTransactionValidationFunction,
@@ -10,52 +10,75 @@ import {
   minTransactionFees,
 } from '@xyo-network/xl1-protocol'
 
+// eslint-disable-next-line complexity
 export const TransactionGasValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
   const errors: (HydratedTransactionValidationError | Error)[] = []
   try {
     if (tx?.[0].fees === undefined) {
-      errors.push(new HydratedTransactionValidationError(tx, 'Missing fees'))
+      errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
+        tx,
+        'Missing fees',
+      ))
     } else {
       const {
         base, gasLimit, gasPrice, priority,
       } = parseFees(tx[0].fees)
 
       if (base === undefined) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
         tx,
         'fees.base must be defined and a valid number',
       ))
       else if (base < minTransactionFees.base) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
         tx,
         `fees.base must be >= ${minTransactionFees.base}`,
       ))
 
-      if (gasLimit === undefined) errors.push(new HydratedTransactionValidationError(tx, 'fees.gasLimit must be defined and a valid number'))
+      if (gasLimit === undefined) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
+        tx,
+        'fees.gasLimit must be defined and a valid number',
+      ))
       else if (gasLimit < minTransactionFees.gasLimit) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
         tx,
         `fees.gasLimit must be >= ${minTransactionFees.gasLimit}`,
       ))
 
       if (gasPrice === undefined) errors.push(
-        new HydratedTransactionValidationError(tx, 'fees.gasPrice must be defined and a valid number'),
+        new HydratedTransactionValidationError(
+          tx?.[0]?._hash ?? ZERO_HASH,
+          tx,
+          'fees.gasPrice must be defined and a valid number',
+        ),
       )
       else if (gasPrice < minTransactionFees.gasPrice) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
         tx,
         `fees.gasPrice must be >= ${minTransactionFees.gasPrice}`,
       ))
 
       if (priority === undefined) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
         tx,
         'fees.priority must be defined and a valid number',
       ))
       else if (priority < minTransactionFees.priority) errors.push(new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
         tx,
         `fees.priority must be >= ${minTransactionFees.priority}`,
       ))
     }
   } catch (e) {
-    errors.push(new HydratedTransactionValidationError(tx, `Failed TransactionGasValidator: ${e instanceof Error ? e.message : String(e)}`))
+    errors.push(new HydratedTransactionValidationError(
+      tx?.[0]?._hash ?? ZERO_HASH,
+      tx,
+      `Failed TransactionGasValidator: ${e instanceof Error ? e.message : String(e)}`,
+    ))
   }
   return errors
 }

package/src/transaction/validators/TransactionJsonSchemaValidator.ts

@@ -1,3 +1,5 @@
+import { ZERO_HASH } from '@xylabs/hex'
+import { toJsonString } from '@xylabs/object'
 import { TransactionBoundWitnessJsonSchema } from '@xyo-network/chain-schema'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type {
@@ -19,12 +21,16 @@ export const TransactionJsonSchemaValidator: HydratedTransactionValidationFuncti
     if (validate === undefined) validate = ajv.compile(TransactionBoundWitnessJsonSchema)
     // see if you can export the super set
     if (!validate(PayloadBuilder.omitStorageMeta(tx[0]))) {
-      const error = new HydratedTransactionValidationError(tx, 'failed JSON schema validation')
+      const error = new HydratedTransactionValidationError(
+        tx?.[0]?._hash ?? ZERO_HASH,
+        tx,
+        `failed JSON schema validation: ${toJsonString(tx, 10)} ${toJsonString(validate.errors, 10)}`,
+      )
       error.cause = validate.errors
       errors.push(error)
     }
   } catch (ex) {
-    errors.push(new HydratedTransactionValidationError(tx, 'validation excepted'), ex as Error)
+    errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'validation excepted'), ex as Error)
   }
   return errors
 }

package/src/transaction/validators/TransactionProtocolValidator.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import { type Address, ZERO_HASH } from '@xylabs/hex'
 import type {
   HydratedTransaction, HydratedTransactionValidationFunction, TransactionBoundWitness,
 } from '@xyo-network/xl1-protocol'
@@ -11,10 +11,10 @@ export const TransactionProtocolValidator: HydratedTransactionValidationFunction
   const errors: (HydratedTransactionValidationError | Error)[] = []
   try {
     if (chainId !== undefined && tx[0].chain !== chainId) {
-      errors.push(new HydratedTransactionValidationError(tx, 'invalid chain id'))
+      errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'invalid chain id'))
     }
   } catch (ex) {
-    errors.push(new HydratedTransactionValidationError(tx, 'validation excepted'), ex as Error)
+    errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'validation excepted'), ex as Error)
   }
   return await Promise.resolve(errors)
 }