@xyo-network/xl1-protocol-sdk 1.5.29 → 1.5.31

package/dist/types/instances/transaction/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/instances/transaction/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/instances/transaction/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA"}

package/dist/types/transaction/buildTransaction.d.ts

@@ -1,6 +1,6 @@
 import type { Address } from '@xylabs/hex';
 import type { AccountInstance } from '@xyo-network/account-model';
 import type { Payload } from '@xyo-network/payload-model';
-import { type AllowedBlockPayload, type HydratedTransactionWithStorageMeta, type TransactionFeesBigInt } from '@xyo-network/xl1-protocol';
-export declare function buildTransaction(chain: Address, elevatedPayloads: AllowedBlockPayload[], additionalPayloads: Payload[], signer: AccountInstance | AccountInstance[], nbf: number, exp: number, from?: Address, fees?: TransactionFeesBigInt): Promise<HydratedTransactionWithStorageMeta>;
+import { type AllowedBlockPayload, type HydratedTransaction, type TransactionFeesBigInt } from '@xyo-network/xl1-protocol';
+export declare function buildTransaction(chain: Address, elevatedPayloads: AllowedBlockPayload[], additionalPayloads: Payload[], signer: AccountInstance | AccountInstance[], nbf: number, exp: number, from?: Address, fees?: TransactionFeesBigInt): Promise<HydratedTransaction>;
 //# sourceMappingURL=buildTransaction.d.ts.map

package/dist/types/transaction/buildTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EACL,KAAK,mBAAmB,EAExB,KAAK,kCAAkC,EAAoE,KAAK,qBAAqB,EACtI,MAAM,2BAA2B,CAAA;AAElC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,OAAO,EACd,gBAAgB,EAAE,mBAAmB,EAAE,EACvC,kBAAkB,EAAE,OAAO,EAAE,EAC7B,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,EAC3C,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,EACd,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,kCAAkC,CAAC,CAmC7C"}
+{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EACL,KAAK,mBAAmB,EAExB,KAAK,mBAAmB,EAAoE,KAAK,qBAAqB,EACvH,MAAM,2BAA2B,CAAA;AAElC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,OAAO,EACd,gBAAgB,EAAE,mBAAmB,EAAE,EACvC,kBAAkB,EAAE,OAAO,EAAE,EAC7B,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,EAC3C,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,EACd,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,mBAAmB,CAAC,CAmC9B"}

package/dist/types/transaction/hydrateTransaction.d.ts

@@ -1,9 +1,9 @@
 import type { Hash } from '@xylabs/hex';
 import type { ReadArchivist } from '@xyo-network/archivist-model';
 import type { Payload } from '@xyo-network/payload-model';
-import type { HydratedTransaction, HydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol';
-export declare const tryHydrateTransaction: (archivist: ReadArchivist, hash: Hash) => Promise<HydratedTransactionWithStorageMeta | undefined>;
-export declare const hydrateTransaction: (archivist: ReadArchivist, hash: Hash) => Promise<HydratedTransactionWithStorageMeta>;
+import type { HydratedTransaction } from '@xyo-network/xl1-protocol';
+export declare const tryHydrateTransaction: (archivist: ReadArchivist, hash: Hash) => Promise<HydratedTransaction | undefined>;
+export declare const hydrateTransaction: (archivist: ReadArchivist, hash: Hash) => Promise<HydratedTransaction>;
 export declare const flattenHydratedTransaction: (hydratedTransaction: HydratedTransaction) => Payload[];
 export declare const flattenHydratedTransactions: (hydratedTransactions: HydratedTransaction[]) => Payload[];
 export declare const tryHydrateElevatedTransaction: (archivist: ReadArchivist, hash: Hash) => Promise<HydratedTransaction | undefined>;

package/dist/types/transaction/hydrateTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrateTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/hydrateTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EAEV,mBAAmB,EAAE,kCAAkC,EACxD,MAAM,2BAA2B,CAAA;AAGlC,eAAO,MAAM,qBAAqB,GAChC,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,kCAAkC,GAAG,SAAS,CAMxD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,kCAAkC,CAM5C,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAI,qBAAqB,mBAAmB,KAAG,OAAO,EAG5F,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,sBAAsB,mBAAmB,EAAE,KAAG,OAAO,EAC7B,CAAA;AAEpE,eAAO,MAAM,6BAA6B,GACxC,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAqBzC,CAAA;AAED,eAAO,MAAM,0BAA0B,GACrC,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,mBAAmB,CAE7B,CAAA"}
+{"version":3,"file":"hydrateTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/hydrateTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAEjE,OAAO,KAAK,EAAE,OAAO,EAAmB,MAAM,4BAA4B,CAAA;AAC1E,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,2BAA2B,CAAA;AAGlC,eAAO,MAAM,qBAAqB,GAChC,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAMzC,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,mBAAmB,CAM7B,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAI,qBAAqB,mBAAmB,KAAG,OAAO,EAG5F,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,sBAAsB,mBAAmB,EAAE,KAAG,OAAO,EAC7B,CAAA;AAEpE,eAAO,MAAM,6BAA6B,GACxC,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAqBzC,CAAA;AAED,eAAO,MAAM,0BAA0B,GACrC,WAAW,aAAa,EACxB,MAAM,IAAI,KACT,OAAO,CAAC,mBAAmB,CAE7B,CAAA"}

package/dist/types/transaction/index.d.ts

@@ -1,4 +1,4 @@
 export * from './buildTransaction.ts';
 export * from './hydrateTransaction.ts';
-export * from './transactionRequiredGas.ts';
+export * from './primitives/index.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/transaction/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transaction/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transaction/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA"}

package/dist/types/transaction/primitives/index.d.ts

@@ -0,0 +1,5 @@
+export * from './transactionBlockByteCount.ts';
+export * from './transactionElevatedPayloads.ts';
+export * from './transactionOperations.ts';
+export * from './transactionRequiredGas.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/types/transaction/primitives/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/transaction/primitives/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAA;AAC9C,cAAc,kCAAkC,CAAA;AAChD,cAAc,4BAA4B,CAAA;AAC1C,cAAc,6BAA6B,CAAA"}

package/dist/types/transaction/primitives/transactionBlockByteCount.d.ts

@@ -0,0 +1,4 @@
+import type { HydratedTransaction } from '@xyo-network/xl1-protocol';
+/** The number of bytes that a transaction and its payloads will take up in a block */
+export declare function transactionBlockByteCount([transaction, payloads]: HydratedTransaction): number;
+//# sourceMappingURL=transactionBlockByteCount.d.ts.map

package/dist/types/transaction/primitives/transactionBlockByteCount.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionBlockByteCount.d.ts","sourceRoot":"","sources":["../../../../src/transaction/primitives/transactionBlockByteCount.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAEpE,sFAAsF;AACtF,wBAAgB,yBAAyB,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,mBAAmB,GAAG,MAAM,CAK9F"}

package/dist/types/transaction/primitives/transactionElevatedPayloads.d.ts

@@ -0,0 +1,6 @@
+import { type Hash } from '@xylabs/hex';
+import type { Payload, WithHashStorageMeta } from '@xyo-network/payload-model';
+import type { HydratedTransaction, TransactionBoundWitness } from '@xyo-network/xl1-protocol';
+export declare function transactionElevatedPayloadHashes(transaction: TransactionBoundWitness): Hash[];
+export declare function transactionElevatedPayloads([transaction, payloads]: HydratedTransaction): WithHashStorageMeta<Payload>[];
+//# sourceMappingURL=transactionElevatedPayloads.d.ts.map

package/dist/types/transaction/primitives/transactionElevatedPayloads.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionElevatedPayloads.d.ts","sourceRoot":"","sources":["../../../../src/transaction/primitives/transactionElevatedPayloads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,IAAI,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAI7F,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,uBAAuB,GAAG,IAAI,EAAE,CAG7F;AAED,wBAAgB,2BAA2B,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAIxH"}

package/dist/types/transaction/primitives/transactionOperations.d.ts

@@ -0,0 +1,3 @@
+export declare function crackOperation(operation: string): [string, string[]];
+export declare function crackOperations(operations: string[]): [string, string[]][];
+//# sourceMappingURL=transactionOperations.d.ts.map

package/dist/types/transaction/primitives/transactionOperations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionOperations.d.ts","sourceRoot":"","sources":["../../../../src/transaction/primitives/transactionOperations.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAMpE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAE1E"}

package/dist/types/transaction/primitives/transactionRequiredGas.d.ts

@@ -0,0 +1,6 @@
+import type { HydratedTransaction } from '@xyo-network/xl1-protocol';
+import { AttoXL1 } from '@xyo-network/xl1-protocol';
+/** The required gas for the byte storage on the block chain for a transaction */
+export declare function transactionBytesRequiredGas([transaction, payloads]: HydratedTransaction): AttoXL1;
+export declare function transactionRequiredGas(hydratedTransaction: HydratedTransaction): AttoXL1;
+//# sourceMappingURL=transactionRequiredGas.d.ts.map

package/dist/types/transaction/primitives/transactionRequiredGas.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionRequiredGas.d.ts","sourceRoot":"","sources":["../../../../src/transaction/primitives/transactionRequiredGas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,EAAE,OAAO,EAAuB,MAAM,2BAA2B,CAAA;AAKxE,iFAAiF;AACjF,wBAAgB,2BAA2B,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAGjG;AAED,wBAAgB,sBAAsB,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,CAQxF"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-protocol-sdk",
-  "version": "1.5.29",
+  "version": "1.5.31",
   "description": "XYO Layer One SDK Protocol",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -34,24 +34,27 @@
     "deploy3": "echo Deploy3 not allowed!"
   },
   "dependencies": {
-    "@xylabs/assert": "^4.11.16",
-    "@xylabs/hex": "^4.11.16",
-    "@xylabs/object": "^4.11.16",
-    "@xylabs/promise": "^4.11.16",
-    "@xyo-network/account-model": "^3.18.5",
-    "@xyo-network/archivist-model": "^3.18.5",
-    "@xyo-network/boundwitness-builder": "^3.18.5",
-    "@xyo-network/boundwitness-model": "^3.18.5",
-    "@xyo-network/payload-builder": "^3.18.5",
-    "@xyo-network/payload-model": "^3.18.5",
-    "@xyo-network/xl1-protocol": "^1.4.19"
+    "@xylabs/array": "^4.11.20",
+    "@xylabs/assert": "^4.11.20",
+    "@xylabs/hex": "^4.11.20",
+    "@xylabs/object": "^4.11.20",
+    "@xylabs/promise": "^4.11.20",
+    "@xylabs/typeof": "^4.11.20",
+    "@xyo-network/account-model": "^3.18.8",
+    "@xyo-network/archivist-model": "^3.18.8",
+    "@xyo-network/boundwitness-builder": "^3.18.8",
+    "@xyo-network/boundwitness-model": "^3.18.8",
+    "@xyo-network/payload-builder": "^3.18.8",
+    "@xyo-network/payload-model": "^3.18.8",
+    "@xyo-network/xl1-protocol": "^1.4.33"
   },
   "devDependencies": {
-    "@types/node": "^22.15.30",
+    "@types/node": "^24.0.1",
     "@xylabs/ts-scripts-yarn3": "^6.5.8",
     "@xylabs/tsconfig": "^6.5.8",
-    "knip": "^5.60.2",
-    "typescript": "^5.8.3"
+    "knip": "^5.61.0",
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.3"
   },
   "engines": {
     "node": ">=22.3 <23"

package/src/block/hydrateBlock.ts

@@ -0,0 +1,83 @@
+import { filterAs } from '@xylabs/array'
+import { assertEx } from '@xylabs/assert'
+import type { Hash } from '@xylabs/hex'
+import type { ReadArchivist } from '@xyo-network/archivist-model'
+import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
+import type { HydratedBlock, TransactionBoundWitness } from '@xyo-network/xl1-protocol'
+import {
+  asBlockBoundWitnessWithStorageMeta, asTransactionBoundWitnessWithStorageMeta, isTransactionBoundWitnessWithStorageMeta,
+} from '@xyo-network/xl1-protocol'
+
+export function allHashesPresent(hashes: Hash[], payloads: WithStorageMeta<Payload>[]): boolean {
+  const payloadHashes = new Set(payloads.map(p => p._hash))
+  return hashes.every(hash => payloadHashes.has(hash))
+}
+
+export const tryHydrateBlock = async (
+  archivist: ReadArchivist,
+  hash: Hash,
+  maxDepth: number = 1,
+  minDepth?: number,
+): Promise<HydratedBlock | undefined> => {
+  try {
+    return await hydrateBlock(archivist, hash, maxDepth, minDepth)
+  } catch (e) {
+    if (e instanceof Error) {
+      console.warn(`Failed to hydrate block ${hash}: ${e.message}`)
+    } else {
+      console.warn(`Failed to hydrate block ${hash}: ${e}`)
+    }
+    return undefined
+  }
+}
+
+export const hydrateBlock = async (
+  archivist: ReadArchivist,
+  hash: Hash,
+  maxDepth: number = 1,
+  minDepth?: number,
+): Promise<HydratedBlock> => {
+  if (minDepth === undefined) minDepth = maxDepth
+  assertEx(maxDepth >= 0, () => 'maxDepth must be greater than or equal to 0')
+  assertEx(minDepth >= 0, () => 'minDepth must be greater than or equal to 0')
+  assertEx(maxDepth >= minDepth, () => 'maxDepth must be greater than or equal to minDepth')
+  const bw = assertEx(
+    filterAs(await archivist.get([hash]), asBlockBoundWitnessWithStorageMeta).at(0),
+    () => `block ${hash} not found`,
+  )
+  if (maxDepth === 0) return [bw, []]
+  const blkPayloads = await archivist.get(bw.payload_hashes)
+  if (minDepth === 1) assertEx(allHashesPresent(bw.payload_hashes, blkPayloads), () => `Unable to find all payloads for block ${hash}`)
+  if (maxDepth === 1) return [bw, blkPayloads]
+  const transactions = filterAs(blkPayloads, asTransactionBoundWitnessWithStorageMeta)
+  const transactionsPayloadHashes = transactions.flatMap(tx => tx.payload_hashes)
+  const transactionsPayloads = await archivist.get(transactionsPayloadHashes)
+  assertEx(allHashesPresent(transactionsPayloadHashes, transactionsPayloads), () => `Unable to find all payloads for transactions in block ${hash}`)
+  const allPayloadsHashes = new Set([...blkPayloads, ...transactionsPayloads].flatMap(p => p._hash))
+  const allPayloads = await archivist.get([...allPayloadsHashes])
+  const allPayloadsFiltered = allPayloads.filter(p => allPayloadsHashes.has(p._hash))
+  if (maxDepth === 2) assertEx(allHashesPresent(
+    [...allPayloadsHashes],
+    allPayloadsFiltered,
+  ), () => `Unable to find all payloads for transactions in block ${hash}`)
+  return [bw, allPayloadsFiltered]
+}
+
+export const flattenHydratedBlock = (hydratedBlock: HydratedBlock): WithStorageMeta<Payload>[] => {
+  const [blk, blkPayloads] = hydratedBlock
+  return [...blkPayloads, blk]
+}
+
+export const flattenHydratedBlocks = (hydratedBlocks: HydratedBlock[]): WithStorageMeta<Payload>[] =>
+  hydratedBlocks.flatMap(blk => flattenHydratedBlock(blk))
+
+export const transactionsFromHydratedBlock = (block: HydratedBlock): WithStorageMeta<TransactionBoundWitness>[] => {
+  return filterAs(block[1], asTransactionBoundWitnessWithStorageMeta)
+}
+
+export const blockPayloadsFromHydratedBlock = (block: HydratedBlock): WithStorageMeta<Payload>[] => {
+  return block[0].payload_hashes.map(hash => assertEx(
+    block[1].find(p => p._hash === hash),
+    () => `missing payload ${hash}`,
+  )).filter(x => !isTransactionBoundWitnessWithStorageMeta(x))
+}

package/src/block/index.ts

@@ -0,0 +1,2 @@
+export * from './hydrateBlock.ts'
+export * from './primitives/index.ts'

package/src/block/primitives/frames/BlockNumberRange.ts

@@ -0,0 +1 @@
+export type BlockNumberRange = [number, number]

package/src/block/primitives/frames/calculateFramesFromRange.ts

@@ -0,0 +1,29 @@
+import { stepSizeV2 } from '@xyo-network/xl1-protocol'
+
+import type { BlockNumberRange } from './BlockNumberRange.ts'
+
+export function calculateFramesFromRange(range: BlockNumberRange, step: number): [
+  // ranges of fitted frames
+  BlockNumberRange[],
+  // ranges of remaining blocks
+  BlockNumberRange[]] {
+  const size = stepSizeV2(step)
+  let start = (Math.trunc(range[0] / size)) * size
+  const fitted: BlockNumberRange[] = []
+  const remaining: BlockNumberRange[] = []
+
+  // if the start is not aligned with the range, add a remaining block
+  if (start !== range[0]) {
+    start += size
+    remaining.push([range[0], Math.min(start - 1, range[1])])
+  }
+
+  for (let i = start; i <= range[1]; i += size) {
+    if ((i + size - 1) <= range[1]) {
+      fitted.push([i, Math.min(i + size - 1, range[1])])
+    } else {
+      remaining.push([i, range[1]])
+    }
+  }
+  return [fitted, remaining]
+}

package/src/block/primitives/frames/deepCalculateFramesFromRange.ts

@@ -0,0 +1,27 @@
+import { StepSizesV2 } from '@xyo-network/xl1-protocol'
+
+import type { BlockNumberRange } from './BlockNumberRange.ts'
+import { calculateFramesFromRange } from './calculateFramesFromRange.ts'
+
+export function deepCalculateFramesFromRange(range: BlockNumberRange, startingStep = StepSizesV2.length - 1): BlockNumberRange[] {
+  const fitted: BlockNumberRange[] = []
+  let remaining: BlockNumberRange[] = [range]
+
+  for (let step = startingStep; step >= 0; step--) {
+    const newRemaining: BlockNumberRange[] = []
+    for (const range of remaining) {
+      const [newFittedFrames, newRemainingFrames] = calculateFramesFromRange(range, step)
+      fitted.push(...newFittedFrames)
+      newRemaining.push(...newRemainingFrames)
+    }
+    remaining = newRemaining
+  }
+
+  for (const range of remaining) {
+    for (let i = range[0]; i <= range[1]; i++) {
+      fitted.push([i, i]) // Add individual frames for remaining ranges
+    }
+  }
+
+  return fitted.toSorted((a, b) => a[0] - b[0]) // Sort by start of range
+}

package/src/block/primitives/frames/index.ts

@@ -0,0 +1,2 @@
+export * from './BlockNumberRange.ts'
+export * from './stepHashFramesFromBlock.ts'

package/src/block/primitives/frames/loadFrameSummaries.ts

@@ -0,0 +1,12 @@
+import type { ArchivistInstance } from '@xyo-network/archivist-model'
+import type { Payload } from '@xyo-network/payload-model'
+
+import type { BlockNumberRange } from './BlockNumberRange.ts'
+
+export async function loadFrameSummaries(
+  ranges: BlockNumberRange[],
+  finalizedArchivist: ArchivistInstance,
+  summaryArchivist: ArchivistInstance,
+): Promise<Payload[]> {
+  return await Promise.resolve([])
+}

package/src/block/primitives/frames/stepHashFramesFromBlock.ts

@@ -0,0 +1,72 @@
+import { assertEx } from '@xylabs/assert'
+import { type Hash, isHash } from '@xylabs/hex'
+import { isDefined } from '@xylabs/typeof'
+import type { ArchivistInstance } from '@xyo-network/archivist-model'
+import { isBlockBoundWitness, StepSizes } from '@xyo-network/xl1-protocol'
+
+// get the list of step frames for a block at a specific step size index
+export async function stepHashFramesFromBlockAtSize(archivist: ArchivistInstance, head: Hash, sizeIndex: number) {
+  if (!Number.isInteger(sizeIndex) || sizeIndex < 0 || sizeIndex >= StepSizes.length) {
+    throw new Error(`Invalid sizeIndex: ${sizeIndex}`)
+  }
+  let currentHead = head
+  const steps: [Hash, number, number][] = []
+  while (isHash(currentHead)) {
+    const [block] = await archivist.get([currentHead])
+    if (!isBlockBoundWitness(block)) {
+      throw new Error(`Block with hash ${currentHead} not found`)
+    }
+    let stepHash = block.step_hashes.at(sizeIndex)
+    while (isDefined(stepHash)) {
+      const [stepHashBlock] = await archivist.get([stepHash])
+      if (!isBlockBoundWitness(stepHashBlock)) {
+        throw new Error(`StepHashBlock with hash ${currentHead} not found`)
+      }
+      const [lastBlockInStep] = await archivist.get([assertEx(stepHashBlock.previous, () => 'StepHashBlock must have a previous block')])
+      if (!isBlockBoundWitness(lastBlockInStep)) {
+        throw new Error(`StepHashBlock with hash ${currentHead} not found`)
+      }
+      steps.push([stepHash, stepHashBlock.block - StepSizes[sizeIndex], stepHashBlock.block - 1])
+      stepHash = lastBlockInStep.step_hashes.at(sizeIndex)
+    }
+  }
+  return steps
+}
+
+// TODO: Figure out how to get ranges of smaller blocks for each available range
+export async function stepHashFramesFromBlock(archivist: ArchivistInstance, head: Hash) {
+  const [block] = await archivist.get([head])
+  if (!isBlockBoundWitness(block)) {
+    throw new Error(`Block with hash ${head} not found`)
+  }
+  let availableRanges: [number, number][] = [[0, block.block]]
+  const foundRanges: [Hash, number, number][] = []
+  // fit biggest to smallest
+  for (let i = StepSizes.length - 1; i >= 0; i--) {
+    const steps = await stepHashFramesFromBlockAtSize(archivist, head, i)
+    for (let step of steps) {
+      const [, start, end] = step
+      if (availableRanges.some(range => range[0] <= start && range[1] >= end)) {
+        foundRanges.push(step)
+        availableRanges = availableRanges.flatMap((range) => {
+          if (range[0] >= start && range[1] <= end) {
+            // remove the range
+            return [[range[0], start - 1]]
+          } else if (range[0] < start && range[1] >= end) {
+            // split the range
+            return [[range[0], start - 1], [end + 1, range[1]]]
+          } else if (range[0] < start && range[1] < end) {
+            // adjust the end of the range
+            return [[range[0], start - 1]]
+          } else if (range[0] > start && range[1] > end) {
+            // adjust the start of the range
+            return [[end + 1, range[1]]]
+          }
+          // otherwise, return the range as is
+          return [range]
+        })
+      }
+    }
+  }
+  return foundRanges
+}

package/src/block/primitives/index.ts

@@ -0,0 +1 @@
+export * from './frames/index.ts'

package/src/index.ts

@@ -1,2 +1,3 @@
+export * from './block/index.ts'
 export * from './instances/index.ts'
 export * from './transaction/index.ts'

package/src/instances/block/BlockFields.ts

@@ -1,13 +1,17 @@
+import type { SignatureInstance } from '../Signature.ts'
+
 export interface BlockFieldsInstance<TTransactionResult> {
-  privatePayloadCount: number
+  reward: bigint
 
-  publicPayloadCount: number
+  signatureCount: number
 
-  reward: bigint
+  signatures: SignatureInstance[]
 
   transactionCount: number
 
   transactions: TTransactionResult[]
 
+  signature(index: number): SignatureInstance | undefined
+
   transaction(index: number): TTransactionResult | undefined
 }

package/src/instances/block/HydratedBlock.ts

@@ -1,10 +1,9 @@
 import type { HydratedBlock } from '@xyo-network/xl1-protocol'
 
 import type { HydratedBoundWitnessInstance } from '../HydratedBoundWitness.ts'
+import type { SignedInstance } from '../modifiers/Signed.ts'
 import type { HydratedTransactionInstance } from '../transaction/index.ts'
 import type { BlockFieldsInstance } from './BlockFields.ts'
 
 export interface HydratedBlockInstance<T extends HydratedBlock = HydratedBlock> extends
-  BlockFieldsInstance<HydratedTransactionInstance>, HydratedBoundWitnessInstance<T> {
-  publicPayloads: T[1][number][]
-}
+  BlockFieldsInstance<HydratedTransactionInstance>, HydratedBoundWitnessInstance<T>, SignedInstance {}

package/src/instances/block/index.ts

@@ -1,2 +1 @@
 export * from './HydratedBlock.ts'
-export * from './SignedHydratedBlock.ts'

package/src/instances/transaction/HydratedTransaction.ts

@@ -1,9 +1,10 @@
 import type { AllowedBlockPayload, HydratedTransaction } from '@xyo-network/xl1-protocol'
 
 import type { HydratedBoundWitnessInstance } from '../HydratedBoundWitness.ts'
+import type { SignedInstance } from '../modifiers/Signed.ts'
 import type { TransactionFieldsInstance } from './TransactionFields.ts'
 
 export interface HydratedTransactionInstance<T extends HydratedTransaction = HydratedTransaction,
   TElevatedPayload extends AllowedBlockPayload = AllowedBlockPayload>
-  extends TransactionFieldsInstance<T[1][number] & TElevatedPayload>, HydratedBoundWitnessInstance<T> {
+  extends TransactionFieldsInstance<T[1][number] & TElevatedPayload>, HydratedBoundWitnessInstance<T>, SignedInstance {
 }

package/src/instances/transaction/TransactionFields.ts

@@ -1,13 +1,21 @@
+import type { Hash } from '@xylabs/hex'
+import type {
+  Payload, Schema, WithStorageMeta,
+} from '@xyo-network/payload-model'
 import type { AllowedBlockPayload } from '@xyo-network/xl1-protocol'
 
 import type { TransactionFeesInstance } from '../Fees.ts'
 
 export interface TransactionFieldsInstance<TBlockPayload extends AllowedBlockPayload = AllowedBlockPayload> {
   elevatedPayloadCount: number
-  elevatedPayloads: TBlockPayload[]
+  elevatedPayloads: WithStorageMeta<TBlockPayload>[]
+  externalPayloads: Record<Hash, Schema | Payload>
 
   fees: TransactionFeesInstance
 
+  privateExternalPayloads: Record<Hash, Schema>
+  publicExternalPayloads: Payload[]
+
   elevatedPayload(index: number): TBlockPayload | undefined
   reward(): bigint
 }

package/src/instances/transaction/index.ts

@@ -1,2 +1 @@
 export * from './HydratedTransaction.ts'
-export * from './SignedHydratedTransaction.ts'

package/src/transaction/buildTransaction.ts

@@ -8,7 +8,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import {
   type AllowedBlockPayload,
   defaultTransactionFees,
-  type HydratedTransactionWithStorageMeta, type TransactionBoundWitness, type TransactionBoundWitnessFields, type TransactionFeesBigInt,
+  type HydratedTransaction, type TransactionBoundWitness, type TransactionBoundWitnessFields, type TransactionFeesBigInt,
 } from '@xyo-network/xl1-protocol'
 
 export async function buildTransaction(
@@ -20,7 +20,7 @@ export async function buildTransaction(
   exp: number,
   from?: Address,
   fees: TransactionFeesBigInt = defaultTransactionFees,
-): Promise<HydratedTransactionWithStorageMeta> {
+): Promise<HydratedTransaction> {
   if (from === undefined && Array.isArray(signer)) {
     throw new Error('from is required when signer is an array')
   }

package/src/transaction/hydrateTransaction.ts

@@ -2,33 +2,33 @@ import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { hydrateTypedBoundWitness, tryHydrateTypedBoundWitness } from '@xyo-network/archivist-model'
-import type { Payload } from '@xyo-network/payload-model'
+import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload,
-  HydratedTransaction, HydratedTransactionWithStorageMeta, TransactionBoundWitness,
+  HydratedTransaction, TransactionBoundWitness,
 } from '@xyo-network/xl1-protocol'
 import { isAllowedBlockPayload, isTransactionBoundWitnessWithStorageMeta } from '@xyo-network/xl1-protocol'
 
 export const tryHydrateTransaction = async (
   archivist: ReadArchivist,
   hash: Hash,
-): Promise<HydratedTransactionWithStorageMeta | undefined> => {
+): Promise<HydratedTransaction | undefined> => {
   return (await tryHydrateTypedBoundWitness<TransactionBoundWitness>(
     archivist,
     hash,
     isTransactionBoundWitnessWithStorageMeta,
-  )) as HydratedTransactionWithStorageMeta | undefined
+  )) as HydratedTransaction | undefined
 }
 
 export const hydrateTransaction = async (
   archivist: ReadArchivist,
   hash: Hash,
-): Promise<HydratedTransactionWithStorageMeta> => {
+): Promise<HydratedTransaction> => {
   return await hydrateTypedBoundWitness<TransactionBoundWitness>(
     archivist,
     hash,
     isTransactionBoundWitnessWithStorageMeta,
-  ) as HydratedTransactionWithStorageMeta
+  ) as HydratedTransaction
 }
 
 export const flattenHydratedTransaction = (hydratedTransaction: HydratedTransaction): Payload[] => {
@@ -49,7 +49,7 @@ export const tryHydrateElevatedTransaction = async (
   }
   const [transaction, payloads] = hydratedTransaction
   const opCodes = (transaction.script ?? []).filter(operation => operation.startsWith('elevate|'))
-  const elevatedPayloads: AllowedBlockPayload[] = []
+  const elevatedPayloads: WithStorageMeta<AllowedBlockPayload>[] = []
   for (const opCode of opCodes) {
     const [code, hash] = opCode.split('|')
     if (code === 'elevated') {

package/src/transaction/index.ts

@@ -1,3 +1,3 @@
 export * from './buildTransaction.ts'
 export * from './hydrateTransaction.ts'
-export * from './transactionRequiredGas.ts'
+export * from './primitives/index.ts'

package/src/transaction/primitives/index.ts

@@ -0,0 +1,4 @@
+export * from './transactionBlockByteCount.ts'
+export * from './transactionElevatedPayloads.ts'
+export * from './transactionOperations.ts'
+export * from './transactionRequiredGas.ts'

package/src/transaction/primitives/transactionBlockByteCount.ts

@@ -0,0 +1,10 @@
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import type { HydratedTransaction } from '@xyo-network/xl1-protocol'
+
+/** The number of bytes that a transaction and its payloads will take up in a block */
+export function transactionBlockByteCount([transaction, payloads]: HydratedTransaction): number {
+  const cleanTransaction = PayloadBuilder.omitStorageMeta(transaction)
+  const transactionBytes = JSON.stringify(cleanTransaction).length
+  const cleanPayloads = PayloadBuilder.omitStorageMeta(payloads)
+  return cleanPayloads.reduce((acc: number, payload) => acc + JSON.stringify(payload).length, 0) + transactionBytes
+}

package/src/transaction/primitives/transactionElevatedPayloads.ts

@@ -0,0 +1,16 @@
+import { asHash, type Hash } from '@xylabs/hex'
+import type { Payload, WithHashStorageMeta } from '@xyo-network/payload-model'
+import type { HydratedTransaction, TransactionBoundWitness } from '@xyo-network/xl1-protocol'
+
+import { crackOperations } from './transactionOperations.ts'
+
+export function transactionElevatedPayloadHashes(transaction: TransactionBoundWitness): Hash[] {
+  const elevateOperations = crackOperations(transaction.script ?? []).filter(op => op[0] === 'elevate')
+  return elevateOperations.map(op => asHash(op[1][0], true))
+}
+
+export function transactionElevatedPayloads([transaction, payloads]: HydratedTransaction): WithHashStorageMeta<Payload>[] {
+  const hashes = transactionElevatedPayloadHashes(transaction)
+  const elevatedPayloads = payloads.filter(payload => hashes.includes(payload._hash))
+  return elevatedPayloads
+}

package/src/transaction/primitives/transactionOperations.ts

@@ -0,0 +1,11 @@
+export function crackOperation(operation: string): [string, string[]] {
+  const parts = operation.split('|')
+  if (parts.length < 2) {
+    throw new Error(`Invalid operation format: ${operation}`)
+  }
+  return [parts[0], parts.slice(1)]
+}
+
+export function crackOperations(operations: string[]): [string, string[]][] {
+  return operations.map(op => crackOperation(op))
+}