@xyo-network/chain-validation 1.18.0 → 1.18.2

package/src/hydratedBlock/validateHydratedBlock.ts

@@ -1,21 +1,26 @@
+import type { Promisable } from '@xylabs/sdk-js'
 import { ZERO_HASH } from '@xylabs/sdk-js'
-import type { ChainId, HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
-import type { BlockValidatorFunction, HydratedBlockValidationFunction } from '@xyo-network/xl1-protocol-sdk'
-import { HydratedBlockValidationError } from '@xyo-network/xl1-protocol-sdk'
-import { BoundWitnessReferencesValidator } from '@xyo-network/xl1-validation'
+import type {
+  BlockValidatorFunction, ChainId, HydratedBlockValidationFunction, HydratedBlockWithHashMeta,
+} from '@xyo-network/xl1-sdk'
+import { BoundWitnessReferencesValidator, HydratedBlockValidationError } from '@xyo-network/xl1-sdk'
 
 import { validateBlock } from '../block/index.ts'
 import { PayloadsInBlockValidator } from './validators/index.ts'
 
 export const validateHydratedBlock = async (
   hydratedBlock: HydratedBlockWithHashMeta,
-  chainId?: ChainId,
+  chainIdAtBlockNumber?: (blockNumber: number) => Promisable<ChainId>,
   additionalValidators: HydratedBlockValidationFunction[] = [],
   additionalBlockValidators: BlockValidatorFunction[] = [],
 ) => {
   const errors: HydratedBlockValidationError[] = []
   try {
-    const validateBlockErrors = await validateBlock(hydratedBlock[0], chainId, additionalBlockValidators)
+    const validateBlockErrors = await validateBlock(
+      hydratedBlock[0],
+      chainIdAtBlockNumber ? await chainIdAtBlockNumber(hydratedBlock[0].block) : undefined,
+      additionalBlockValidators,
+    )
     for (const validateBlockError of validateBlockErrors) {
       errors.push(new HydratedBlockValidationError(hydratedBlock[0]._hash, hydratedBlock, `validateBlock error: ${validateBlockError}`, validateBlockError))
     }
@@ -27,7 +32,7 @@ export const validateHydratedBlock = async (
       PayloadsInBlockValidator,
       ...additionalValidators,
     ]
-    errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainId)))).flat())
+    errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainIdAtBlockNumber)))).flat())
   } catch (ex) {
     errors.push(new HydratedBlockValidationError(
       hydratedBlock?.[0]?._hash ?? ZERO_HASH,

package/src/hydratedBlock/validators/Payloads.ts

@@ -1,7 +1,7 @@
 import { type Hash, ZERO_HASH } from '@xylabs/sdk-js'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
-import type { HydratedBlockValidationFunction } from '@xyo-network/xl1-protocol-sdk'
-import { HydratedBlockValidationError } from '@xyo-network/xl1-protocol-sdk'
+import type { HydratedBlockValidationFunction } from '@xyo-network/xl1-sdk'
+import { HydratedBlockValidationError } from '@xyo-network/xl1-sdk'
 
 import { validatePayloadInBlock } from '../../elevatedPayload/index.ts'
 

package/src/hydratedBlockState/validateHydratedBlockState.ts

@@ -1,20 +1,22 @@
 import { spanRootAsync, ZERO_HASH } from '@xylabs/sdk-js'
-import type { HydratedBlockStateValidationFunction } from '@xyo-network/xl1-protocol-sdk'
-import { HydratedBlockStateValidationError } from '@xyo-network/xl1-protocol-sdk'
+import type { ChainId, HydratedBlockStateValidationFunction } from '@xyo-network/xl1-sdk'
+import { HydratedBlockStateValidationError } from '@xyo-network/xl1-sdk'
 
 import { validateHydratedBlock } from '../hydratedBlock/index.ts'
 import { RequiredBalanceBlockStateValidator } from './validators/index.ts'
 
 export const validateHydratedBlockState: HydratedBlockStateValidationFunction = async (
   hydratedBlock,
-  chainId,
+  chainIdAtBlockNumber,
   services,
   additionalValidators = [],
 ) => {
   return await spanRootAsync('validateHydratedBlockState', async () => {
     const errors: HydratedBlockStateValidationError[] = []
+    let chainId: ChainId | undefined
     try {
-      const validateHydratedBlockErrors = await validateHydratedBlock(hydratedBlock, chainId)
+      chainId = await chainIdAtBlockNumber(hydratedBlock[0].block)
+      const validateHydratedBlockErrors = await validateHydratedBlock(hydratedBlock, chainIdAtBlockNumber)
       for (const validateHydratedBlockError of validateHydratedBlockErrors) {
         errors.push(new HydratedBlockStateValidationError(
           hydratedBlock[0]._hash,
@@ -28,16 +30,16 @@ export const validateHydratedBlockState: HydratedBlockStateValidationFunction =
         RequiredBalanceBlockStateValidator,
         ...additionalValidators,
       ]
-      errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainId, services)))).flat())
+      errors.push(...(await Promise.all(validators.map(v => v(hydratedBlock, chainIdAtBlockNumber, services)))).flat())
     } catch (ex) {
       errors.push(new HydratedBlockStateValidationError(
         hydratedBlock?.[0]?._hash ?? ZERO_HASH,
-        chainId,
+        chainId ?? '00' as ChainId,
         hydratedBlock,
         `Failed validateHydratedBlockState: ${ex}`,
         ex,
       ))
     }
     return errors
-  })
+  }, { timeBudgetLimit: 100, logger: console })
 }

package/src/hydratedBlockState/validators/RequiredBalance.ts

@@ -1,17 +1,20 @@
-import type { Address } from '@xylabs/sdk-js'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import { spanRootAsync, ZERO_HASH } from '@xylabs/sdk-js'
-import type { ChainId, HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
-import { AttoXL1, XYO_ZERO_ADDRESS } from '@xyo-network/xl1-protocol'
-import type { AccountBalanceViewer, HydratedBlockStateValidationFunction } from '@xyo-network/xl1-protocol-sdk'
-import { HydratedBlockStateValidationError, netBalancesForPayloads } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  AccountBalanceViewer, ChainId, HydratedBlockStateValidationFunction, HydratedBlockWithHashMeta,
+} from '@xyo-network/xl1-sdk'
+import {
+  AttoXL1, HydratedBlockStateValidationError, netBalancesForPayloads, XYO_ZERO_ADDRESS,
+} from '@xyo-network/xl1-sdk'
 
 export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFunction = async (
   block: HydratedBlockWithHashMeta,
-  chainId: ChainId,
+  chainIdAtBlockNumber: (blockNumber: number) => Promisable<ChainId>,
   services: { accountBalance: AccountBalanceViewer },
 ) => {
   return await spanRootAsync('RequiredBalanceBlockStateValidator', async () => {
     const errors: HydratedBlockStateValidationError[] = []
+    let chainId = '00' as ChainId
     try {
       // TODO: Filter by non-producer elevated payloads
     // to allow for transfers from ZERO address
@@ -26,10 +29,11 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
       const previous = block[0].previous
       if (previous === null) return [new HydratedBlockStateValidationError(
         block?.[0]?._hash ?? ZERO_HASH,
-        chainId,
+        '00' as ChainId,
         block,
         'Insufficient funds because first block',
       )]
+      chainId = await chainIdAtBlockNumber(block[0].block)
       await spanRootAsync('RequiredBalanceBlockStateValidator|balancesLoop', async () => {
         for (const [address, reqBalance] of Object.entries(requiredBalances) as [Address, bigint][]) {
           const result = await services.accountBalance.accountBalances([address], { head: previous })
@@ -43,7 +47,7 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
             ))
           }
         }
-      })
+      }, { timeBudgetLimit: 100, logger: console })
     } catch (ex) {
       errors.push(new HydratedBlockStateValidationError(
         block?.[0]?._hash ?? ZERO_HASH,
@@ -54,5 +58,5 @@ export const RequiredBalanceBlockStateValidator: HydratedBlockStateValidationFun
       ))
     }
     return await Promise.resolve(errors)
-  })
+  }, { timeBudgetLimit: 200, logger: console })
 }