@xyo-network/xl1-protocol-sdk 1.29.8 → 1.30.1

package/dist/neutral/simple/block/SimpleBlockViewer.d.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/sdk-js';
 import type { Payload, ReadArchivist, WithHashMeta } from '@xyo-network/sdk-js';
-import { BlockContextRead, BlockRate, BlockViewer, ChainContextRead, ChainId, DataLakeViewer, FinalizationViewer, type SignedHydratedBlockWithHashMeta, SignedHydratedBlockWithStorageMeta, SingleTimeConfig, TimeDurations, type XL1BlockNumber, XL1BlockRange } from '@xyo-network/xl1-protocol-lib';
+import { BlockContextRead, BlockRate, BlockViewer, ChainContextRead, ChainId, FinalizationViewer, type SignedHydratedBlockWithHashMeta, SignedHydratedBlockWithStorageMeta, SingleTimeConfig, TimeDurations, type XL1BlockNumber, XL1BlockRange } from '@xyo-network/xl1-protocol-lib';
 import type { CreatableProviderParams } from '../../CreatableProvider/index.ts';
 import { AbstractCreatableProvider } from '../../CreatableProvider/index.ts';
 import { LruCacheMap } from '../../driver/index.ts';
@@ -18,10 +18,9 @@ export declare class SimpleBlockViewer extends AbstractCreatableProvider<SimpleB
     static readonly monikers: "BlockViewer"[];
     moniker: "BlockViewer";
     protected _store?: ChainStoreRead;
-    protected dataLakeViewer?: DataLakeViewer;
     protected finalizationViewer: FinalizationViewer;
     protected payloadCache: LruCacheMap<import("@xylabs/sdk-js").BrandedHash, WithHashMeta<Payload>, () => void>;
-    protected signedHydratedBlockWithDataLakePayloadsCache: LruCacheMap<import("@xylabs/sdk-js").BrandedHash, [{
+    protected signedHydratedBlockWithHashMetaCache: LruCacheMap<import("@xylabs/sdk-js").BrandedHash, [{
         schema: "network.xyo.boundwitness" & {
             readonly __schema: true;
         };

package/dist/neutral/simple/block/SimpleBlockViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleBlockViewer.d.ts","sourceRoot":"","sources":["../../../../src/simple/block/SimpleBlockViewer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SimpleBlockViewer.d.ts","sourceRoot":"","sources":["../../../../src/simple/block/SimpleBlockViewer.ts"],"names":[],"mappings":"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"}

package/dist/neutral/simple/mempool/SimpleMempoolRunner.d.ts

@@ -7,6 +7,13 @@ import { AbstractCreatableProvider, CreatableProviderParams } from '../../Creata
 export interface SimpleMempoolRunnerParams extends CreatableProviderParams {
     externalMempools?: MempoolViewer[];
     maxExpAhead?: number;
+    /**
+     * Maximum number of pending transactions allowed in the pool. When exceeded after
+     * `submitTransactions` or `prunePendingTransactions`, the runner evicts the excess —
+     * demoted transactions first (when the resolved viewer supports it), then oldest
+     * by sequence. `0` (default) disables the cap.
+     */
+    maxPendingTransactions?: number;
     pendingBlocksArchivist: ArchivistInstance;
     pendingTransactionsArchivist: ArchivistInstance;
     syncInterval?: number;
@@ -33,6 +40,7 @@ export declare class SimpleMempoolRunner extends AbstractCreatableProvider<Simpl
     protected _chainContractViewer: ChainContractViewer;
     protected _deadLetterQueueRunner?: DeadLetterQueueRunner;
     protected _finalizationViewer: FinalizationViewer;
+    protected _mempoolViewer?: MempoolViewer;
     protected _transactionValidationViewer: TransactionValidationViewer;
     private _syncMutex;
     private _syncTimerId;
@@ -41,6 +49,7 @@ export declare class SimpleMempoolRunner extends AbstractCreatableProvider<Simpl
     protected get externalMempools(): MempoolViewer[];
     protected get finalizationViewer(): FinalizationViewer;
     protected get maxExpAhead(): number;
+    protected get maxPendingTransactions(): number;
     protected get pendingBlocksArchivist(): ArchivistInstance<import("@xyo-network/sdk-js").ArchivistParams<import("@xyo-network/sdk-js").AnyConfigSchema<import("@xyo-network/sdk-js").ArchivistConfig>>, import("@xyo-network/sdk-js").ArchivistModuleEventData, Payload>;
     protected get pendingTransactionsArchivist(): ArchivistInstance<import("@xyo-network/sdk-js").ArchivistParams<import("@xyo-network/sdk-js").AnyConfigSchema<import("@xyo-network/sdk-js").ArchivistConfig>>, import("@xyo-network/sdk-js").ArchivistModuleEventData, Payload>;
     protected get syncInterval(): number;
@@ -55,6 +64,11 @@ export declare class SimpleMempoolRunner extends AbstractCreatableProvider<Simpl
     submitTransactions(transactions: SignedHydratedTransaction[]): Promise<Hash[]>;
     protected startHandler(): Promise<void>;
     protected stopHandler(): Promise<void>;
+    private collectAllPendingTransactionBundles;
+    private enforceCap;
+    private finalizePruneTransactionsResult;
+    private forgetBundleHashes;
+    private orderForEviction;
     private routeRejectedTransaction;
     private simpleBlockValidationCheck;
     private simpleTransactionValidationCheck;

package/dist/neutral/simple/mempool/SimpleMempoolRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleMempoolRunner.d.ts","sourceRoot":"","sources":["../../../../src/simple/mempool/SimpleMempoolRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SimpleMempoolRunner.d.ts","sourceRoot":"","sources":["../../../../src/simple/mempool/SimpleMempoolRunner.ts"],"names":[],"mappings":"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"}

package/dist/neutral/simple/mempool/SimpleMempoolViewer.d.ts

@@ -1,10 +1,20 @@
+import { type Hash } from '@xylabs/sdk-js';
 import type { ArchivistInstance } from '@xyo-network/sdk-js';
 import { type MempoolViewer, PendingTransactionsOptions, type SignedHydratedBlockWithHashMeta, type SignedHydratedTransactionWithHashMeta, WindowedBlockViewer } from '@xyo-network/xl1-protocol-lib';
 import { AbstractCreatableProvider, CreatableProviderParams } from '../../CreatableProvider/index.ts';
+/** Per-bundle handout statistics used to demote transactions that producers keep rejecting. */
+export interface HandoutStats {
+    firstHandoutAt: number;
+    handouts: number;
+}
 /** Parameters for SimpleMempoolViewer. */
 export interface SimpleMempoolViewerParams extends CreatableProviderParams {
+    /** Number of handouts before a transaction is considered demoted. Defaults to 3. */
+    demotionThreshold?: number;
     /** External mempool viewers (reserved for future use). */
     externalMempools?: MempoolViewer[];
+    /** Maximum age (in blocks) of a handout-stats entry before it is garbage collected. Defaults to 1000. */
+    handoutStatsTtlBlocks?: number;
     /** Maximum fraction (0–1) of mempool inclusion candidates to return. Defaults to 0.66. */
     mempoolSelectionRatio?: number;
     pendingBlocksArchivist: ArchivistInstance;
@@ -16,14 +26,30 @@ export declare class SimpleMempoolViewer extends AbstractCreatableProvider<Simpl
     static readonly dependencies: "WindowedBlockViewer"[];
     static readonly monikers: "MempoolViewer"[];
     moniker: "MempoolViewer";
+    private _handoutStats;
     private _windowedBlockViewer?;
+    protected get demotionThreshold(): number;
+    protected get handoutStatsTtlBlocks(): number;
     protected get pendingBlocksArchivist(): ArchivistInstance<import("@xyo-network/sdk-js").ArchivistParams<import("@xyo-network/sdk-js").AnyConfigSchema<import("@xyo-network/sdk-js").ArchivistConfig>>, import("@xyo-network/sdk-js").ArchivistModuleEventData, import("@xyo-network/sdk-js").Payload>;
     protected get pendingTransactionsArchivist(): ArchivistInstance<import("@xyo-network/sdk-js").ArchivistParams<import("@xyo-network/sdk-js").AnyConfigSchema<import("@xyo-network/sdk-js").ArchivistConfig>>, import("@xyo-network/sdk-js").ArchivistModuleEventData, import("@xyo-network/sdk-js").Payload>;
     protected get windowedBlockViewer(): WindowedBlockViewer<"WindowedBlockViewer">;
     createHandler(): Promise<void>;
+    /** Drop handout stats for the given bundle hashes. Called when a bundle has been evicted or otherwise removed from the pool. */
+    forget(bundleHashes: Hash[]): void;
+    /** Return the subset of the given bundle hashes that are currently considered demoted. */
+    getDemotedBundleHashes(bundleHashes: Hash[]): Hash[];
+    /**
+     * Return the bundle hashes in the order they should be evicted under size pressure.
+     * Demoted entries come first, sorted by handouts descending; the remainder is left as-is
+     * so the caller can append by FIFO sequence order.
+     */
+    getEvictionPriorityOrder(bundleHashes: Hash[]): Hash[];
+    getHandoutStats(bundleHash: Hash): HandoutStats | undefined;
     pendingBlocks({ cursor: providedCursor }?: PendingTransactionsOptions): Promise<SignedHydratedBlockWithHashMeta[]>;
     pendingTransactions({ cursor: providedCursor, limit, }?: PendingTransactionsOptions): Promise<SignedHydratedTransactionWithHashMeta[]>;
+    protected isDemoted(bundleHash: Hash): boolean;
     private deleteBundledTransaction;
+    private gcHandoutStats;
     /**
      * Evaluates a transaction to determine if it should be purged from the mempool.
      * @param tx The transaction to evaluate
@@ -41,5 +67,7 @@ export declare class SimpleMempoolViewer extends AbstractCreatableProvider<Simpl
      * @returns True if the transaction is valid for inclusion in the next block, false otherwise
      */
     private isInclusionCandidate;
+    private recordHandout;
+    private selectWithRatio;
 }
 //# sourceMappingURL=SimpleMempoolViewer.d.ts.map

package/dist/neutral/simple/mempool/SimpleMempoolViewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleMempoolViewer.d.ts","sourceRoot":"","sources":["../../../../src/simple/mempool/SimpleMempoolViewer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACiC,KAAK,aAAa,EACxD,0BAA0B,EAC1B,KAAK,+BAA+B,EAAE,KAAK,qCAAqC,EAChF,mBAAmB,EAEpB,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EACL,yBAAyB,EAAqB,uBAAuB,EACtE,MAAM,kCAAkC,CAAA;AAazC,0CAA0C;AAC1C,MAAM,WAAW,yBAA0B,SAAQ,uBAAuB;IACxE,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,aAAa,EAAE,CAAA;IAClC,0FAA0F;IAC1F,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,sBAAsB,EAAE,iBAAiB,CAAA;IACzC,4BAA4B,EAAE,iBAAiB,CAAA;CAChD;AAED,0CAA0C;AAC1C,qBACa,mBAAoB,SAAQ,yBAAyB,CAAC,yBAAyB,CAAE,YAAW,aAAa;IACpH,MAAM,CAAC,QAAQ,CAAC,cAAc,kBAAuB;IACrD,MAAM,CAAC,QAAQ,CAAC,YAAY,0BAA+B;IAC3D,MAAM,CAAC,QAAQ,CAAC,QAAQ,oBAAyB;IACjD,OAAO,kBAAqC;IAE5C,OAAO,CAAC,oBAAoB,CAAC,CAAqB;IAElD,SAAS,KAAK,sBAAsB,kQAEnC;IAED,SAAS,KAAK,4BAA4B,kQAEzC;IAED,SAAS,KAAK,mBAAmB,+CAEhC;IAEc,aAAa;IAKtB,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,GAAE,0BAA+B,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC;IAetH,mBAAmB,CAAC,EACxB,MAAM,EAAE,cAAc,EACtB,KAAW,GACZ,GAAE,0BAA+B,GAAG,OAAO,CAAC,qCAAqC,EAAE,CAAC;YAiEvE,wBAAwB;IAItC;;;;;OAKG;YACW,WAAW;IAezB;;;;;;;;OAQG;YACW,oBAAoB;CAiBnC"}
+{"version":3,"file":"SimpleMempoolViewer.d.ts","sourceRoot":"","sources":["../../../../src/simple/mempool/SimpleMempoolViewer.ts"],"names":[],"mappings":"AAAA,OAAO,EACG,KAAK,IAAI,EAClB,MAAM,gBAAgB,CAAA;AACvB,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EACiC,KAAK,aAAa,EACxD,0BAA0B,EAC1B,KAAK,+BAA+B,EAAE,KAAK,qCAAqC,EAChF,mBAAmB,EAEpB,MAAM,+BAA+B,CAAA;AAEtC,OAAO,EACL,yBAAyB,EAAqB,uBAAuB,EACtE,MAAM,kCAAkC,CAAA;AAUzC,+FAA+F;AAC/F,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;CACjB;AASD,0CAA0C;AAC1C,MAAM,WAAW,yBAA0B,SAAQ,uBAAuB;IACxE,oFAAoF;IACpF,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,aAAa,EAAE,CAAA;IAClC,yGAAyG;IACzG,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,0FAA0F;IAC1F,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,sBAAsB,EAAE,iBAAiB,CAAA;IACzC,4BAA4B,EAAE,iBAAiB,CAAA;CAChD;AAED,0CAA0C;AAC1C,qBACa,mBAAoB,SAAQ,yBAAyB,CAAC,yBAAyB,CAAE,YAAW,aAAa;IACpH,MAAM,CAAC,QAAQ,CAAC,cAAc,kBAAuB;IACrD,MAAM,CAAC,QAAQ,CAAC,YAAY,0BAA+B;IAC3D,MAAM,CAAC,QAAQ,CAAC,QAAQ,oBAAyB;IACjD,OAAO,kBAAqC;IAE5C,OAAO,CAAC,aAAa,CAAgC;IACrD,OAAO,CAAC,oBAAoB,CAAC,CAAqB;IAElD,SAAS,KAAK,iBAAiB,IAAI,MAAM,CAExC;IAED,SAAS,KAAK,qBAAqB,IAAI,MAAM,CAE5C;IAED,SAAS,KAAK,sBAAsB,kQAEnC;IAED,SAAS,KAAK,4BAA4B,kQAEzC;IAED,SAAS,KAAK,mBAAmB,+CAEhC;IAEc,aAAa;IAK5B,gIAAgI;IAChI,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI;IAIlC,0FAA0F;IAC1F,sBAAsB,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE;IAIpD;;;;OAIG;IACH,wBAAwB,CAAC,YAAY,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE;IAWtD,eAAe,CAAC,UAAU,EAAE,IAAI,GAAG,YAAY,GAAG,SAAS;IAIrD,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,GAAE,0BAA+B,GAAG,OAAO,CAAC,+BAA+B,EAAE,CAAC;IAetH,mBAAmB,CAAC,EACxB,MAAM,EAAE,cAAc,EACtB,KAAW,GACZ,GAAE,0BAA+B,GAAG,OAAO,CAAC,qCAAqC,EAAE,CAAC;IAuErF,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,GAAG,OAAO;YAKhC,wBAAwB;IAItC,OAAO,CAAC,cAAc;IAOtB;;;;;OAKG;YACW,WAAW;IAazB;;;;;;;;OAQG;YACW,oBAAoB;IAgBlC,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,eAAe;CAWxB"}

package/dist/neutral/test/index.mjs

@@ -1154,30 +1154,6 @@ async function validateTransactionsOpcodes(txs) {
   return txElevatedPayloads;
 }
 
-// src/primitives/datalake/addDataLakePayloadsToPayloads.ts
-import { isUndefined as isUndefined3 } from "@xylabs/sdk-js";
-import { isAnyPayload, PayloadBuilder as PayloadBuilder4 } from "@xyo-network/sdk-js";
-async function addDataLakePayloadsToPayloads(hashes, payloads, dataLakeViewer) {
-  if (isUndefined3(dataLakeViewer)) return [payloads, []];
-  const missingPayloadHashes = hashes.filter((hash) => !payloads.some((p) => p._hash === hash));
-  const payloadsFromDataLake = await PayloadBuilder4.addHashMeta(
-    await PayloadBuilder4.addHashMeta((await dataLakeViewer.get(missingPayloadHashes)).filter(isAnyPayload))
-  );
-  return [[...payloads, ...payloadsFromDataLake], payloadsFromDataLake.map((p) => p._hash)];
-}
-
-// src/primitives/datalake/addDataLakePayloads.ts
-async function addDataLakePayloads([boundWitness, payloads], dataLakeViewer) {
-  const [updatedPayloads, foundHashes] = await addDataLakePayloadsToPayloads(boundWitness.payload_hashes, payloads, dataLakeViewer);
-  return [
-    [
-      boundWitness,
-      updatedPayloads
-    ],
-    foundHashes
-  ];
-}
-
 // src/primitives/state/findMostRecentBlock.ts
 import { isSignedBlockBoundWitnessWithStorageMeta } from "@xyo-network/xl1-protocol-lib";
 var DEFAULT_NEXT_OPTIONS = { limit: 50 };
@@ -1312,14 +1288,13 @@ var ConfigZod = BaseConfigZod.extend({
 import {
   assertEx as assertEx11,
   exists,
-  isUndefined as isUndefined4
+  isUndefined as isUndefined3
 } from "@xylabs/sdk-js";
 import {
   asSignedHydratedBlockWithHashMeta,
   asSignedHydratedBlockWithStorageMeta,
   asXL1BlockNumber as asXL1BlockNumber3,
   BlockViewerMoniker,
-  DataLakeViewerMoniker,
   FinalizationViewerMoniker
 } from "@xyo-network/xl1-protocol-lib";
 
@@ -1351,10 +1326,9 @@ var MIN_HEAD_POLL_INTERVAL_MS = 5e3;
 var SimpleBlockViewer = class extends AbstractCreatableProvider {
   moniker = SimpleBlockViewer.defaultMoniker;
   _store;
-  dataLakeViewer;
   finalizationViewer;
   payloadCache = new LruCacheMap({ max: 1e4 });
-  signedHydratedBlockWithDataLakePayloadsCache = new LruCacheMap({ max: 2e3, ttl: 1e3 * 60 * 60 });
+  signedHydratedBlockWithHashMetaCache = new LruCacheMap({ max: 2e3, ttl: 1e3 * 60 * 60 });
   _headPollHash;
   _headPollInProgress = false;
   _headPollTimer = null;
@@ -1390,23 +1364,22 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async blockByHash(hash) {
     return await this.spanAsync("blockByHash", async () => {
-      const cachedBlock = this.signedHydratedBlockWithDataLakePayloadsCache.get(hash);
+      const cachedBlock = this.signedHydratedBlockWithHashMetaCache.get(hash);
       if (cachedBlock) {
         return cachedBlock;
       }
       const cache = this.hydratedBlockCache;
       const block = await cache.get(hash);
-      const [result] = block ? await addDataLakePayloads(block, this.dataLakeViewer) : [null, []];
-      if (result) {
-        this.signedHydratedBlockWithDataLakePayloadsCache.set(hash, result);
+      if (block) {
+        this.signedHydratedBlockWithHashMetaCache.set(hash, block);
       }
-      return result;
+      return block ?? null;
     }, { ...this.context, timeBudgetLimit: 100 });
   }
   async blockByNumber(blockNumber) {
     return await this.spanAsync("blockByNumber", async () => {
       const chainContext = await this.getChainContextRead();
-      if (isUndefined4(chainContext.head)) {
+      if (isUndefined3(chainContext.head)) {
         return null;
       }
       return await this.blockByNumberWithContext(chainContext, blockNumber);
@@ -1432,7 +1405,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
       assertEx11(limit > 0, () => "limit must be greater than 0");
       assertEx11(limit <= 100, () => "limit must be less than 100");
       const chainContext = await this.getChainContextRead();
-      if (isUndefined4(chainContext.head)) {
+      if (isUndefined3(chainContext.head)) {
         return [];
       }
       const blocks = [];
@@ -1453,13 +1426,11 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this.dataLakeViewer = await this.locator.tryGetInstance(DataLakeViewerMoniker);
     this.finalizationViewer = await this.locator.getInstance(FinalizationViewerMoniker);
     this._store = { chainMap: this.params.finalizedArchivist };
   }
   async currentBlock() {
-    const [result] = await addDataLakePayloads(await this.finalizationViewer.head(), this.dataLakeViewer);
-    return result;
+    return await this.finalizationViewer.head();
   }
   async currentBlockHash() {
     return await this.finalizationViewer.headHash();
@@ -1477,7 +1448,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     const cachedHashes = new Set(cachedPayloads.map((p) => p._hash));
     remainingHashes = remainingHashes.filter((h) => !cachedHashes.has(h));
     const finalizedPayloads = remainingHashes.length > 0 ? await this.finalizedArchivist.get(remainingHashes) : [];
-    const [resultPayloads] = await addDataLakePayloadsToPayloads(hashes, [...cachedPayloads, ...finalizedPayloads.filter(exists)], this.dataLakeViewer);
+    const resultPayloads = [...cachedPayloads, ...finalizedPayloads.filter(exists)];
     resultPayloads.map((payload) => {
       this.payloadCache.set(payload._hash, payload);
     });
@@ -1516,9 +1487,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
     await super.stopHandler();
   }
   async blockByNumberWithContext(chainContext, blockNumber) {
-    const block = asSignedHydratedBlockWithHashMeta(await hydratedBlockByNumber(chainContext, blockNumber)) ?? null;
-    const [result] = block ? await addDataLakePayloads(block, this.dataLakeViewer) : [null, []];
-    return result;
+    return asSignedHydratedBlockWithHashMeta(await hydratedBlockByNumber(chainContext, blockNumber)) ?? null;
   }
   async pollHead(emitOnChange) {
     if (this._headPollInProgress) return;
@@ -1722,7 +1691,7 @@ import {
   asSchema as asSchema2,
   IdSchema as IdSchema2,
   MemoryArchivist,
-  PayloadBuilder as PayloadBuilder9
+  PayloadBuilder as PayloadBuilder8
 } from "@xyo-network/sdk-js";
 import {
   asXL1BlockNumber as asXL1BlockNumber7
@@ -1739,7 +1708,7 @@ import { assertEx as assertEx14, isDefined as isDefined8 } from "@xylabs/sdk-js"
 import {
   asAnyPayload as asAnyPayload3,
   BoundWitnessBuilder as BoundWitnessBuilder2,
-  PayloadBuilder as PayloadBuilder5
+  PayloadBuilder as PayloadBuilder4
 } from "@xyo-network/sdk-js";
 import {
   asXL1BlockNumber as asXL1BlockNumber4,
@@ -1822,10 +1791,10 @@ async function buildBlock(options) {
   const step_hashes = [];
   for (const [tx] of txs) {
     if (tx.nbf > blockNumber) {
-      throw new Error(`Transaction ${await PayloadBuilder5.hash(tx)} not valid for block ${blockNumber} - NBF is ${tx.nbf}`);
+      throw new Error(`Transaction ${await PayloadBuilder4.hash(tx)} not valid for block ${blockNumber} - NBF is ${tx.nbf}`);
     }
     if (tx.exp < blockNumber) {
-      throw new Error(`Transaction ${await PayloadBuilder5.hash(tx)} not valid for block ${blockNumber} - EXP is ${tx.exp}`);
+      throw new Error(`Transaction ${await PayloadBuilder4.hash(tx)} not valid for block ${blockNumber} - EXP is ${tx.exp}`);
     }
   }
   const completedStepRewardTransfers = [];
@@ -1861,9 +1830,9 @@ async function buildBlock(options) {
     previous,
     step_hashes,
     protocol
-  }).meta({ $epoch: Date.now(), $signatures: [] }).signers(signers).payloads(await PayloadBuilder5.addStorageMeta(payloads)).build();
+  }).meta({ $epoch: Date.now(), $signatures: [] }).signers(signers).payloads(await PayloadBuilder4.addStorageMeta(payloads)).build();
   assertEx14(isBlockBoundWitness(bw), () => "Build of BlockBoundWitness failed");
-  return [await PayloadBuilder5.addStorageMeta(bw), txPayloads.map((p) => asAnyPayload3(p, true))];
+  return [await PayloadBuilder4.addStorageMeta(bw), txPayloads.map((p) => asAnyPayload3(p, true))];
 }
 
 // src/test/buildNextBlock.ts
@@ -1889,7 +1858,7 @@ import {
   asAnyPayload as asAnyPayload4,
   asSchema,
   IdSchema,
-  PayloadBuilder as PayloadBuilder6
+  PayloadBuilder as PayloadBuilder5
 } from "@xyo-network/sdk-js";
 import {
   asXL1BlockNumber as asXL1BlockNumber5
@@ -1913,7 +1882,7 @@ async function buildGenesisBlock(chainId, txs, blockPayloads, signers, chainStep
 var TestChainId = assertEx15(asAddress("c5fe2e6F6841Cbab12d8C0618Be2DF8C6156cC44"));
 
 // src/test/createGenesisBlock.ts
-import { PayloadBuilder as PayloadBuilder8 } from "@xyo-network/sdk-js";
+import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/sdk-js";
 import {
   BlockBoundWitnessSchemaPayload,
   BlockBoundWitnessWithStorageMetaSchemaPayload,
@@ -1925,14 +1894,14 @@ import {
 } from "@xyo-network/xl1-schema";
 
 // src/test/createProducerChainStakeIntentTransaction.ts
-import { PayloadBuilder as PayloadBuilder7 } from "@xyo-network/sdk-js";
+import { PayloadBuilder as PayloadBuilder6 } from "@xyo-network/sdk-js";
 import {
   asXL1BlockNumber as asXL1BlockNumber6,
   ChainStakeIntentSchema,
   defaultTransactionFees as defaultTransactionFees2
 } from "@xyo-network/xl1-protocol-lib";
 async function createProducerChainStakeIntent(from, exp, nbf = 0) {
-  return await PayloadBuilder7.addHashMeta(new PayloadBuilder7({ schema: ChainStakeIntentSchema }).fields({
+  return await PayloadBuilder6.addHashMeta(new PayloadBuilder6({ schema: ChainStakeIntentSchema }).fields({
     from,
     exp,
     nbf,
@@ -1942,7 +1911,7 @@ async function createProducerChainStakeIntent(from, exp, nbf = 0) {
 
 // src/test/createGenesisBlock.ts
 var createGenesisBlock = async (initialBlockProducer, nextContractAddress, genesisBlockRewardAmount, genesisBlockRewardAddress) => {
-  const blockPayloads = await PayloadBuilder8.addHashMeta([
+  const blockPayloads = await PayloadBuilder7.addHashMeta([
     TransferPayloadJsonSchemaPayload,
     BlockBoundWitnessSchemaPayload,
     BlockBoundWitnessWithStorageMetaSchemaPayload,
@@ -1954,7 +1923,7 @@ var createGenesisBlock = async (initialBlockProducer, nextContractAddress, genes
   const intentPayload = await createProducerChainStakeIntent(initialBlockProducer.address, 1, 0);
   blockPayloads.push(intentPayload);
   if (genesisBlockRewardAmount > 0n) {
-    blockPayloads.push(await PayloadBuilder8.addHashMeta(createTransferPayload(
+    blockPayloads.push(await PayloadBuilder7.addHashMeta(createTransferPayload(
       nextContractAddress,
       { [genesisBlockRewardAddress]: genesisBlockRewardAmount }
     )));
@@ -1985,9 +1954,9 @@ var buildRandomChain = async (blockProducer, count = 10, previousBlock, chainId,
   let saltCounter = 0;
   while (remaining > 0) {
     saltCounter += 1;
-    const payloads = [new PayloadBuilder9({ schema: IdSchema2 }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()];
+    const payloads = [new PayloadBuilder8({ schema: IdSchema2 }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()];
     saltCounter += 1;
-    const additionalPrivatePayloads = remaining % 2 === 0 ? [new PayloadBuilder9({ schema: asSchema2("network.xyo.private", true) }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()] : [];
+    const additionalPrivatePayloads = remaining % 2 === 0 ? [new PayloadBuilder8({ schema: asSchema2("network.xyo.private", true) }).fields({ salt: `${Date.now()}-${saltCounter}` }).build()] : [];
     const txs = [];
     for (const receiverAddress of resolvedReceiverAddresses) {
       txs.push(await buildRandomTransaction(