@xyo-network/chain-validation 1.5.35 → 1.5.36

package/src/hydratedBlockState/validateHydratedBlockState.ts

@@ -1,32 +1,43 @@
 import { type Address, ZERO_HASH } from '@xylabs/hex'
 import type {
-  AccountBalanceService, HydratedBlock, HydratedBlockStateValidationFunction,
+  AccountBalanceServiceV2, HydratedBlock,
+  HydratedBlockStateValidationFunctionV2,
 } from '@xyo-network/xl1-protocol'
 import { HydratedBlockStateValidationError } from '@xyo-network/xl1-protocol'
 
 import { validateHydratedBlock } from '../hydratedBlock/index.ts'
 import { RequiredBalanceBlockStateValidator } from './validators/index.ts'
 
-export const validateHydratedBlockState: HydratedBlockStateValidationFunction = async (
+export const validateHydratedBlockState: HydratedBlockStateValidationFunctionV2 = async (
   hydratedBlock: HydratedBlock,
   chainId: Address,
-  services: { accountBalance: AccountBalanceService },
-  additionalValidators: HydratedBlockStateValidationFunction[] = [],
-): Promise<(HydratedBlockStateValidationError | Error)[]> => {
-  const errors: Error[] = []
+  services: { accountBalance: AccountBalanceServiceV2 },
+  additionalValidators: HydratedBlockStateValidationFunctionV2[] = [],
+) => {
+  const errors: HydratedBlockStateValidationError[] = []
   try {
-    errors.push(...await validateHydratedBlock(hydratedBlock, chainId))
-    const validators: HydratedBlockStateValidationFunction[] = [
+    const validateHydratedBlockErrors = await validateHydratedBlock(hydratedBlock, chainId)
+    for (const validateHydratedBlockError of validateHydratedBlockErrors) {
+      errors.push(new HydratedBlockStateValidationError(
+        hydratedBlock[0]._hash,
+        chainId,
+        hydratedBlock,
+        `validateBlock error: ${validateHydratedBlockError}`,
+        validateHydratedBlockError,
+      ))
+    }
+    const validators: HydratedBlockStateValidationFunctionV2[] = [
       RequiredBalanceBlockStateValidator,
       ...additionalValidators,
     ]
     errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainId, services)))).flat())
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedBlockStateValidationError(
       hydratedBlock?.[0]?._hash ?? ZERO_HASH,
       chainId,
       hydratedBlock,
-      `Failed validateHydratedBlockState: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed validateHydratedBlockState: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/hydratedBlockState/validators/RequiredBalance.ts

@@ -1,19 +1,18 @@
-import {
-  type Address, hexToBigInt, ZERO_HASH,
-} from '@xylabs/hex'
-import { netBalancesForPayloads } from '@xyo-network/chain-protocol'
+import { type Address, ZERO_HASH } from '@xylabs/hex'
 import { XYO_ZERO_ADDRESS } from '@xyo-network/chain-utils'
 import type {
-  AccountBalanceService, HydratedBlock, HydratedBlockStateValidationFunction,
+  AccountBalanceServiceV2, HydratedBlock,
+  HydratedBlockStateValidationFunctionV2,
 } from '@xyo-network/xl1-protocol'
-import { HydratedBlockStateValidationError } from '@xyo-network/xl1-protocol'
+import { AttoXL1, HydratedBlockStateValidationError } from '@xyo-network/xl1-protocol'
+import { netBalancesForPayloads } from '@xyo-network/xl1-protocol-sdk'
 
-export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFunction = async (
+export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFunctionV2 = async (
   block: HydratedBlock,
   chainId: Address,
-  services: { accountBalance: AccountBalanceService },
+  services: { accountBalance: AccountBalanceServiceV2 },
 ) => {
-  const errors: (HydratedBlockStateValidationError | Error)[] = []
+  const errors: HydratedBlockStateValidationError[] = []
   try {
   // TODO: Filter by non-producer elevated payloads
     // to allow for transfers from ZERO address
@@ -34,7 +33,8 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
     )]
 
     for (const [address, reqBalance] of Object.entries(requiredBalances) as [Address, bigint][]) {
-      const balance = hexToBigInt(services.accountBalance.getBalance(address))
+      const result = await services.accountBalance.balances(previous, [address])
+      const balance = result[address] ?? AttoXL1(0n)
       if (address !== XYO_ZERO_ADDRESS && reqBalance > balance) {
         errors.push(new HydratedBlockStateValidationError(
           block?.[0]?._hash ?? ZERO_HASH,
@@ -44,13 +44,15 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
         ))
       }
     }
-  } catch (e) {
+  } /*
+  catch (ex) {
     errors.push(new HydratedBlockStateValidationError(
       block?.[0]?._hash ?? ZERO_HASH,
       chainId,
       block,
-      `Failed RequiredBalanceBlockStateValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed RequiredBalanceBlockStateValidator: ${ex}`,
+      ex,
     ))
-  }
+  } */ finally {}
   return await Promise.resolve(errors)
 }

package/src/transaction/validateTransaction.ts

@@ -27,7 +27,7 @@ export async function validateTransaction(
       ...additionalValidators,
     ]
     return (await Promise.all(validators.map(v => v(tx, chainId)))).flat()
-  } catch (e) {
-    return [(new Error(`Failed TransactionGasValidator: ${e instanceof Error ? e.message : String(e)}`))]
+  } catch (ex) {
+    return [(new Error(`Failed TransactionGasValidator: ${ex}`))]
   }
 }

package/src/transaction/validators/TransactionDurationValidator.ts

@@ -8,7 +8,7 @@ import { HydratedTransactionValidationError } from '@xyo-network/xl1-protocol'
 export const TransactionDurationValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
-  const errors: (HydratedTransactionValidationError | Error)[] = []
+  const errors: HydratedTransactionValidationError[] = []
   try {
     const { exp, nbf } = tx[0]
     if (nbf < 0) errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'Transaction nbf must be positive'))
@@ -20,11 +20,12 @@ export const TransactionDurationValidator: HydratedTransactionValidationFunction
       tx,
       'Transaction exp must not be too far in the future',
     ))
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedTransactionValidationError(
       tx?.[0]?._hash ?? ZERO_HASH,
       tx,
-      `Failed TransactionDurationValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed TransactionDurationValidator: ${ex}`,
+      ex,
     ))
   }
 

package/src/transaction/validators/TransactionElevationValidator.ts

@@ -8,18 +8,19 @@ import { HydratedTransactionValidationError } from '@xyo-network/xl1-protocol'
 export const TransactionElevationValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
-  const errors: (HydratedTransactionValidationError | Error)[] = []
+  const errors: HydratedTransactionValidationError[] = []
   try {
     try {
       extractElevatedHashes(tx)
     } catch {
       errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'Hydrated transaction does not include all script hashes'))
     }
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedTransactionValidationError(
       tx?.[0]?._hash ?? ZERO_HASH,
       tx,
-      `Failed TransactionElevationValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed TransactionElevationValidator: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/transaction/validators/TransactionFromValidator.ts

@@ -8,7 +8,7 @@ import { HydratedTransactionValidationError } from '@xyo-network/xl1-protocol'
 export const TransactionFromValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
-  const errors: (HydratedTransactionValidationError | Error)[] = []
+  const errors: HydratedTransactionValidationError[] = []
   try {
     const from = asAddress(tx[0].from)
     if (from === undefined)errors.push(new HydratedTransactionValidationError(
@@ -21,11 +21,12 @@ export const TransactionFromValidator: HydratedTransactionValidationFunction<Tra
       tx,
       'Transaction from address must be listed in addresses',
     ))
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedTransactionValidationError(
       tx?.[0]?._hash ?? ZERO_HASH,
       tx,
-      `Failed TransactionFromValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed TransactionFromValidator: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/transaction/validators/TransactionGasValidator.ts

@@ -14,7 +14,7 @@ import {
 export const TransactionGasValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
-  const errors: (HydratedTransactionValidationError | Error)[] = []
+  const errors: HydratedTransactionValidationError[] = []
   try {
     if (tx?.[0].fees === undefined) {
       errors.push(new HydratedTransactionValidationError(
@@ -73,11 +73,12 @@ export const TransactionGasValidator: HydratedTransactionValidationFunction<Tran
         `fees.priority must be >= ${minTransactionFees.priority}`,
       ))
     }
-  } catch (e) {
+  } catch (ex) {
     errors.push(new HydratedTransactionValidationError(
       tx?.[0]?._hash ?? ZERO_HASH,
       tx,
-      `Failed TransactionGasValidator: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed TransactionGasValidator: ${ex}`,
+      ex,
     ))
   }
   return errors

package/src/transaction/validators/TransactionJsonSchemaValidator.ts

@@ -1,5 +1,4 @@
 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 {
@@ -16,21 +15,20 @@ let validate: ValidateFunction<TransactionBoundWitness> | undefined
 export const TransactionJsonSchemaValidator: HydratedTransactionValidationFunction<TransactionBoundWitness> = (
   tx: HydratedTransaction,
 ) => {
-  const errors: (HydratedTransactionValidationError | Error)[] = []
+  const errors: HydratedTransactionValidationError[] = []
   try {
     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?.[0]?._hash ?? ZERO_HASH,
         tx,
-        `failed JSON schema validation: ${toJsonString(tx, 10)} ${toJsonString(validate.errors, 10)}`,
+        `failed JSON schema validation: ${ajv.errorsText(validate.errors, { separator: '\n' })}`,
       )
       error.cause = validate.errors
       errors.push(error)
     }
   } catch (ex) {
-    errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'validation excepted'), ex as Error)
+    errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'validation excepted', ex))
   }
   return errors
 }

package/src/transaction/validators/TransactionProtocolValidator.ts

@@ -8,13 +8,13 @@ export const TransactionProtocolValidator: HydratedTransactionValidationFunction
   tx: HydratedTransaction,
   chainId?: Address,
 ) => {
-  const errors: (HydratedTransactionValidationError | Error)[] = []
+  const errors: HydratedTransactionValidationError[] = []
   try {
     if (chainId !== undefined && tx[0].chain !== chainId) {
       errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'invalid chain id'))
     }
   } catch (ex) {
-    errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'validation excepted'), ex as Error)
+    errors.push(new HydratedTransactionValidationError(tx?.[0]?._hash ?? ZERO_HASH, tx, 'validation excepted', ex))
   }
   return await Promise.resolve(errors)
 }