@xyo-network/xl1-protocol-sdk 1.18.21 → 1.18.23

package/dist/neutral/summary/model/summary.d.ts

@@ -1,17 +1,17 @@
-import type { Payload } from '@xyo-network/payload-model';
+import type { Payload, WithHashMeta } from '@xyo-network/payload-model';
 import type { Semaphore } from 'async-mutex';
 import type { MapType, MapTypeRead } from '../../map/index.ts';
 import type { CachingBaseContext, ChainContext, ChainContextRead } from '../../model/index.ts';
 import type { BalancesStepSummary } from './BalancesStepSummary.ts';
 import type { SchemasStepSummary } from './SchemasStepSummary.ts';
 import type { TransfersStepSummary } from './TransfersSummary.ts';
-export interface ChainSummaryContextBase<TPayload extends Payload, T extends (MapTypeRead<string, TPayload>)> extends CachingBaseContext {
+export interface ChainSummaryContextBase<TPayload extends Payload, T extends (MapTypeRead<string, WithHashMeta<TPayload>>)> extends CachingBaseContext {
     stepSemaphores: Semaphore[];
     summaryMap: T;
 }
-export interface ChainSummaryContextRead<T extends Payload> extends ChainSummaryContextBase<T, MapTypeRead<string, T>>, ChainContextRead {
+export interface ChainSummaryContextRead<T extends Payload> extends ChainSummaryContextBase<T, MapTypeRead<string, WithHashMeta<T>>>, ChainContextRead {
 }
-export interface ChainSummaryContextWrite<T extends Payload> extends ChainSummaryContextBase<T, MapType<string, T>>, ChainContext {
+export interface ChainSummaryContextWrite<T extends Payload> extends ChainSummaryContextBase<T, MapType<string, WithHashMeta<T>>>, ChainContext {
 }
 export type ChainSummaryContext<T extends Payload> = ChainSummaryContextRead<T> & ChainSummaryContextWrite<T>;
 export interface BalanceStepSummaryContextRead extends ChainSummaryContextRead<BalancesStepSummary> {

package/dist/neutral/summary/model/summary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../../src/summary/model/summary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EACnD,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEjE,MAAM,WAAW,uBAAuB,CAAC,QAAQ,SAAS,OAAO,EAC/D,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAE,SAAQ,kBAAkB;IACrE,cAAc,EAAE,SAAS,EAAE,CAAA;IAC3B,UAAU,EAAE,CAAC,CAAA;CACd;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,OAAO,CAAE,SAAQ,uBAAuB,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB;CAAG;AAE3I,MAAM,WAAW,wBAAwB,CAAC,CAAC,SAAS,OAAO,CAAE,SAAQ,uBAAuB,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY;CAAG;AAEpI,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,OAAO,IAAI,uBAAuB,CAAC,CAAC,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAA;AAE7G,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB,CAAC,mBAAmB,CAAC;CAAG;AAEtG,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB,CAAC,mBAAmB,CAAC;CAAG;AAE9F,MAAM,WAAW,+BAAgC,SAAQ,uBAAuB,CAAC,oBAAoB,CAAC;CAAG;AAEzG,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB,CAAC,oBAAoB,CAAC;CAAG;AAEjG,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB,CAAC,kBAAkB,CAAC;CAAG;AAErG,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;CAAG"}
+{"version":3,"file":"summary.d.ts","sourceRoot":"","sources":["../../../../src/summary/model/summary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,KAAK,EACV,kBAAkB,EAAE,YAAY,EAAE,gBAAgB,EACnD,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEjE,MAAM,WAAW,uBAAuB,CAAC,QAAQ,SAAS,OAAO,EAC/D,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,SAAQ,kBAAkB;IACnF,cAAc,EAAE,SAAS,EAAE,CAAA;IAC3B,UAAU,EAAE,CAAC,CAAA;CACd;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC,SAAS,OAAO,CAAE,SAAQ,uBAAuB,CAAC,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,gBAAgB;CAAG;AAEzJ,MAAM,WAAW,wBAAwB,CAAC,CAAC,SAAS,OAAO,CAAE,SAAQ,uBAAuB,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY;CAAG;AAElJ,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,OAAO,IAAI,uBAAuB,CAAC,CAAC,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,CAAA;AAE7G,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB,CAAC,mBAAmB,CAAC;CAAG;AAEtG,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB,CAAC,mBAAmB,CAAC;CAAG;AAE9F,MAAM,WAAW,+BAAgC,SAAQ,uBAAuB,CAAC,oBAAoB,CAAC;CAAG;AAEzG,MAAM,WAAW,2BAA4B,SAAQ,mBAAmB,CAAC,oBAAoB,CAAC;CAAG;AAEjG,MAAM,WAAW,6BAA8B,SAAQ,uBAAuB,CAAC,kBAAkB,CAAC;CAAG;AAErG,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC;CAAG"}

package/dist/neutral/summary/primitives/balances/balancesStepSummaryFromRange.d.ts

@@ -1,5 +1,5 @@
-import type { WithStorageMeta } from '@xyo-network/payload-model';
+import type { WithHashMeta } from '@xyo-network/payload-model';
 import type { XL1BlockRange } from '@xyo-network/xl1-protocol';
 import type { BalancesStepSummary, BalanceStepSummaryContext } from '../../model/index.ts';
-export declare function balancesStepSummaryFromRange(context: BalanceStepSummaryContext, range: XL1BlockRange): Promise<WithStorageMeta<BalancesStepSummary>>;
+export declare function balancesStepSummaryFromRange(context: BalanceStepSummaryContext, range: XL1BlockRange): Promise<WithHashMeta<BalancesStepSummary>>;
 //# sourceMappingURL=balancesStepSummaryFromRange.d.ts.map

package/dist/neutral/summary/primitives/balances/balancesStepSummaryFromRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"balancesStepSummaryFromRange.d.ts","sourceRoot":"","sources":["../../../../../src/summary/primitives/balances/balancesStepSummaryFromRange.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAW9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAG1F,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,yBAAyB,EAClC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,CA+D/C"}
+{"version":3,"file":"balancesStepSummaryFromRange.d.ts","sourceRoot":"","sources":["../../../../../src/summary/primitives/balances/balancesStepSummaryFromRange.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAY9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAG1F,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,yBAAyB,EAClC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAmE5C"}

package/dist/neutral/summary/primitives/schemas/schemasStepSummaryFromRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemasStepSummaryFromRange.d.ts","sourceRoot":"","sources":["../../../../../src/summary/primitives/schemas/schemasStepSummaryFromRange.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACF,YAAY,EACrB,MAAM,4BAA4B,CAAA;AAEnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAO9D,OAAO,EACL,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EACxD,MAAM,sBAAsB,CAAA;AAE7B,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,yBAAyB,EAClC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CA6D3C"}
+{"version":3,"file":"schemasStepSummaryFromRange.d.ts","sourceRoot":"","sources":["../../../../../src/summary/primitives/schemas/schemasStepSummaryFromRange.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAEtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAO9D,OAAO,EACL,KAAK,kBAAkB,EAAE,KAAK,yBAAyB,EACxD,MAAM,sBAAsB,CAAA;AAE7B,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,yBAAyB,EAClC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CA6D3C"}

package/dist/neutral/summary/primitives/transfers/transfersStepSummaryFromRange.d.ts

@@ -1,5 +1,5 @@
-import type { WithStorageMeta } from '@xyo-network/payload-model';
+import type { WithHashMeta } from '@xyo-network/payload-model';
 import type { XL1BlockRange } from '@xyo-network/xl1-protocol';
 import { type TransfersStepSummary, type TransfersStepSummaryContext } from '../../model/index.ts';
-export declare function transfersStepSummaryFromRange(context: TransfersStepSummaryContext, range: XL1BlockRange): Promise<WithStorageMeta<TransfersStepSummary>>;
+export declare function transfersStepSummaryFromRange(context: TransfersStepSummaryContext, range: XL1BlockRange): Promise<WithHashMeta<TransfersStepSummary>>;
 //# sourceMappingURL=transfersStepSummaryFromRange.d.ts.map

package/dist/neutral/summary/primitives/transfers/transfersStepSummaryFromRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transfersStepSummaryFromRange.d.ts","sourceRoot":"","sources":["../../../../../src/summary/primitives/transfers/transfersStepSummaryFromRange.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAU9D,OAAO,EACL,KAAK,oBAAoB,EAAE,KAAK,2BAA2B,EAC5D,MAAM,sBAAsB,CAAA;AAG7B,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,2BAA2B,EACpC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,CA0EhD"}
+{"version":3,"file":"transfersStepSummaryFromRange.d.ts","sourceRoot":"","sources":["../../../../../src/summary/primitives/transfers/transfersStepSummaryFromRange.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAU9D,OAAO,EACL,KAAK,oBAAoB,EAAE,KAAK,2BAA2B,EAC5D,MAAM,sBAAsB,CAAA;AAG7B,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,2BAA2B,EACpC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,CAyE7C"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-protocol-sdk",
-  "version": "1.18.21",
+  "version": "1.18.23",
   "description": "XYO Layer One SDK Protocol",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -52,7 +52,7 @@
     "@xyo-network/payload-model": "~5.2.24",
     "@xyo-network/wallet": "~5.2.24",
     "@xyo-network/wallet-model": "~5.2.24",
-    "@xyo-network/xl1-protocol": "~1.18.21",
+    "@xyo-network/xl1-protocol": "~1.18.23",
     "async-mutex": "~0.5.0",
     "ethers": "^6.16.0",
     "lru-cache": "^11.2.4",

package/src/summary/model/summary.ts

@@ -1,4 +1,4 @@
-import type { Payload } from '@xyo-network/payload-model'
+import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
 import type { Semaphore } from 'async-mutex'
 
 import type { MapType, MapTypeRead } from '../../map/index.ts'
@@ -10,14 +10,14 @@ import type { SchemasStepSummary } from './SchemasStepSummary.ts'
 import type { TransfersStepSummary } from './TransfersSummary.ts'
 
 export interface ChainSummaryContextBase<TPayload extends Payload,
-  T extends (MapTypeRead<string, TPayload>)> extends CachingBaseContext {
+  T extends (MapTypeRead<string, WithHashMeta<TPayload>>)> extends CachingBaseContext {
   stepSemaphores: Semaphore[]
   summaryMap: T
 }
 
-export interface ChainSummaryContextRead<T extends Payload> extends ChainSummaryContextBase<T, MapTypeRead<string, T>>, ChainContextRead {}
+export interface ChainSummaryContextRead<T extends Payload> extends ChainSummaryContextBase<T, MapTypeRead<string, WithHashMeta<T>>>, ChainContextRead {}
 
-export interface ChainSummaryContextWrite<T extends Payload> extends ChainSummaryContextBase<T, MapType<string, T>>, ChainContext {}
+export interface ChainSummaryContextWrite<T extends Payload> extends ChainSummaryContextBase<T, MapType<string, WithHashMeta<T>>>, ChainContext {}
 
 export type ChainSummaryContext<T extends Payload> = ChainSummaryContextRead<T> & ChainSummaryContextWrite<T>
 

package/src/summary/primitives/balances/balancesStepSummaryFromRange.ts

@@ -1,16 +1,16 @@
-/* eslint-disable max-statements */
-import { type Address } from '@xylabs/sdk-js'
+import { type Address, spanRootAsync } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { WithStorageMeta } from '@xyo-network/payload-model'
+import type { WithHashMeta } from '@xyo-network/payload-model'
 import { isAnyPayload } from '@xyo-network/payload-model'
 import type { XL1BlockRange } from '@xyo-network/xl1-protocol'
-import { StepSizes } from '@xyo-network/xl1-protocol'
+import { asXL1BlockNumber, StepSizes } from '@xyo-network/xl1-protocol'
 
 import {
   deepCalculateFramesFromRange, hashFromBlockNumber,
   hydrateBlock,
 } from '../../../block/index.ts'
+import { withContextCacheResponse } from '../../../model/index.ts'
 import { netBalancesForPayloads } from '../../../payloads/index.ts'
 import {
   parseSignedBigInt, type SignedBigInt, toSignedBigInt,
@@ -21,67 +21,71 @@ import { BalancesStepSummarySchema } from '../../model/index.ts'
 export async function balancesStepSummaryFromRange(
   context: BalanceStepSummaryContext,
   range: XL1BlockRange,
-): Promise<WithStorageMeta<BalancesStepSummary>> {
-  // console.log(`balanceStepSummaryFromRange: head=${head}, range=${range[0]}-${range[1]}`)
-  const frameHeadHash = await hashFromBlockNumber(context, range[1])
-  const frameSize = range[1] - range[0] + 1
-  const [headHash] = await context.head()
+): Promise<WithHashMeta<BalancesStepSummary>> {
+  const cacheKey = `${range[0]}|${range[1]}`
+  return await withContextCacheResponse(context, 'balancesStepSummaryFromRange', cacheKey, async () => {
+    return await spanRootAsync('balancesStepSummaryFromRange', async () => {
+      // console.log(`balanceStepSummaryFromRange: head=${head}, range=${range[0]}-${range[1]}`)
+      const frameHeadHash = await hashFromBlockNumber(context, range[1])
+      const frameSize = range[1] - range[0] + 1
+      const [headHash] = await context.head()
 
-  let result: BalancesStepSummary | undefined = undefined
+      const key = `${frameHeadHash}|${frameSize}`
 
-  if (frameSize === 1) {
-    const hash = await hashFromBlockNumber(context, range[0])
-    const [, payloads] = await hydrateBlock(context.store, hash)
-    const balances: Record<Address, SignedBigInt> = {}
-    for (const [address, balance] of Object.entries(netBalancesForPayloads(payloads))) {
-      balances[address as Address] = toSignedBigInt(balance)
-    }
-    result = {
-      schema: BalancesStepSummarySchema, hash: headHash, stepSize: -1, balances,
-    }
-  } else {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const step = (StepSizes as any).indexOf(frameSize)
-    assertEx(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes.join(', ')}`)
+      return (frameSize === 1)
+        ? await spanRootAsync(`balancesStepSummaryFromRange.frameSize=1[${key}]`, async () => {
+            const hash = await hashFromBlockNumber(context, range[0])
+            const [, payloads] = await hydrateBlock(context.store, hash)
+            const balances: Record<Address, SignedBigInt> = {}
+            for (const [address, balance] of Object.entries(netBalancesForPayloads(payloads))) {
+              balances[address as Address] = toSignedBigInt(balance)
+            }
+            return await PayloadBuilder.addHashMeta({
+              schema: BalancesStepSummarySchema, hash: headHash, stepSize: -1, balances,
+            })
+          }, { timeBudgetLimit: 100 })
+        : await spanRootAsync(`balancesStepSummaryFromRange.frameSize>1[${key}]`, async () => {
+            const step = StepSizes.indexOf(asXL1BlockNumber(frameSize, true))
+            assertEx(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes.join(', ')}`)
 
-    const summaryResult = await context.summaryMap.get(`${frameHeadHash}|${frameSize}`)
-    if (isAnyPayload(summaryResult)) {
-      result = summaryResult as WithStorageMeta<BalancesStepSummary>
-    } else {
-    // We do not have it, so lets build it
-      await context.stepSemaphores[step].acquire()
-      try {
-        const subRanges = deepCalculateFramesFromRange(range, step - 1)
-        const promises = subRanges.map(subRange => balancesStepSummaryFromRange(
-          context,
-          subRange,
-        ))
-        const subResults = await Promise.all(promises)
+            const summaryResult = await context.summaryMap.get(key)
+            if (isAnyPayload(summaryResult)) {
+              return summaryResult as WithHashMeta<BalancesStepSummary>
+            } else {
+            // We do not have it, so lets build it
+              await context.stepSemaphores[step].acquire()
+              try {
+                const subRanges = deepCalculateFramesFromRange(range, step - 1)
+                const promises = subRanges.map(subRange => balancesStepSummaryFromRange(
+                  context,
+                  subRange,
+                ))
+                const subResults = await Promise.all(promises)
 
-        // add them all up
-        const bigIntBalances: Record<Address, bigint> = {}
-        for (const subResult of subResults) {
-          for (const [address, balance] of Object.entries(subResult.balances)) {
-            bigIntBalances[address as Address] = (bigIntBalances[address as Address] ?? 0n) + parseSignedBigInt(balance)
-          }
-        }
+                // add them all up
+                const bigIntBalances: Record<Address, bigint> = {}
+                for (const subResult of subResults) {
+                  for (const [address, balance] of Object.entries(subResult.balances)) {
+                    bigIntBalances[address as Address] = (bigIntBalances[address as Address] ?? 0n) + parseSignedBigInt(balance)
+                  }
+                }
 
-        const balances: Record<Address, SignedBigInt> = {}
-        for (const [address, balance] of Object.entries(bigIntBalances)) {
-          balances[address as Address] = toSignedBigInt(balance)
-        }
+                const balances: Record<Address, SignedBigInt> = {}
+                for (const [address, balance] of Object.entries(bigIntBalances)) {
+                  balances[address as Address] = toSignedBigInt(balance)
+                }
 
-        result = {
-          schema: BalancesStepSummarySchema, hash: frameHeadHash, stepSize: frameSize, balances,
-        }
+                const result = await PayloadBuilder.addHashMeta({
+                  schema: BalancesStepSummarySchema, hash: frameHeadHash, stepSize: frameSize, balances,
+                })
 
-        await context.summaryMap.set(`${frameHeadHash}|${frameSize}`, result)
-      } finally {
-        context.stepSemaphores[step].release()
-      }
-    }
-  }
-  // console.log(`balanceStepSummaryFromRange-result: head=${head}, range=${range[0]}-${range[1]}: ${toSafeJsonString(result, 10)}`)
-  const finalResult = await PayloadBuilder.addStorageMeta(result)
-  return finalResult
+                await context.summaryMap.set(key, result)
+                return result
+              } finally {
+                context.stepSemaphores[step].release()
+              }
+            }
+          }, { timeBudgetLimit: 100 })
+    }, { timeBudgetLimit: 200 })
+  }, { max: 100_000, timeBudgetMs: 200 })
 }

package/src/summary/primitives/schemas/schemasStepSummaryFromRange.ts

@@ -1,9 +1,7 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { isBoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type {
-  Schema, WithHashMeta, WithStorageMeta,
-} from '@xyo-network/payload-model'
+import type { Schema, WithHashMeta } from '@xyo-network/payload-model'
 import { isAnyPayload, isHashMeta } from '@xyo-network/payload-model'
 import type { XL1BlockRange } from '@xyo-network/xl1-protocol'
 import { StepSizes } from '@xyo-network/xl1-protocol'
@@ -25,7 +23,7 @@ export async function schemasStepSummaryFromRange(
   const frameSize = range[1] - range[0] + 1
   const [headHash] = await context.head()
 
-  let result: SchemasStepSummary | undefined = undefined
+  let result: WithHashMeta<SchemasStepSummary> | undefined = undefined
 
   if (frameSize === 1) {
     const hash = await hashFromBlockNumber(context, range[0])
@@ -38,9 +36,9 @@ export async function schemasStepSummaryFromRange(
         schemas[schema] = (schemas[schema] ?? 0) + 1
       }
     }
-    result = {
+    result = await PayloadBuilder.addHashMeta({
       schema: SchemasStepSummarySchema, hash: headHash, stepSize: -1, schemas,
-    }
+    })
   } else {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const step = (StepSizes as any).indexOf(frameSize)
@@ -48,7 +46,7 @@ export async function schemasStepSummaryFromRange(
 
     const summaryResult = await context.summaryMap.get(`${frameHeadHash}|${frameSize}`)
     if (isAnyPayload(summaryResult)) {
-      result = summaryResult as WithStorageMeta<SchemasStepSummary>
+      result = summaryResult as WithHashMeta<SchemasStepSummary>
     } else {
     // We do not have it, so lets build it
       await context.stepSemaphores[step].acquire()
@@ -68,9 +66,9 @@ export async function schemasStepSummaryFromRange(
           }
         }
 
-        result = {
+        result = await PayloadBuilder.addHashMeta({
           schema: SchemasStepSummarySchema, hash: frameHeadHash, stepSize: frameSize, schemas: schemas,
-        }
+        })
 
         await context.summaryMap.set(`${frameHeadHash}|${frameSize}`, result)
       } finally {

package/src/summary/primitives/transfers/transfersStepSummaryFromRange.ts

@@ -2,7 +2,7 @@
 import { type Address } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { WithStorageMeta } from '@xyo-network/payload-model'
+import type { WithHashMeta } from '@xyo-network/payload-model'
 import { isAnyPayload } from '@xyo-network/payload-model'
 import type { XL1BlockRange } from '@xyo-network/xl1-protocol'
 import { StepSizes } from '@xyo-network/xl1-protocol'
@@ -22,13 +22,13 @@ import { transfersSummaryKey } from './transfersSummary.ts'
 export async function transfersStepSummaryFromRange(
   context: TransfersStepSummaryContext,
   range: XL1BlockRange,
-): Promise<WithStorageMeta<TransfersStepSummary>> {
+): Promise<WithHashMeta<TransfersStepSummary>> {
   // console.log(`transfersStepSummaryFromRange: head=${context.head}, range=${range[0]}-${range[1]}`)
   const frameHeadHash = await hashFromBlockNumber(context, range[1])
   const frameSize = range[1] - range[0] + 1
   const [headHash] = await context.head()
 
-  let result: TransfersStepSummary | undefined = undefined
+  let result: WithHashMeta<TransfersStepSummary> | undefined = undefined
 
   if (frameSize === 1) {
     const hash = await hashFromBlockNumber(context, range[0])
@@ -40,9 +40,9 @@ export async function transfersStepSummaryFromRange(
         transfers[from as Address][to as Address] = toSignedBigInt(amount)
       }
     }
-    result = {
+    result = await PayloadBuilder.addHashMeta({
       schema: TransfersStepSummarySchema, hash: headHash, stepSize: -1, transfers,
-    }
+    })
   } else {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const step = (StepSizes as any).indexOf(frameSize)
@@ -52,7 +52,7 @@ export async function transfersStepSummaryFromRange(
 
     const summaryResult = await context.summaryMap.get(key)
     if (isAnyPayload(summaryResult)) {
-      result = summaryResult as WithStorageMeta<TransfersStepSummary>
+      result = summaryResult as WithHashMeta<TransfersStepSummary>
     } else {
       await context.stepSemaphores[step].acquire()
       // We do not have it, so lets build it
@@ -83,9 +83,9 @@ export async function transfersStepSummaryFromRange(
           }
         }
 
-        result = {
+        result = await PayloadBuilder.addHashMeta({
           schema: TransfersStepSummarySchema, hash: frameHeadHash, stepSize: frameSize, transfers,
-        }
+        })
 
         await context.summaryMap.set(key, result)
       } finally {
@@ -94,6 +94,5 @@ export async function transfersStepSummaryFromRange(
     }
   }
   // console.log(`transfersStepSummaryFromRange-result: head=${context.head}, range=${range[0]}-${range[1]}: ${toSafeJsonString(result, 10)}`)
-  const finalResult = await PayloadBuilder.addStorageMeta(result)
-  return finalResult
+  return result
 }