@xyo-network/xl1-protocol-sdk 2.0.7 → 2.0.9

package/dist/neutral/index.mjs

@@ -1246,7 +1246,8 @@ import { globalRegistry as globalRegistry12, z as z17 } from "zod/mini";
 import { z as z16 } from "zod/mini";
 
 // src/config/Chain.ts
-import { AddressZod, HexZod } from "@xylabs/sdk-js";
+import { HexZod } from "@xylabs/sdk-js";
+import { XyoAddressZod } from "@xyo-network/address";
 import { globalRegistry, z as z2 } from "zod/mini";
 var ChainConfigZod = z2.object({
   id: z2.optional(HexZod).register(globalRegistry, {
@@ -1254,7 +1255,7 @@ var ChainConfigZod = z2.object({
     title: "chain.id",
     type: "string"
   }),
-  genesisRewardAddress: z2.optional(AddressZod).register(globalRegistry, {
+  genesisRewardAddress: z2.optional(XyoAddressZod).register(globalRegistry, {
     description: "Address to send the initial genesis rewards to, if a new chain is being created.",
     title: "chain.genesisRewardAddress",
     type: "Address"
@@ -1497,7 +1498,7 @@ var TelemetryConfigZod = z14.object({
 }).describe("Telemetry configuration options");
 
 // src/config/Validation.ts
-import { AddressZod as AddressZod2 } from "@xylabs/sdk-js";
+import { XyoAddressZod as XyoAddressZod2 } from "@xyo-network/address";
 import { globalRegistry as globalRegistry11, z as z15 } from "zod";
 
 // src/primitives/block/range/blockRangeSteps.ts
@@ -1743,11 +1744,8 @@ async function getWindowedChain(context, blockViewer, maxWindowSize, previousCha
 }
 
 // src/primitives/chain/step/chainStepRewardAddress.ts
-import {
-  assertEx as assertEx14,
-  exists,
-  toAddress as toAddress2
-} from "@xylabs/sdk-js";
+import { assertEx as assertEx14, exists } from "@xylabs/sdk-js";
+import { toXyoAddress as toXyoAddress2 } from "@xyo-network/address";
 import {
   asTransfer,
   isTransfer,
@@ -1755,13 +1753,14 @@ import {
 } from "@xyo-network/xl1-protocol-lib";
 
 // src/primitives/payload/mergeTransfers.ts
-import { hexToBigInt, toAddress } from "@xylabs/sdk-js";
+import { hexToBigInt } from "@xylabs/sdk-js";
+import { toXyoAddress } from "@xyo-network/address";
 function mergeTransfers(transfers) {
   const result = {};
   for (const transfer of transfers) {
     result[transfer.from] = result[transfer.from] ?? {};
     for (const [to, value] of Object.entries(transfer.transfers)) {
-      const typedTo = toAddress(to);
+      const typedTo = toXyoAddress(to, true);
       result[transfer.from][typedTo] = (result[transfer.from][typedTo] ?? 0n) + hexToBigInt(value);
     }
   }
@@ -1815,7 +1814,7 @@ async function chainStepRewardAddress(context, blockViewer, { block, step }) {
     sortedTransferAmounts.length === transferCount,
     () => `Step Transfers mismatch ${block} (${blockBw._hash}) [${sortedTransferAmounts.length} - ${transferCount}]`
   );
-  return toAddress2(sortedTransferAmounts[transferIndex][0]);
+  return toXyoAddress2(sortedTransferAmounts[transferIndex][0], true);
 }
 
 // src/primitives/chain/step/stepRewardTotal.ts
@@ -1839,11 +1838,9 @@ var asAddressPairPayload = AsObjectFactory.create(isAddressPairPayload);
 var asOptionalAddressPairPayload = AsObjectFactory.createOptional(isAddressPairPayload);
 
 // src/payloads/netBalancesForPayloads.ts
-import {
-  hexToBigInt as hexToBigInt2,
-  toAddress as toAddress3
-} from "@xylabs/sdk-js";
+import { hexToBigInt as hexToBigInt2 } from "@xylabs/sdk-js";
 import { span } from "@xylabs/sdk-js";
+import { toXyoAddress as toXyoAddress3 } from "@xyo-network/address";
 import { isTransfer as isTransfer2 } from "@xyo-network/xl1-protocol-lib";
 var netBalancesForPayloads = (context, payloads) => {
   return span("netBalancesForPayloads", () => {
@@ -1852,8 +1849,8 @@ var netBalancesForPayloads = (context, payloads) => {
       if (isTransfer2(payload)) {
         const { from } = payload;
         for (const [address, amount] of Object.entries(payload.transfers)) {
-          balances[toAddress3(address)] = (balances[toAddress3(address)] ?? 0n) + hexToBigInt2(amount);
-          balances[toAddress3(from)] = (balances[toAddress3(from)] ?? 0n) - hexToBigInt2(amount);
+          balances[toXyoAddress3(address, true)] = (balances[toXyoAddress3(address, true)] ?? 0n) + hexToBigInt2(amount);
+          balances[toXyoAddress3(from, true)] = (balances[toXyoAddress3(from, true)] ?? 0n) - hexToBigInt2(amount);
         }
       }
     }
@@ -1862,11 +1859,9 @@ var netBalancesForPayloads = (context, payloads) => {
 };
 
 // src/payloads/netSchemasForPayloads.ts
-import {
-  hexToBigInt as hexToBigInt3,
-  toAddress as toAddress4
-} from "@xylabs/sdk-js";
+import { hexToBigInt as hexToBigInt3 } from "@xylabs/sdk-js";
 import { span as span2 } from "@xylabs/sdk-js";
+import { toXyoAddress as toXyoAddress4 } from "@xyo-network/address";
 import { isTransfer as isTransfer3 } from "@xyo-network/xl1-protocol-lib";
 var netSchemasForPayloads = (context, payloads) => {
   return span2("netSchemasForPayloads", () => {
@@ -1875,8 +1870,8 @@ var netSchemasForPayloads = (context, payloads) => {
       if (isTransfer3(payload)) {
         const { from } = payload;
         for (const [address, amount] of Object.entries(payload.transfers)) {
-          balances[toAddress4(address)] = (balances[toAddress4(address)] ?? 0n) + hexToBigInt3(amount);
-          balances[toAddress4(from)] = (balances[toAddress4(from)] ?? 0n) - hexToBigInt3(amount);
+          balances[toXyoAddress4(address, true)] = (balances[toXyoAddress4(address, true)] ?? 0n) + hexToBigInt3(amount);
+          balances[toXyoAddress4(from, true)] = (balances[toXyoAddress4(from, true)] ?? 0n) - hexToBigInt3(amount);
         }
       }
     }
@@ -1885,9 +1880,7 @@ var netSchemasForPayloads = (context, payloads) => {
 };
 
 // src/payloads/netTransfersForPayloads.ts
-import {
-  hexToBigInt as hexToBigInt4
-} from "@xylabs/sdk-js";
+import { hexToBigInt as hexToBigInt4 } from "@xylabs/sdk-js";
 import { span as span3 } from "@xylabs/sdk-js";
 import { isTransfer as isTransfer4 } from "@xyo-network/xl1-protocol-lib";
 function netTransfersForPayloads(context, payloads) {
@@ -2170,14 +2163,12 @@ async function activeStakeAtTimeByPosition(chainStakeEvents, externalTime, posit
 }
 
 // src/primitives/stake/allStakersForRange.ts
-import {
-  toAddress as toAddress5
-} from "@xylabs/sdk-js";
+import { toXyoAddress as toXyoAddress5 } from "@xyo-network/address";
 async function allStakersForRange(chain, externalRange, staked) {
   const mergedEvents = await mergedAddRemoveStakeEventsByStaker(chain, [0, externalRange[1]], staked);
   const resultWithZeros = {};
   for (const event of mergedEvents) {
-    const staker = toAddress5(event.args.staker);
+    const staker = toXyoAddress5(event.args.staker, true);
     resultWithZeros[staker] = resultWithZeros[staker] ?? 0n;
     if (event.name === "StakeAdded") {
       resultWithZeros[staker] += event.args.amount;
@@ -2188,7 +2179,7 @@ async function allStakersForRange(chain, externalRange, staked) {
   const nonZero = Object.entries(resultWithZeros).filter(([, amount]) => amount > 0n).map(([address]) => address);
   const result = {};
   for (const address of nonZero) {
-    result[toAddress5(address)] = resultWithZeros[toAddress5(address)];
+    result[toXyoAddress5(address, true)] = resultWithZeros[toXyoAddress5(address, true)];
   }
   return result;
 }
@@ -2408,12 +2399,12 @@ function findUncles(context, finalizedWindowedChain, blocks) {
 
 // src/config/Validation.ts
 var ValidationConfigZod = z15.object({
-  allowedRewardRedeemers: z15.array(AddressZod2).optional().register(globalRegistry11, {
+  allowedRewardRedeemers: z15.array(XyoAddressZod2).optional().register(globalRegistry11, {
     description: "List of allowed reward redeemer addresses, if undefined anyone can participate",
     title: "allowedRewardRedeemers",
     type: "array"
   }),
-  allowedRewardEscrowAccountSigners: z15.array(AddressZod2).optional().register(globalRegistry11, {
+  allowedRewardEscrowAccountSigners: z15.array(XyoAddressZod2).optional().register(globalRegistry11, {
     description: "List of allowed reward escrow account signer addresses, if undefined anyone can participate",
     title: "allowedRewardEscrowAccountSigners",
     type: "array"
@@ -2621,7 +2612,7 @@ import { PayloadBundleSchema as PayloadBundleSchema2 } from "@xyo-network/sdk-js
 import { PayloadBuilder as PayloadBuilder12 } from "@xyo-network/sdk-js";
 
 // src/transaction/buildTransaction.ts
-import { asAddress, toHex } from "@xylabs/sdk-js";
+import { assertEx as assertEx19, toHex } from "@xylabs/sdk-js";
 import {
   asAnyPayload as asAnyPayload2,
   BoundWitnessBuilder,
@@ -2650,7 +2641,7 @@ async function buildTransaction(chain, onChainPayloads, offChainPayloads, signer
   }
   const fields = {
     ...txBoundWitnessFields,
-    from: from ?? asAddress(Array.isArray(signer) ? signer.at(0)?.address : signer.address, true)
+    from: from ?? (Array.isArray(signer) ? assertEx19(signer.at(0)?.address) : signer.address)
   };
   if (script.length > 0) {
     fields.script = script;
@@ -2736,7 +2727,7 @@ var confirmSubmittedTransaction = async (viewer, txHash, options) => {
 };
 
 // src/transaction/hydrateTransaction.ts
-import { assertEx as assertEx19 } from "@xylabs/sdk-js";
+import { assertEx as assertEx20 } from "@xylabs/sdk-js";
 import {
   asAnyPayload as asAnyPayload3,
   hydrateTypedBoundWitness,
@@ -2811,7 +2802,7 @@ var tryHydrateElevatedTransaction = async ({ chainMap }, hash) => {
   return void 0;
 };
 var hydrateElevatedTransaction = async (context, hash) => {
-  return assertEx19(await tryHydrateElevatedTransaction(context, hash), () => "Hydration failed");
+  return assertEx20(await tryHydrateElevatedTransaction(context, hash), () => "Hydration failed");
 };
 
 // src/transaction/primitives/transactionBlockByteCount.ts
@@ -2864,13 +2855,13 @@ function transactionRequiredGas(hydratedTransaction) {
 
 // src/transaction/signTransaction.ts
 import {
-  assertEx as assertEx20,
+  assertEx as assertEx21,
   hexFromArrayBuffer,
   toArrayBuffer
 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder10 } from "@xyo-network/sdk-js";
 async function signTransaction(tx, account) {
-  assertEx20(tx.from === account.address, () => "Signer address does not match transaction from address");
+  assertEx21(tx.from === account.address, () => "Signer address does not match transaction from address");
   const unsignedTx = structuredClone(tx);
   unsignedTx.addresses = [account.address];
   unsignedTx.previous_hashes = [account.previousHash ?? null];
@@ -2885,11 +2876,7 @@ async function signTransaction(tx, account) {
 }
 
 // src/transaction/TransactionBuilder.ts
-import {
-  asAddress as asAddress2,
-  assertEx as assertEx21,
-  Base
-} from "@xylabs/sdk-js";
+import { assertEx as assertEx22, Base } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder11 } from "@xyo-network/sdk-js";
 import {
   asXL1BlockNumber as asXL1BlockNumber4,
@@ -2909,9 +2896,9 @@ var TransactionBuilder = class extends Base {
     super(options);
   }
   async build() {
-    const chain = assertEx21(this._chain, () => "Chain must be set before building the transaction");
-    const fees = assertEx21(this._fees, () => "Fees must be set before building the transaction");
-    const blockRange = assertEx21(this._blockRange, () => "Block range must be set before building the transaction");
+    const chain = assertEx22(this._chain, () => "Chain must be set before building the transaction");
+    const fees = assertEx22(this._fees, () => "Fees must be set before building the transaction");
+    const blockRange = assertEx22(this._blockRange, () => "Block range must be set before building the transaction");
     return await buildTransaction(
       chain,
       this._elevatedPayloads,
@@ -2919,7 +2906,7 @@ var TransactionBuilder = class extends Base {
       this._signers,
       asXL1BlockNumber4(blockRange[0], true),
       asXL1BlockNumber4(blockRange[1], true),
-      asAddress2(this._signers[0]?.address),
+      this._signers[0]?.address,
       fees
     );
   }
@@ -2935,13 +2922,13 @@ var TransactionBuilder = class extends Base {
       this._signers,
       asXL1BlockNumber4(0, true),
       asXL1BlockNumber4(1e3, true),
-      asAddress2(this._signers[0]?.address),
+      this._signers[0]?.address,
       defaultTransactionFees3
     );
   }
   elevatedPayload(payload) {
     const allowedPayload = isAllowedBlockPayload2(payload) ? payload : void 0;
-    const allowPayloadExists = assertEx21(allowedPayload, () => "Payload must be an AllowedBlockPayload");
+    const allowPayloadExists = assertEx22(allowedPayload, () => "Payload must be an AllowedBlockPayload");
     this._elevatedPayloads.push(allowPayloadExists);
     return this;
   }
@@ -3043,12 +3030,12 @@ var toActorConfigContext = zodToFactory5(ActorConfigContext, "toActorConfigConte
 // src/CreatableProvider/AbstractCreatableProvider.ts
 import {
   AbstractCreatable,
-  assertEx as assertEx23,
+  assertEx as assertEx24,
   IdLogger
 } from "@xylabs/sdk-js";
 
 // src/CreatableProvider/ProviderFactory.ts
-import { assertEx as assertEx22 } from "@xylabs/sdk-js";
+import { assertEx as assertEx23 } from "@xylabs/sdk-js";
 function providerFactoryDescription(factory, labels) {
   return `${factory.providerName}:${factory.defaultMoniker}:${JSON.stringify(labels ?? factory.labels ?? {})}`;
 }
@@ -3069,7 +3056,7 @@ var ProviderFactory = class _ProviderFactory {
     this.dependencies = dependencies;
     this.monikers = creatableProvider2.monikers;
     this.scope = scope;
-    assertEx22(this.monikers.includes(this.defaultMoniker), () => "defaultMoniker must be in monikers");
+    assertEx23(this.monikers.includes(this.defaultMoniker), () => "defaultMoniker must be in monikers");
     this.labels = Object.assign({}, creatableProvider2.labels ?? {}, labels ?? {});
     this.providerName = creatableProvider2.name;
     this._uniqueId = Symbol(providerFactoryDescription(this));
@@ -3097,7 +3084,7 @@ var ProviderFactory = class _ProviderFactory {
         break;
       }
       case "context": {
-        const context = assertEx22(
+        const context = assertEx23(
           params?.context,
           () => "Context is required for context-scoped providers"
         );
@@ -3118,7 +3105,7 @@ var ProviderFactory = class _ProviderFactory {
     scopeObject[this.resolvedMoniker] = resultPromise;
     const result = await resultPromise;
     if (start) {
-      assertEx22(await result.start(), () => `Failed to start provider instance [${this.resolvedMoniker}]`);
+      assertEx23(await result.start(), () => `Failed to start provider instance [${this.resolvedMoniker}]`);
     }
     return result;
   }
@@ -3163,9 +3150,9 @@ var AbstractCreatableProvider = class extends AbstractCreatable {
     return factory;
   }
   static async paramsHandler(params = {}) {
-    const context = assertEx23(params.context, () => new Error("Context is required"));
-    const config = assertEx23(context.config, () => new Error("Context config is required"));
-    const locator = assertEx23(context.locator, () => new Error("Context locator is required"));
+    const context = assertEx24(params.context, () => new Error("Context is required"));
+    const config = assertEx24(context.config, () => new Error("Context config is required"));
+    const locator = assertEx24(context.locator, () => new Error("Context locator is required"));
     return await super.paramsHandler({
       ...params,
       statusReporter: params.statusReporter ?? context.statusReporter,
@@ -3277,7 +3264,7 @@ function labeledCreatableProviderFactory() {
 
 // src/CreatableProvider/ProviderFactoryLocator.ts
 import { hasAllLabels } from "@xylabs/sdk-js";
-import { assertEx as assertEx24 } from "@xylabs/sdk-js";
+import { assertEx as assertEx25 } from "@xylabs/sdk-js";
 var ProviderFactoryLocator = class _ProviderFactoryLocator {
   _context;
   _registry;
@@ -3309,7 +3296,7 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
     this._frozen = true;
   }
   async getInstance(moniker, { start = true, labels } = {}) {
-    return assertEx24(
+    return assertEx25(
       await this.tryGetInstance(moniker, { start, labels }),
       () => `No provider instance for the supplied config moniker [${moniker}]${labels ? ` & labels [${JSON.stringify(labels)}]` : ""} could be created`
     );
@@ -3324,7 +3311,7 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
    * @returns A provider factory that matches the supplied moniker and labels or throws if one is not found
    */
   locate(moniker, labels) {
-    return assertEx24(
+    return assertEx25(
       this.tryLocate(moniker, labels),
       () => `No module factory for the supplied config moniker [${moniker}]${labels ? ` & labels [${JSON.stringify(labels)}]` : ""} registered`
     );
@@ -3346,10 +3333,10 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
    * @param labels The labels for the module factory
    */
   register(factory, labels, primary = false) {
-    assertEx24(!this._frozen, () => "Cannot register a module factory after the locator has been frozen");
+    assertEx25(!this._frozen, () => "Cannot register a module factory after the locator has been frozen");
     if (this.validateDepsOnRegister) {
       const missingDeps = factory.dependencies.filter((dep) => !this.registered(dep));
-      assertEx24(missingDeps.length === 0, () => `Cannot register module factory [${factory.uniqueId.description}] due to missing dependencies: ${missingDeps.join(", ")}`);
+      assertEx25(missingDeps.length === 0, () => `Cannot register module factory [${factory.uniqueId.description}] due to missing dependencies: ${missingDeps.join(", ")}`);
     }
     registerCreatableProviderFactory(this._registry, factory, labels, primary);
     return this;
@@ -3397,7 +3384,7 @@ var ProviderFactoryLocator = class _ProviderFactoryLocator {
     for (const moniker in this.registry) {
       for (const factory of this.registry[moniker] ?? []) {
         const missingDeps = factory.dependencies.filter((dep) => !this.registered(dep));
-        assertEx24(missingDeps.length === 0, () => `Module factory [${factory.uniqueId.description}] is missing dependencies: ${missingDeps.join(", ")}`);
+        assertEx25(missingDeps.length === 0, () => `Module factory [${factory.uniqueId.description}] is missing dependencies: ${missingDeps.join(", ")}`);
       }
     }
   }
@@ -3617,7 +3604,7 @@ var toPositiveBigInt = (value) => {
 // src/simple/accountBalance/SimpleAccountBalanceViewer.ts
 import {
   asHash as asHash4,
-  assertEx as assertEx31,
+  assertEx as assertEx32,
   exists as exists3,
   isDefined as isDefined17,
   ZERO_ADDRESS
@@ -3688,19 +3675,18 @@ var isTransfersStepSummaryWithStorageMeta = (value) => {
 var asTransfersStepSummaryWithStorageMeta = AsObjectFactory7.create(isTransfersStepSummaryWithStorageMeta);
 
 // src/summary/primitives/balances/balancesStepSummaryFromRange.ts
-import { spanRootAsync as spanRootAsync2 } from "@xylabs/sdk-js";
-import { assertEx as assertEx25 } from "@xylabs/sdk-js";
+import { assertEx as assertEx26, spanRootAsync as spanRootAsync2 } from "@xylabs/sdk-js";
 import { isAnyPayload as isAnyPayload3 } from "@xyo-network/sdk-js";
 import { asXL1BlockNumber as asXL1BlockNumber5, StepSizes as StepSizes7 } from "@xyo-network/xl1-protocol-lib";
 async function balancesStepSummaryFromRange(context, semaphores, blockViewer, summaryMap, range) {
   const cacheKey = `${range[0]}|${range[1]}`;
   return await withContextCacheResponse(context, "balancesStepSummaryFromRange", cacheKey, async () => {
     return await spanRootAsync2("balancesStepSummaryFromRange", async () => {
-      const [frameHead] = assertEx25(await blockViewer.blockByNumber(range[1]), () => `Block not found for number: ${range[1]}`);
+      const [frameHead] = assertEx26(await blockViewer.blockByNumber(range[1]), () => `Block not found for number: ${range[1]}`);
       const frameSize = range[1] - range[0] + 1;
       const key = `${frameHead._hash}|${frameSize}`;
       return frameSize === 1 ? await spanRootAsync2(`balancesStepSummaryFromRange.frameSize=1[${key}]`, async () => {
-        const [, payloads] = assertEx25(await blockViewer.blockByNumber(range[0]), () => `Block not found for number: ${range[0]}`);
+        const [, payloads] = assertEx26(await blockViewer.blockByNumber(range[0]), () => `Block not found for number: ${range[0]}`);
         const balances = {};
         for (const [address, balance] of Object.entries(netBalancesForPayloads(context, payloads))) {
           balances[address] = toSignedBigInt(balance);
@@ -3713,7 +3699,7 @@ async function balancesStepSummaryFromRange(context, semaphores, blockViewer, su
         };
       }, { ...context, timeBudgetLimit: 500 }) : await spanRootAsync2(`balancesStepSummaryFromRange.frameSize>1[${key}]`, async () => {
         const step = StepSizes7.indexOf(asXL1BlockNumber5(frameSize, true));
-        assertEx25(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes7.join(", ")}`);
+        assertEx26(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes7.join(", ")}`);
         const summaryResult = await summaryMap.get(`${frameHead._hash}|${frameSize}`);
         if (isAnyPayload3(summaryResult)) {
           return summaryResult;
@@ -3757,11 +3743,8 @@ async function balancesStepSummaryFromRange(context, semaphores, blockViewer, su
 }
 
 // src/summary/primitives/balances/balancesSummary.ts
-import {
-  asAddress as asAddress3,
-  assertEx as assertEx26,
-  spanRootAsync as spanRootAsync3
-} from "@xylabs/sdk-js";
+import { assertEx as assertEx27, spanRootAsync as spanRootAsync3 } from "@xylabs/sdk-js";
+import { asXyoAddress } from "@xyo-network/address";
 import {
   asBlockBoundWitnessWithStorageMeta as asBlockBoundWitnessWithStorageMeta3,
   asXL1BlockRange as asXL1BlockRange7,
@@ -3771,7 +3754,7 @@ import {
 async function balancesSummary(context, semaphores, blockViewer, summaryMap, config) {
   return await spanRootAsync3("balancesSummary", async () => {
     const headHash = isChainQualifiedHeadConfig(config) ? config.head : await blockViewer.currentBlockHash();
-    const [head] = assertEx26(await blockViewer.blockByHash(headHash), () => `Block not found for hash: ${headHash}`);
+    const [head] = assertEx27(await blockViewer.blockByHash(headHash), () => `Block not found for hash: ${headHash}`);
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta3(head, () => `Found Block not a BlockWithHashMeta: ${headHash}`);
     const range = isChainQualifiedRangeConfig(config) ? config.range : asXL1BlockRange7([0, headBoundWitness.block], true);
     const ranges = deepCalculateFramesFromRange(asXL1BlockRange7(
@@ -3782,7 +3765,7 @@ async function balancesSummary(context, semaphores, blockViewer, summaryMap, con
     const balances = {};
     for (const summary of summaries) {
       for (const [address, balance] of Object.entries(summary.balances)) {
-        const validAddress = asAddress3(address, () => `Invalid address: ${address}`);
+        const validAddress = asXyoAddress(address, () => `Invalid address: ${address}`);
         balances[validAddress] = (balances[validAddress] ?? 0n) + parseSignedBigInt(balance);
       }
     }
@@ -3791,7 +3774,7 @@ async function balancesSummary(context, semaphores, blockViewer, summaryMap, con
 }
 
 // src/summary/primitives/schemas/schemasStepSummaryFromRange.ts
-import { assertEx as assertEx27 } from "@xylabs/sdk-js";
+import { assertEx as assertEx28 } from "@xylabs/sdk-js";
 import {
   isAnyPayload as isAnyPayload4,
   isBoundWitness as isBoundWitness2,
@@ -3800,11 +3783,11 @@ import {
 } from "@xyo-network/sdk-js";
 import { StepSizes as StepSizes8 } from "@xyo-network/xl1-protocol-lib";
 async function schemasStepSummaryFromRange(context, semaphores, blockViewer, summaryMap, range) {
-  const [frameHead] = assertEx27(await blockViewer.blockByNumber(range[1]), () => `Block not found for number: ${range[1]}`);
+  const [frameHead] = assertEx28(await blockViewer.blockByNumber(range[1]), () => `Block not found for number: ${range[1]}`);
   const frameSize = range[1] - range[0] + 1;
   let result;
   if (frameSize === 1) {
-    const [block, payloads] = assertEx27(await blockViewer.blockByNumber(range[0]), () => `Block not found for number: ${range[0]}`);
+    const [block, payloads] = assertEx28(await blockViewer.blockByNumber(range[0]), () => `Block not found for number: ${range[0]}`);
     const boundWitnesses = [block, ...payloads.filter((x) => isBoundWitness2(x) && isHashMeta(x))];
     const schemas = {};
     for (const bw of boundWitnesses) {
@@ -3821,7 +3804,7 @@ async function schemasStepSummaryFromRange(context, semaphores, blockViewer, sum
     });
   } else {
     const step = StepSizes8.indexOf(frameSize);
-    assertEx27(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes8.join(", ")}`);
+    assertEx28(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes8.join(", ")}`);
     const summaryResult = await summaryMap.get(`${frameHead._hash}|${frameSize}`);
     if (isAnyPayload4(summaryResult)) {
       result = summaryResult;
@@ -3860,7 +3843,7 @@ async function schemasStepSummaryFromRange(context, semaphores, blockViewer, sum
 }
 
 // src/summary/primitives/schemas/schemasSummary.ts
-import { assertEx as assertEx28, spanRootAsync as spanRootAsync4 } from "@xylabs/sdk-js";
+import { assertEx as assertEx29, spanRootAsync as spanRootAsync4 } from "@xylabs/sdk-js";
 import {
   asBlockBoundWitnessWithStorageMeta as asBlockBoundWitnessWithStorageMeta4,
   asXL1BlockRange as asXL1BlockRange8,
@@ -3870,7 +3853,7 @@ import {
 async function schemasSummary(context, semaphores, blockViewer, summaryMap, config) {
   return await spanRootAsync4("schemasSummary", async () => {
     const headHash = isChainQualifiedHeadConfig2(config) ? config.head : await blockViewer.currentBlockHash();
-    const [head] = assertEx28(await blockViewer.blockByHash(headHash), () => `Block not found for hash: ${headHash}`);
+    const [head] = assertEx29(await blockViewer.blockByHash(headHash), () => `Block not found for hash: ${headHash}`);
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta4(head, () => `Found Block not a BlockWithHashMeta: ${headHash}`);
     const range = isChainQualifiedRangeConfig2(config) ? config.range : asXL1BlockRange8([0, headBoundWitness.block], true);
     const ranges = deepCalculateFramesFromRange(asXL1BlockRange8(
@@ -3890,7 +3873,7 @@ async function schemasSummary(context, semaphores, blockViewer, summaryMap, conf
 }
 
 // src/summary/primitives/transfers/transfersStepSummaryFromRange.ts
-import { assertEx as assertEx29, spanRootAsync as spanRootAsync5 } from "@xylabs/sdk-js";
+import { assertEx as assertEx30, spanRootAsync as spanRootAsync5 } from "@xylabs/sdk-js";
 import { isAnyPayload as isAnyPayload5 } from "@xyo-network/sdk-js";
 import { asXL1BlockNumber as asXL1BlockNumber6, StepSizes as StepSizes9 } from "@xyo-network/xl1-protocol-lib";
 function transfersSummaryKey(frameHeadHash, frameSize) {
@@ -3900,11 +3883,11 @@ async function transfersStepSummaryFromRange(context, semaphores, blockViewer, s
   const cacheKey = `${range[0]}|${range[1]}`;
   return await withContextCacheResponse(context, "transfersStepSummaryFromRange", cacheKey, async () => {
     return await spanRootAsync5("transfersStepSummaryFromRange", async () => {
-      const [frameHead] = assertEx29(await blockViewer.blockByNumber(range[1]), () => `Block not found for number: ${range[1]}`);
+      const [frameHead] = assertEx30(await blockViewer.blockByNumber(range[1]), () => `Block not found for number: ${range[1]}`);
       const frameSize = range[1] - range[0] + 1;
       let result;
       if (frameSize === 1) {
-        const [, payloads] = assertEx29(await blockViewer.blockByNumber(range[0]), () => `Block not found for number: ${range[0]}`);
+        const [, payloads] = assertEx30(await blockViewer.blockByNumber(range[0]), () => `Block not found for number: ${range[0]}`);
         const transfers = {};
         for (const [from, toMap] of Object.entries(netTransfersForPayloads(context, payloads))) {
           transfers[from] = transfers[from] ?? {};
@@ -3920,7 +3903,7 @@ async function transfersStepSummaryFromRange(context, semaphores, blockViewer, s
         };
       } else {
         const step = StepSizes9.indexOf(asXL1BlockNumber6(frameSize, true));
-        assertEx29(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes9.join(", ")}`);
+        assertEx30(step !== -1, () => `Invalid step size: ${frameSize}. Must be one of ${StepSizes9.join(", ")}`);
         const key = transfersSummaryKey(frameHead._hash, frameSize);
         const summaryResult = await summaryMap.get(key);
         if (isAnyPayload5(summaryResult)) {
@@ -3971,11 +3954,8 @@ async function transfersStepSummaryFromRange(context, semaphores, blockViewer, s
 }
 
 // src/summary/primitives/transfers/transfersSummary.ts
-import {
-  asAddress as asAddress4,
-  assertEx as assertEx30,
-  spanRootAsync as spanRootAsync6
-} from "@xylabs/sdk-js";
+import { assertEx as assertEx31, spanRootAsync as spanRootAsync6 } from "@xylabs/sdk-js";
+import { asXyoAddress as asXyoAddress2 } from "@xyo-network/address";
 import {
   asBlockBoundWitnessWithStorageMeta as asBlockBoundWitnessWithStorageMeta5,
   asXL1BlockRange as asXL1BlockRange9,
@@ -3985,7 +3965,7 @@ import {
 async function transfersSummary(context, semaphores, blockViewer, summaryMap, config) {
   return await spanRootAsync6("transferSummary", async () => {
     const headHash = isChainQualifiedHeadConfig3(config) ? config.head : await blockViewer.currentBlockHash();
-    const [head] = assertEx30(await blockViewer.blockByHash(headHash), () => `Block not found for hash: ${headHash}`);
+    const [head] = assertEx31(await blockViewer.blockByHash(headHash), () => `Block not found for hash: ${headHash}`);
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta5(head, () => `Found Block not a BlockWithHashMeta: ${headHash}`);
     const range = isChainQualifiedRangeConfig3(config) ? config.range : asXL1BlockRange9([0, headBoundWitness.block], true);
     const ranges = deepCalculateFramesFromRange(asXL1BlockRange9(
@@ -3996,10 +3976,10 @@ async function transfersSummary(context, semaphores, blockViewer, summaryMap, co
     const transfers = {};
     for (const summary of summaries) {
       for (const [from, toMap] of Object.entries(summary.transfers)) {
-        const validFrom = asAddress4(from, () => `Invalid address: ${from}`);
+        const validFrom = asXyoAddress2(from, () => `Invalid address: ${from}`);
         transfers[validFrom] = transfers[validFrom] ?? {};
         for (const [to, transfer] of Object.entries(toMap)) {
-          const validTo = asAddress4(to, () => `Invalid address: ${to}`);
+          const validTo = asXyoAddress2(to, () => `Invalid address: ${to}`);
           transfers[validFrom][validTo] = (transfers[validFrom][validTo] ?? 0n) + parseSignedBigInt(transfer);
         }
       }
@@ -4026,8 +4006,8 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
   static async paramsHandler(params = {}) {
     return {
       ...await super.paramsHandler(params),
-      balancesSummaryMap: assertEx31(params.balancesSummaryMap, () => "balancesSummaryMap is required"),
-      transfersSummaryMap: assertEx31(params.transfersSummaryMap, () => "transfersSummaryMap is required")
+      balancesSummaryMap: assertEx32(params.balancesSummaryMap, () => "balancesSummaryMap is required"),
+      transfersSummaryMap: assertEx32(params.transfersSummaryMap, () => "transfersSummaryMap is required")
     };
   }
   async accountBalance(address, config) {
@@ -4048,7 +4028,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema2 ? index : void 0).filter(exists3);
         const transfers = transferIndexes.map((index) => {
           const hash = block[0].payload_hashes[index];
-          return assertEx31(
+          return assertEx32(
             block[1].find((p) => p._hash === hash),
             () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`
           );
@@ -4081,7 +4061,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
       const head = isChainQualifiedHeadConfig4(config) ? config.head : await this.blockViewer.currentBlockHash();
       const range = isChainQualifiedRangeConfig4(config) ? config.range : asXL1BlockRange10([
         0,
-        assertEx31(
+        assertEx32(
           await this.blockViewer.blockByHash(head),
           () => `Error: Could not find block with hash ${head}`
         )[0].block
@@ -4096,11 +4076,11 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
       const qualifiedRange = qualifiedEntries[0][1][1].range;
       const qualifiedHeadHash = qualifiedEntries[0][1][1].head;
       for (const [_, [__, { range: range2, head: head2 }]] of qualifiedEntries) {
-        assertEx31(
+        assertEx32(
           range2[0] === qualifiedRange[0] && range2[1] === qualifiedRange[1],
           () => "Inconsistent ranges in qualifiedAccountBalanceHistories"
         );
-        assertEx31(
+        assertEx32(
           head2 === qualifiedHeadHash,
           () => "Inconsistent head hashes in qualifiedAccountBalanceHistories"
         );
@@ -4171,7 +4151,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
     return await this.spanAsync("qualifiedAccountBalanceHistory", async () => {
       const range = asRange(headOrRange);
       const headHash = asHash4(headOrRange);
-      const [head] = assertEx31(isDefined17(headHash) ? await this.blockViewer.blockByHash(headHash) : await this.blockViewer.currentBlock(), () => "Could not resolve head block");
+      const [head] = assertEx32(isDefined17(headHash) ? await this.blockViewer.blockByHash(headHash) : await this.blockViewer.currentBlock(), () => "Could not resolve head block");
       const startingRange = asXL1BlockRange10(range ?? [0, head.block], true);
       const blockNumbers = await this.distillTransferHistory(address, startingRange);
       const blocks = (await Promise.all(blockNumbers.map(async (bn) => await this.blockViewer.blockByNumber(bn)))).filter(exists3);
@@ -4180,7 +4160,7 @@ var SimpleAccountBalanceViewer = class extends AbstractCreatableProvider {
         const transferIndexes = block[0].payload_schemas.map((schema, index) => schema === TransferSchema2 ? index : void 0).filter(exists3);
         const transfers = transferIndexes.map((index) => {
           const hash = block[0].payload_hashes[index];
-          return assertEx31(
+          return assertEx32(
             block[1].find((p) => p._hash === hash),
             () => `Error: Could not find Transfer with hash ${hash} in block ${block[0]._hash}`
           );
@@ -4210,7 +4190,7 @@ SimpleAccountBalanceViewer = __decorateClass([
 
 // src/simple/block/SimpleBlockViewer.ts
 import {
-  assertEx as assertEx32,
+  assertEx as assertEx33,
   exists as exists4,
   isUndefined as isUndefined8
 } from "@xylabs/sdk-js";
@@ -4287,11 +4267,11 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   static async paramsHandler(params) {
     const headPollIntervalMs = params.headPollIntervalMs;
     if (headPollIntervalMs !== void 0) {
-      assertEx32(headPollIntervalMs >= MIN_HEAD_POLL_INTERVAL_MS, () => `headPollIntervalMs must be at least ${MIN_HEAD_POLL_INTERVAL_MS}ms`);
+      assertEx33(headPollIntervalMs >= MIN_HEAD_POLL_INTERVAL_MS, () => `headPollIntervalMs must be at least ${MIN_HEAD_POLL_INTERVAL_MS}ms`);
     }
     return {
       ...await super.paramsHandler(params),
-      finalizedArchivist: assertEx32(params.finalizedArchivist, () => "finalizedArchivist is required"),
+      finalizedArchivist: assertEx33(params.finalizedArchivist, () => "finalizedArchivist is required"),
       headPollIntervalMs
     };
   }
@@ -4320,8 +4300,8 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async blocksByHash(hash, limit = 50) {
     return await this.spanAsync("blocksByHash", async () => {
-      assertEx32(limit > 0, () => "limit must be greater than 0");
-      assertEx32(limit <= 100, () => "limit must be less than 100");
+      assertEx33(limit > 0, () => "limit must be greater than 0");
+      assertEx33(limit <= 100, () => "limit must be less than 100");
       const blocks = [];
       let current = await this.blockByHash(hash);
       while (current && blocks.length < limit) {
@@ -4335,8 +4315,8 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async blocksByNumber(blockNumber, limit = 50) {
     return await this.spanAsync("blocksByNumber", async () => {
-      assertEx32(limit > 0, () => "limit must be greater than 0");
-      assertEx32(limit <= 100, () => "limit must be less than 100");
+      assertEx33(limit > 0, () => "limit must be greater than 0");
+      assertEx33(limit <= 100, () => "limit must be less than 100");
       const chainContext = await this.getChainContextRead();
       if (isUndefined8(chainContext.head)) {
         return [];
@@ -4354,7 +4334,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   }
   async chainId(blockNumber = "latest") {
     return await this.spanAsync("chainId", async () => {
-      return blockNumber === "latest" ? (await this.finalizationViewer.headBlock()).chain : assertEx32(await this.blockByNumber(blockNumber), () => `Block not found [${blockNumber}]`)[0].chain;
+      return blockNumber === "latest" ? (await this.finalizationViewer.headBlock()).chain : assertEx33(await this.blockByNumber(blockNumber), () => `Block not found [${blockNumber}]`)[0].chain;
     }, this.context);
   }
   async createHandler() {
@@ -4483,7 +4463,7 @@ SimpleBlockRewardViewer = __decorateClass([
 ], SimpleBlockRewardViewer);
 
 // src/simple/blockValidation/SimpleBlockValidationViewer.ts
-import { assertEx as assertEx33 } from "@xylabs/sdk-js";
+import { assertEx as assertEx34 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder18 } from "@xyo-network/sdk-js";
 import {
   AccountBalanceViewerMoniker as AccountBalanceViewerMoniker2,
@@ -4536,7 +4516,7 @@ var SimpleBlockValidationViewer = class extends AbstractCreatableProvider {
       head: void 0
     };
     const blocksWithMeta = await Promise.all(blocks.map((b) => Promise.all([PayloadBuilder18.addHashMeta(b[0]), PayloadBuilder18.addHashMeta(b[1])])));
-    const head = isChainQualifiedHeadConfig5(config) ? assertEx33(
+    const head = isChainQualifiedHeadConfig5(config) ? assertEx34(
       (await this.blockViewer.blockByHash(config.head))?.[0],
       () => `Specified a head that is not in the chain [${config.head}]`
     ) : void 0;
@@ -4617,9 +4597,7 @@ SimpleBlockValidationViewer = __decorateClass([
 ], SimpleBlockValidationViewer);
 
 // src/simple/chainContractViewer/SimpleChainContractViewer.ts
-import {
-  assertEx as assertEx34
-} from "@xylabs/sdk-js";
+import { assertEx as assertEx35 } from "@xylabs/sdk-js";
 import { ChainContractViewerMoniker as ChainContractViewerMoniker2, FinalizationViewerMoniker as FinalizationViewerMoniker2 } from "@xyo-network/xl1-protocol-lib";
 var SimpleChainContractViewer = class extends AbstractCreatableProvider {
   moniker = SimpleChainContractViewer.defaultMoniker;
@@ -4636,7 +4614,7 @@ var SimpleChainContractViewer = class extends AbstractCreatableProvider {
       let contractViewer = this;
       let forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
       while (forkedAtBlockNumber !== null && blockNumber <= forkedAtBlockNumber) {
-        contractViewer = assertEx34(await contractViewer.forkedChainContractViewer());
+        contractViewer = assertEx35(await contractViewer.forkedChainContractViewer());
         forkedAtBlockNumber = await contractViewer.forkedAtBlockNumber();
         chainId = await contractViewer.chainId();
       }
@@ -4689,7 +4667,7 @@ var SimpleXyoClient = class {
 };
 
 // src/simple/datalake/RestDataLakeRunner.ts
-import { assertEx as assertEx35, exists as exists6 } from "@xylabs/sdk-js";
+import { assertEx as assertEx36, exists as exists6 } from "@xylabs/sdk-js";
 import { isAnyPayload as isAnyPayload7, PayloadZodLoose } from "@xyo-network/sdk-js";
 import { DataLakeRunnerMoniker } from "@xyo-network/xl1-protocol-lib";
 import { z as z29 } from "zod/mini";
@@ -4758,7 +4736,7 @@ var RestDataLakeRunner = class extends AbstractRestDataLake {
   async insert(items) {
     const allowedItems = items.map((item) => {
       if (isAnyPayload7(item) && this.isAllowed(item)) {
-        assertEx35(typeof item === "object" && item !== null, () => "Data must be an object");
+        assertEx36(typeof item === "object" && item !== null, () => "Data must be an object");
         return item;
       }
       return null;
@@ -4901,7 +4879,7 @@ SimpleFinalizationRunner = __decorateClass([
 ], SimpleFinalizationRunner);
 
 // src/simple/finalization/SimpleFinalizationViewer.ts
-import { assertEx as assertEx36 } from "@xylabs/sdk-js";
+import { assertEx as assertEx37 } from "@xylabs/sdk-js";
 import {
   asSignedHydratedBlockWithStorageMeta as asSignedHydratedBlockWithStorageMeta2,
   ChainContractViewerMoniker as ChainContractViewerMoniker3,
@@ -4930,7 +4908,7 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   static async paramsHandler(params) {
     return {
       ...await super.paramsHandler(params),
-      finalizedArchivist: assertEx36(params.finalizedArchivist, () => "finalizedArchivist is required")
+      finalizedArchivist: assertEx37(params.finalizedArchivist, () => "finalizedArchivist is required")
     };
   }
   chainId() {
@@ -4938,18 +4916,18 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._chainId = assertEx36(this.config.chain.id ?? (await findMostRecentBlock(this.params.finalizedArchivist))?.chain, () => "chain.id is required if empty archivist");
+    this._chainId = assertEx37(this.config.chain.id ?? (await findMostRecentBlock(this.params.finalizedArchivist))?.chain, () => "chain.id is required if empty archivist");
     this._store = { chainMap: this.params.finalizedArchivist };
   }
   async head() {
     return await this.spanAsync("head", async () => {
-      const currentHead = assertEx36(await this.getCurrentHead(), () => "Could not find most recent block [currentBlock]");
+      const currentHead = assertEx37(await this.getCurrentHead(), () => "Could not find most recent block [currentBlock]");
       const cache = this.hydratedBlockCache;
       const block = await cache.get(currentHead._hash);
       if (!block) {
         this.logger?.error(`Could not find current block with hash ${currentHead._hash}`);
       }
-      return assertEx36(block, () => "Could not find current block");
+      return assertEx37(block, () => "Could not find current block");
     }, this.context);
   }
   async headBlock() {
@@ -4975,8 +4953,8 @@ var SimpleFinalizationViewer = class extends AbstractCreatableProvider {
   }
   async getCurrentHead() {
     const chainArchivist = this.finalizedArchivist;
-    const result = assertEx36(await findMostRecentBlock(chainArchivist), () => "Could not find most recent block [getCurrentHead]");
-    assertEx36(result?.chain === this._chainId, () => "Chain ID does not match head block chain ID");
+    const result = assertEx37(await findMostRecentBlock(chainArchivist), () => "Could not find most recent block [getCurrentHead]");
+    assertEx37(result?.chain === this._chainId, () => "Chain ID does not match head block chain ID");
     return result;
   }
 };
@@ -5006,7 +4984,7 @@ var SimpleXyoGateway = class _SimpleXyoGateway extends AbstractCreatableProvider
 
 // src/simple/gateway/SimpleXyoGatewayRunner.ts
 import {
-  assertEx as assertEx37,
+  assertEx as assertEx38,
   BigIntToJsonZod,
   isDefined as isDefined18
 } from "@xylabs/sdk-js";
@@ -5039,7 +5017,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
     return this._signer;
   }
   async addPayloadsToChain(onChain, offChain, options) {
-    const viewer = assertEx37(this.connection.viewer, () => "No viewer available on connection");
+    const viewer = assertEx38(this.connection.viewer, () => "No viewer available on connection");
     const {
       nbf,
       exp,
@@ -5055,7 +5033,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
   async addTransactionToChain(tx, offChain = []) {
     const connection = this.connection;
     const signer = this.signer;
-    const runner = assertEx37(connection.runner, () => "No runner available on connection");
+    const runner = assertEx38(connection.runner, () => "No runner available on connection");
     let signedTx;
     if (isSignedHydratedTransaction(tx)) {
       const [bw, payloads] = tx;
@@ -5070,7 +5048,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
   }
   async confirmSubmittedTransaction(txHash, options) {
     return await confirmSubmittedTransaction(
-      assertEx37(this.connection.viewer, () => "Connection viewer is undefined"),
+      assertEx38(this.connection.viewer, () => "Connection viewer is undefined"),
       txHash,
       options
     );
@@ -5107,7 +5085,7 @@ var SimpleXyoGatewayRunner = class _SimpleXyoGatewayRunner extends AbstractCreat
 
 // src/simple/mempool/SimpleMempoolRunner.ts
 import {
-  assertEx as assertEx38,
+  assertEx as assertEx39,
   exists as exists8
 } from "@xylabs/sdk-js";
 import { isPayloadBundle, PayloadBuilder as PayloadBuilder21 } from "@xyo-network/sdk-js";
@@ -5182,8 +5160,8 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
   static async paramsHandler(params) {
     return {
       ...await super.paramsHandler(params),
-      pendingBlocksArchivist: assertEx38(params?.pendingBlocksArchivist, () => "pendingBlocksArchivist is required"),
-      pendingTransactionsArchivist: assertEx38(params?.pendingTransactionsArchivist, () => "pendingTransactionsArchivist is required")
+      pendingBlocksArchivist: assertEx39(params?.pendingBlocksArchivist, () => "pendingBlocksArchivist is required"),
+      pendingTransactionsArchivist: assertEx39(params?.pendingTransactionsArchivist, () => "pendingTransactionsArchivist is required")
     };
   }
   async createHandler() {
@@ -5221,7 +5199,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
           return b;
         }
       }).filter(exists8);
-      assertEx38(
+      assertEx39(
         remainingBlockMap.length === remainingBlocks.length,
         () => `remainingBlockMap length should match remainingBlocks length [${remainingBlockMap.length}/${remainingBlocks.length}]`
       );
@@ -5283,7 +5261,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
           return t;
         }
       }).filter(exists8);
-      assertEx38(
+      assertEx39(
         remainingTransactionMap.length === remainingTransactions.length,
         () => `remainingTransactionMap length should match remainingTransactions length [${remainingTransactionMap.length}/${remainingTransactions.length}]`
       );
@@ -5822,7 +5800,7 @@ var SimpleXyoNetwork = class {
 };
 
 // src/simple/permissions/SimpleXyoPermissions.ts
-import { assertEx as assertEx39 } from "@xylabs/sdk-js";
+import { assertEx as assertEx40 } from "@xylabs/sdk-js";
 var SimpleXyoPermissions = class {
   invoker;
   _store;
@@ -5831,7 +5809,7 @@ var SimpleXyoPermissions = class {
     this.invoker = store.invoker;
   }
   get store() {
-    return assertEx39(this._store, () => "Store must be defined to get permissions");
+    return assertEx40(this._store, () => "Store must be defined to get permissions");
   }
   async getPermissions() {
     return await this.store.getPermissions();
@@ -5884,7 +5862,7 @@ var SimpleXyoPermissions = class {
 };
 
 // src/simple/permissions/store/MemoryPermissions.ts
-import { assertEx as assertEx40 } from "@xylabs/sdk-js";
+import { assertEx as assertEx41 } from "@xylabs/sdk-js";
 var MemoryPermissionsStore = class {
   _invoker;
   permissions = [];
@@ -5892,7 +5870,7 @@ var MemoryPermissionsStore = class {
     this._invoker = invoker;
   }
   get invoker() {
-    return assertEx40(this._invoker, () => "Invoker must be defined to get permissions");
+    return assertEx41(this._invoker, () => "Invoker must be defined to get permissions");
   }
   async getPermissions() {
     await Promise.resolve();
@@ -5932,7 +5910,6 @@ SimpleXyoRunner = __decorateClass([
 ], SimpleXyoRunner);
 
 // src/simple/signer/SimpleXyoSigner.ts
-import { asAddress as asAddress5 } from "@xylabs/sdk-js";
 import { Account, PayloadBuilder as PayloadBuilder23 } from "@xyo-network/sdk-js";
 import {
   SignedHydratedTransactionWithHashMetaZod,
@@ -5957,7 +5934,7 @@ var SimpleXyoSigner = class _SimpleXyoSigner extends AbstractCreatableProvider {
     return { ...await super.paramsHandler(params), account };
   }
   address() {
-    return asAddress5(this.params.account.address, true);
+    return this.params.account.address;
   }
   /** @deprecated - use signTransaction instead */
   async createSignedTransaction(chain, elevatedPayloads, additionalPayloads, nbf, exp, fees, from) {
@@ -6059,8 +6036,8 @@ SimpleStakeEventsViewer = __decorateClass([
 ], SimpleStakeEventsViewer);
 
 // src/simple/StakeTotalsViewer/SimpleStakeTotalsViewer.ts
-import { asAddress as asAddress6 } from "@xylabs/sdk-js";
-import { assertEx as assertEx41 } from "@xylabs/sdk-js";
+import { assertEx as assertEx42 } from "@xylabs/sdk-js";
+import { asXyoAddress as asXyoAddress3 } from "@xyo-network/address";
 import {
   StakeTotalsViewerMoniker,
   StakeViewerMoniker
@@ -6085,7 +6062,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.stakeViewer.activeStakes();
     for (const position of positions) {
-      if ((position.removeBlock === 0 || position.removeBlock > time) && asAddress6(position.staked) === asAddress6(staked)) {
+      if ((position.removeBlock === 0 || position.removeBlock > time) && asXyoAddress3(position.staked) === asXyoAddress3(staked)) {
         active += position.amount;
       }
     }
@@ -6095,7 +6072,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.stakeViewer.activeStakes();
     for (const position of positions) {
-      if ((position.removeBlock === 0 || position.removeBlock > time) && asAddress6(position.staker) === asAddress6(staker)) {
+      if ((position.removeBlock === 0 || position.removeBlock > time) && asXyoAddress3(position.staker) === asXyoAddress3(staker)) {
         active += position.amount;
       }
     }
@@ -6103,7 +6080,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._stakeViewer = assertEx41(
+    this._stakeViewer = assertEx42(
       await this.locateAndCreate(StakeViewerMoniker),
       () => "Failed to create StakeViewer"
     );
@@ -6122,7 +6099,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let pending = 0n;
     const positions = await this.stakeViewer.removedStakes();
     for (const position of positions) {
-      if (position.removeBlock !== 0 && position.removeBlock <= time && (position.withdrawBlock === 0 || position.withdrawBlock > time) && asAddress6(position.staker) === asAddress6(staker)) {
+      if (position.removeBlock !== 0 && position.removeBlock <= time && (position.withdrawBlock === 0 || position.withdrawBlock > time) && asXyoAddress3(position.staker) === asXyoAddress3(staker)) {
         pending += position.amount;
       }
     }
@@ -6142,7 +6119,7 @@ var SimpleStakeTotalsViewer = class extends AbstractCreatableProvider {
     let withdrawn = 0n;
     const positions = await this.stakeViewer.withdrawnStakes();
     for (const position of positions) {
-      if (position.withdrawBlock !== 0 && position.withdrawBlock <= time && asAddress6(position.staker) === asAddress6(staker)) {
+      if (position.withdrawBlock !== 0 && position.withdrawBlock <= time && asXyoAddress3(position.staker) === asXyoAddress3(staker)) {
         withdrawn += position.amount;
       }
     }
@@ -6157,17 +6134,14 @@ SimpleStakeTotalsViewer = __decorateClass([
 ], SimpleStakeTotalsViewer);
 
 // src/simple/StakeViewer/SimpleStakeViewer.ts
-import {
-  asAddress as asAddress7,
-  assertEx as assertEx42,
-  toAddress as toAddress6
-} from "@xylabs/sdk-js";
+import { assertEx as assertEx43, toAddress } from "@xylabs/sdk-js";
+import { asXyoAddress as asXyoAddress4 } from "@xyo-network/address";
 import { StakeEventsViewerMoniker as StakeEventsViewerMoniker2, StakeViewerMoniker as StakeViewerMoniker2 } from "@xyo-network/xl1-protocol-lib";
 var SimpleStakeViewer = class extends AbstractCreatableProvider {
   moniker = SimpleStakeViewer.defaultMoniker;
   _chainStakeEventsViewer;
   get stakeEvents() {
-    return assertEx42(this._chainStakeEventsViewer, () => "Stake events viewer not set");
+    return assertEx43(this._chainStakeEventsViewer, () => "Stake events viewer not set");
   }
   get positions() {
     return this.params.positions;
@@ -6186,7 +6160,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.activeStakes();
     for (const position of positions) {
-      if (position.removeBlock === 0 && asAddress7(position.staked) === asAddress7(staked)) {
+      if (position.removeBlock === 0 && asXyoAddress4(position.staked) === asXyoAddress4(staked)) {
         active += position.amount;
       }
     }
@@ -6196,7 +6170,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let active = 0n;
     const positions = await this.activeStakes();
     for (const position of positions) {
-      if (position.removeBlock === 0 && asAddress7(position.staker) === asAddress7(staker)) {
+      if (position.removeBlock === 0 && asXyoAddress4(position.staker) === asXyoAddress4(staker)) {
         active += position.amount;
       }
     }
@@ -6207,7 +6181,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._chainStakeEventsViewer = assertEx42(
+    this._chainStakeEventsViewer = assertEx43(
       await this.locateAndCreate(StakeEventsViewerMoniker2),
       () => "Failed to create StakeEventsViewer"
     );
@@ -6229,7 +6203,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let pending = 0n;
     const positions = await this.removedStakes();
     for (const position of positions) {
-      if (position.removeBlock !== 0 && position.withdrawBlock === 0 && asAddress7(position.staker) === asAddress7(staker)) {
+      if (position.removeBlock !== 0 && position.withdrawBlock === 0 && asXyoAddress4(position.staker) === asXyoAddress4(staker)) {
         pending += position.amount;
       }
     }
@@ -6239,24 +6213,24 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     return this.positions.filter((s) => s.withdrawBlock === 0 && s.removeBlock !== 0);
   }
   rewardsContract() {
-    return toAddress6(toAddress6(1n));
+    return toAddress(toAddress(1n));
   }
   stakeById(id) {
-    return assertEx42(this.positions[id], () => new Error(`Stake with id ${id} not found`));
+    return assertEx43(this.positions[id], () => new Error(`Stake with id ${id} not found`));
   }
   stakeByStaker(staker, slot) {
-    return this.positions.filter((s) => asAddress7(s.staker) === asAddress7(staker))[slot];
+    return this.positions.filter((s) => asXyoAddress4(s.staker) === asXyoAddress4(staker))[slot];
   }
   stakesByStaked(staked, range = [0, void 0]) {
     const endBlock = range[1] ?? Number.MAX_SAFE_INTEGER;
-    return this.positions.filter((s) => asAddress7(s.staked) === asAddress7(staked) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
+    return this.positions.filter((s) => asXyoAddress4(s.staked) === asXyoAddress4(staked) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
   }
   stakesByStaker(staker, range = [0, void 0]) {
     const endBlock = range[1] ?? Number.MAX_SAFE_INTEGER;
-    return this.positions.filter((s) => asAddress7(s.staker) === asAddress7(staker) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
+    return this.positions.filter((s) => asXyoAddress4(s.staker) === asXyoAddress4(staker) && s.addBlock <= endBlock && s.removeBlock <= endBlock);
   }
   stakingTokenAddress() {
-    return toAddress6("0x000000000000000000000000000011");
+    return toAddress("0x000000000000000000000000000011");
   }
   async withdrawn() {
     let withdrawn = 0n;
@@ -6272,7 +6246,7 @@ var SimpleStakeViewer = class extends AbstractCreatableProvider {
     let withdrawn = 0n;
     const positions = await this.withdrawnStakes();
     for (const position of positions) {
-      if (position.withdrawBlock !== 0 && asAddress7(position.staker) === asAddress7(staker)) {
+      if (position.withdrawBlock !== 0 && asXyoAddress4(position.staker) === asXyoAddress4(staker)) {
         withdrawn += position.amount;
       }
     }
@@ -6344,7 +6318,7 @@ RestSyncViewer = __decorateClass([
 // src/simple/timeSync2/SimpleTimeSyncViewer.ts
 import {
   asHash as asHash5,
-  assertEx as assertEx43,
+  assertEx as assertEx44,
   isDefined as isDefined21
 } from "@xylabs/sdk-js";
 import {
@@ -6366,7 +6340,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
   async convertTime(fromDomain, toDomain, from) {
     switch (fromDomain) {
       case "xl1": {
-        const [block, payloads] = assertEx43(await this.blockViewer.blockByNumber(asXL1BlockNumber10(from, true)), () => "Block not found");
+        const [block, payloads] = assertEx44(await this.blockViewer.blockByNumber(asXL1BlockNumber10(from, true)), () => "Block not found");
         const timeSchemaIndex = block.payload_schemas.indexOf(TimeSchema);
         const hash = timeSchemaIndex === -1 ? void 0 : block.payload_hashes[timeSchemaIndex];
         const timePayload = asTimePayload2(isDefined21(hash) ? payloads.find((p) => p._hash === hash) : void 0);
@@ -6421,10 +6395,10 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
         return [Date.now(), null];
       }
       case "ethereum": {
-        const provider = assertEx43(this.ethProvider, () => "Ethereum provider not configured");
+        const provider = assertEx44(this.ethProvider, () => "Ethereum provider not configured");
         const blockNumber = await provider.getBlockNumber() ?? 0;
         const block = await provider.getBlock(blockNumber);
-        const blockHash = asHash5(assertEx43(block?.hash, () => "Block hash not found"), true);
+        const blockHash = asHash5(assertEx44(block?.hash, () => "Block hash not found"), true);
         return [blockNumber, blockHash];
       }
       default: {
@@ -6439,7 +6413,7 @@ var SimpleTimeSyncViewer = class extends AbstractCreatableProvider {
       // this is for the previous block
       xl1,
       // this is for the previous block
-      xl1Hash: assertEx43(xl1Hash, () => "No xl1 hash available from time sync service"),
+      xl1Hash: assertEx44(xl1Hash, () => "No xl1 hash available from time sync service"),
       epoch: Date.now()
     };
     if (isDefined21(this.ethProvider)) {
@@ -6459,7 +6433,7 @@ SimpleTimeSyncViewer = __decorateClass([
 ], SimpleTimeSyncViewer);
 
 // src/simple/transactionValidation/SimpleTransactionValidationViewer.ts
-import { assertEx as assertEx44 } from "@xylabs/sdk-js";
+import { assertEx as assertEx45 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder24 } from "@xyo-network/sdk-js";
 import {
   AccountBalanceViewerMoniker as AccountBalanceViewerMoniker3,
@@ -6510,7 +6484,7 @@ var SimpleTransactionValidationViewer = class extends AbstractCreatableProvider
       head: void 0
     };
     const transactionsWithMeta = await Promise.all(transactions.map((b) => Promise.all([PayloadBuilder24.addHashMeta(b[0]), PayloadBuilder24.addHashMeta(b[1])])));
-    const head = isChainQualifiedHeadConfig6(config) ? assertEx44(
+    const head = isChainQualifiedHeadConfig6(config) ? assertEx45(
       (await this.blockViewer.blockByHash(config.head))?.[0],
       () => `Specified a head that is not in the chain [${config.head}]`
     ) : void 0;
@@ -6576,7 +6550,7 @@ SimpleTransactionValidationViewer = __decorateClass([
 ], SimpleTransactionValidationViewer);
 
 // src/simple/TransactionViewer/SimpleTransactionViewer.ts
-import { assertEx as assertEx45, exists as exists10 } from "@xylabs/sdk-js";
+import { assertEx as assertEx46, exists as exists10 } from "@xylabs/sdk-js";
 import { BoundWitnessSchema } from "@xyo-network/sdk-js";
 import {
   asSignedHydratedTransactionWithHashMeta,
@@ -6593,7 +6567,7 @@ var SimpleTransactionViewer = class extends AbstractCreatableProvider {
   }
   async byBlockHashAndIndex(blockHash, transactionIndex) {
     return await this.spanAsync("byBlockHashAndIndex", async () => {
-      assertEx45(transactionIndex >= 0, () => "transactionIndex must be greater than or equal to 0");
+      assertEx46(transactionIndex >= 0, () => "transactionIndex must be greater than or equal to 0");
       try {
         const block = await this.blockViewer.blockByHash(blockHash);
         if (!block) return null;
@@ -6657,7 +6631,7 @@ SimpleTransactionViewer = __decorateClass([
 
 // src/simple/windowedBlock/SimpleWindowedBlockViewer.ts
 import {
-  assertEx as assertEx46,
+  assertEx as assertEx47,
   exists as exists11,
   isNull as isNull2
 } from "@xylabs/sdk-js";
@@ -6728,7 +6702,7 @@ var SimpleWindowedBlockViewer = class extends AbstractCreatableProvider {
   }
   async createHandler() {
     await super.createHandler();
-    this._blockViewer = assertEx46(
+    this._blockViewer = assertEx47(
       this.params.blockViewer ?? await this.locator.getInstance(BlockViewerMoniker7),
       () => "BlockViewer instance is required"
     );
@@ -6737,13 +6711,13 @@ var SimpleWindowedBlockViewer = class extends AbstractCreatableProvider {
     this._transactionHashMap = new MemoryMap();
   }
   currentBlock() {
-    return assertEx46(this._chain.at(-1));
+    return assertEx47(this._chain.at(-1));
   }
   currentBlockHash() {
-    return assertEx46(this._chain.at(-1)?.[0]._hash);
+    return assertEx47(this._chain.at(-1)?.[0]._hash);
   }
   currentBlockNumber() {
-    return assertEx46(this._chain.at(-1)?.[0].block);
+    return assertEx47(this._chain.at(-1)?.[0].block);
   }
   async payloadByHash(hash) {
     const payloads = await this.payloadsByHash([hash]);
@@ -6902,13 +6876,13 @@ var RuntimeStatusMonitor = class extends LoggerStatusReporter {
 };
 
 // src/time/primitives/xl1BlockNumberToEthBlockNumber.ts
-import { assertEx as assertEx47 } from "@xylabs/sdk-js";
+import { assertEx as assertEx48 } from "@xylabs/sdk-js";
 import { asTimePayload as asTimePayload3, TimeSchema as TimeSchema2 } from "@xyo-network/xl1-protocol-lib";
 async function xl1BlockNumberToEthBlockNumber(context, xl1BlockNumber) {
   const blockHash = await hashFromBlockNumber(context, xl1BlockNumber);
   const hydratedBlock = await hydrateBlock(context, blockHash);
   const timePayload = asTimePayload3(hydratedBlock[1].find((p) => p.schema === TimeSchema2), { required: true });
-  return assertEx47(timePayload.ethereum, () => "No ethereum timestamp found on block");
+  return assertEx48(timePayload.ethereum, () => "No ethereum timestamp found on block");
 }
 
 // src/validation/lib/isLocalhost.ts