@xyo-network/xl1-protocol-sdk 1.16.23 → 1.16.25

package/src/primitives/transaction/elevatedPayloads.ts

@@ -1,12 +1,12 @@
-import type { WithStorageMeta } from '@xyo-network/payload-model'
-import type { AllowedBlockPayload, SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import type { WithHashMeta } from '@xyo-network/payload-model'
+import type { AllowedBlockPayload, HydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
 import { isAllowedBlockPayload } from '@xyo-network/xl1-protocol'
 
 const ELEVATE_OPCODE = 'elevate'
 
-export function elevatedPayloads([tx, payloads]: SignedHydratedTransactionWithStorageMeta) {
+export function elevatedPayloads([tx, payloads]: HydratedTransactionWithHashMeta) {
   const opCodes = (tx.script ?? []).filter(operation => operation.startsWith(`${ELEVATE_OPCODE}|`))
-  const elevatedPayloads: WithStorageMeta<AllowedBlockPayload>[] = []
+  const elevatedPayloads: WithHashMeta<AllowedBlockPayload>[] = []
   for (const opCode of opCodes) {
     const [code, hash] = opCode.split('|')
     if (code === ELEVATE_OPCODE) {

package/src/provider/TransactionSubmitter.ts

@@ -4,15 +4,16 @@ import type {
 import type { Payload } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload, SignedHydratedTransaction, TransactionFeesBigInt,
+  XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 
 /** @deprecated use TransactionOptions instead */
 export interface TransactionSubmitterOptions {
   chain?: Hex
-  exp?: number
+  exp?: XL1BlockNumber
   fees?: TransactionFeesBigInt
   from?: Address
-  nbf?: number
+  nbf?: XL1BlockNumber
 }
 
 /** @deprecated use XyoGatewayHelpers instead */

package/src/provider/XyoGatewayRunner.ts

@@ -5,6 +5,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload, AttoXL1, SignedHydratedTransaction, SignedHydratedTransactionWithHashMeta, TransactionFeesBigInt,
   UnsignedHydratedTransaction,
+  XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 
 import type { ConfirmSubmittedTransactionOptions } from '../transaction/index.ts'
@@ -13,10 +14,10 @@ import type { XyoGateway } from './XyoGateway.ts'
 
 export interface TransactionOptions {
   chain?: Hex
-  exp?: number
+  exp?: XL1BlockNumber
   fees?: TransactionFeesBigInt
   from?: Address
-  nbf?: number
+  nbf?: XL1BlockNumber
 }
 
 export interface XyoGatewayRunnerMethods {

package/src/provider/signer/XyoSigner.ts

@@ -1,8 +1,9 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
-import type { Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model'
+import type { Signed } from '@xyo-network/boundwitness-model'
 import type { Payload } from '@xyo-network/payload-model'
 import type {
-  AllowedBlockPayload, ChainId, SignedHydratedTransactionWithHashMeta, TransactionBoundWitness,
+  AllowedBlockPayload, ChainId,
+  SignedHydratedTransactionWithHashMeta, TransactionBoundWitness,
   TransactionFeesBigInt,
 } from '@xyo-network/xl1-protocol'
 
@@ -11,7 +12,7 @@ export interface XyoSigner {
   // The tx passed in must have all the payloads (on and off chain) in the payloads array
   // Returns the signed transaction and the payloads array excluding the off-chain payloads.
   // The return value is ready to be broadcast to block producers
-  signTransaction(tx: [UnsignedBoundWitness<TransactionBoundWitness>, Payload[]]): Promisable<SignedHydratedTransactionWithHashMeta>
+  signTransaction(tx: [TransactionBoundWitness, Payload[]]): Promisable<SignedHydratedTransactionWithHashMeta>
 }
 
 export interface XyoSignerDeprecated {

package/src/provider/viewer/XyoViewer.ts

@@ -1,4 +1,5 @@
 import type {
+  AccountBalanceViewer,
   AccountBalanceViewerMethods,
   BlockViewierMethods,
   ChainViewerMethods,
@@ -12,11 +13,14 @@ import type { NetworkStakeViewer } from './NetworkStake/index.ts'
 import type { StepViewer } from './StepViewer.ts'
 
 export interface XyoViewerMethods extends AccountBalanceViewerMethods, TransferBalanceViewerMethods,
-  NetworkStakeStepRewardViewer,
+  NetworkStakeStepRewardViewer, AccountBalanceViewer,
   ChainViewerMethods, BlockViewierMethods, TransactionViewerMethods, StakeViewerMethods, ForkViewerMethods {
 }
 
 export interface XyoViewer extends XyoViewerMethods {
+  account?: {
+    balance?: AccountBalanceViewer
+  }
   networkStake?: NetworkStakeViewer
   step?: StepViewer
 }

package/src/services/BlockProducerService.ts

@@ -1,8 +1,8 @@
 import type {
   Addressable,
-  BlockBoundWitness, HydratedBlock, IterableRepository,
+  BlockBoundWitness, HydratedBlockWithHashMeta, IterableRepository,
 } from '@xyo-network/xl1-protocol'
 
-export type NextBlockProducer = IterableRepository<BlockBoundWitness, HydratedBlock | undefined>
+export type NextBlockProducer = IterableRepository<BlockBoundWitness, HydratedBlockWithHashMeta | undefined>
 
 export interface BlockProducerService extends Addressable, NextBlockProducer {}

package/src/simple/accountBalance/SimpleAccountBalanceViewer.ts

@@ -1,12 +1,14 @@
-import type { Address, Hash } from '@xylabs/sdk-js'
+import type {
+  Address, CreatableParams, Hash,
+} from '@xylabs/sdk-js'
 import {
+  AbstractCreatable,
   assertEx, exists, isDefined,
 } from '@xylabs/sdk-js'
 import { spanRootAsync } from '@xylabs/telemetry'
-import type { Signed } from '@xyo-network/boundwitness-model'
-import type { WithStorageMeta } from '@xyo-network/payload-model'
+import type { WithHashMeta, WithStorageMeta } from '@xyo-network/payload-model'
 import type {
-  BlockBoundWitness, Transfer, XL1BlockNumber, XL1BlockRange,
+  SignedBlockBoundWitnessWithHashMeta, Transfer, XL1BlockNumber, XL1BlockRange,
 } from '@xyo-network/xl1-protocol'
 import {
   asRange, asXL1BlockNumber, asXL1BlockRange, AttoXL1,
@@ -22,15 +24,31 @@ import type {
   AccountBalanceHistoryItem, AccountBalanceViewer, BlockViewer,
 } from '../../viewers/index.ts'
 
-export class SimpleAccountBalanceViewer implements AccountBalanceViewer {
-  protected readonly blockViewer: BlockViewer
-  protected readonly context: BalanceStepSummaryContext
-  protected readonly transferContext: TransfersStepSummaryContext
+export interface SimpleAccountBalanceViewerParams extends CreatableParams {
+  blockViewer: BlockViewer
+  context: BalanceStepSummaryContext
+  transferContext: TransfersStepSummaryContext
+}
+
+export class SimpleAccountBalanceViewer extends AbstractCreatable<SimpleAccountBalanceViewerParams> implements AccountBalanceViewer {
+  get blockViewer(): BlockViewer {
+    return this.params.blockViewer!
+  }
+
+  get context(): BalanceStepSummaryContext {
+    return this.params.context!
+  }
+
+  get transferContext(): TransfersStepSummaryContext {
+    return this.params.transferContext!
+  }
+
+  static override async paramsHandler(params: Partial<SimpleAccountBalanceViewerParams>) {
+    assertEx(params.blockViewer, () => 'blockViewer is required')
+    assertEx(params.context, () => 'context is required')
+    assertEx(params.transferContext, () => 'transferContext is required')
 
-  constructor(context: BalanceStepSummaryContext, transferContext: TransfersStepSummaryContext, blockViewer: BlockViewer) {
-    this.context = context
-    this.transferContext = transferContext
-    this.blockViewer = blockViewer
+    return { ...await super.paramsHandler(params) }
   }
 
   async accountBalance(address: Address, headOrRange?: XL1BlockRange | Hash): Promise<AttoXL1> {
@@ -56,7 +74,7 @@ export class SimpleAccountBalanceViewer implements AccountBalanceViewer {
       if (transfers.length === 0) {
         continue
       }
-      const pairs: [WithStorageMeta<Signed<BlockBoundWitness>>, WithStorageMeta<Transfer>][] = (transfers.map((transfer) => {
+      const pairs: [SignedBlockBoundWitnessWithHashMeta, WithHashMeta<Transfer>][] = (transfers.map((transfer) => {
         return [block[0], transfer]
       }))
       result.push(...pairs.map(([block, transfer]) => [block,

package/src/simple/gateway/SimpleXyoGatewayRunner.ts

@@ -6,12 +6,15 @@ import {
 } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
+import type {
+  AllowedBlockPayload,
+  AttoXL1,
+  SignedHydratedTransaction, SignedHydratedTransactionWithHashMeta,
+  Transfer,
+  UnsignedHydratedTransaction,
+} from '@xyo-network/xl1-protocol'
 import {
-  type AllowedBlockPayload,
-  type AttoXL1,
-  type SignedHydratedTransaction,
-  type SignedHydratedTransactionWithHashMeta,
-  type Transfer,
+  asXL1BlockNumber,
   TransferSchema,
 } from '@xyo-network/xl1-protocol'
 
@@ -65,8 +68,8 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
       nbf, exp, chain, fees,
     } = options ?? {}
     const resolvedChainId = isDefined(chain) ? chain : await viewer.chainId()
-    const resolvedNbf = isDefined(nbf) ? nbf : await viewer?.currentBlockNumber()
-    const resolvedExp = isDefined(exp) ? exp : resolvedNbf + 10
+    const resolvedNbf = asXL1BlockNumber(isDefined(nbf) ? nbf : await viewer.currentBlockNumber(), true)
+    const resolvedExp = asXL1BlockNumber(isDefined(exp) ? exp : resolvedNbf + 10, true)
 
     // Build, sign, and broadcast the transaction
     // eslint-disable-next-line sonarjs/deprecation
@@ -74,7 +77,7 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
     return await this.addTransactionToChain(tx)
   }
 
-  async addTransactionToChain(tx: SignedHydratedTransaction): Promise<[Hash, SignedHydratedTransactionWithHashMeta]> {
+  async addTransactionToChain(tx: UnsignedHydratedTransaction): Promise<[Hash, SignedHydratedTransactionWithHashMeta]> {
     const connection = this.connectionInstance
 
     const signer = this.signerInstance

package/src/simple/mempool/SimpleMempoolViewer.ts

@@ -0,0 +1,37 @@
+import {
+  exists, isDefined, isHash,
+} from '@xylabs/sdk-js'
+import type { ArchivistInstance } from '@xyo-network/archivist-model'
+import {
+  isHashMeta, isPayloadBundle, type Sequence,
+} from '@xyo-network/payload-model'
+import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
+
+import { bundledPayloadToHydratedTransaction } from '../../model/index.ts'
+import type {
+  MempoolViewer,
+  PendingTransactionsOptions,
+} from '../../viewers/index.ts'
+
+export class SimpleMempoolViewer implements MempoolViewer {
+  protected readonly archivist: ArchivistInstance
+
+  constructor(archivist: ArchivistInstance) {
+    this.archivist = archivist
+  }
+
+  async pendingTransactions({ cursor: providedCursor }: PendingTransactionsOptions = {}): Promise<SignedHydratedTransactionWithHashMeta[]> {
+    let cursor: Sequence | undefined = undefined
+    if (isHash(providedCursor)) {
+      const [p] = await this.archivist.get([providedCursor])
+      if (isDefined(p)) {
+        cursor = p._sequence
+      }
+    }
+    const bundles = await this.archivist.next({
+      order: 'asc', limit: 100, cursor,
+    })
+    const filteredBundles = bundles.filter(isPayloadBundle).filter(isHashMeta)
+    return (await Promise.all(filteredBundles.map(async bundle => await bundledPayloadToHydratedTransaction(bundle)))).filter(exists)
+  }
+}

package/src/simple/mempool/index.ts

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

package/src/simple/signer/SimpleXyoSigner.ts

@@ -1,11 +1,14 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
-import type { Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { type Payload } from '@xyo-network/payload-model'
 import type {
-  AllowedBlockPayload, ChainId, SignedHydratedTransactionWithHashMeta, TransactionBoundWitness, TransactionFeesBigInt,
+  AllowedBlockPayload, ChainId, SignedHydratedTransactionWithHashMeta,
+  SignedTransactionBoundWitness, TransactionFeesBigInt,
+  UnsignedTransactionBoundWitness,
+  XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
+import { SignedHydratedTransactionWithHashMetaZod } from '@xyo-network/xl1-protocol'
 
 import type { XyoSigner } from '../../provider/index.ts'
 import { buildTransaction, signTransaction } from '../../transaction/index.ts'
@@ -25,11 +28,11 @@ export class SimpleXyoSigner implements XyoSigner {
     chain: ChainId,
     elevatedPayloads: AllowedBlockPayload[],
     additionalPayloads: Payload[],
-    nbf: number,
-    exp: number,
+    nbf: XL1BlockNumber,
+    exp: XL1BlockNumber,
     fees: TransactionFeesBigInt,
     from?: Address,
-  ): Promise<Signed<TransactionBoundWitness>> {
+  ): Promise<SignedTransactionBoundWitness> {
     const fromAddress = from ?? this._account.address
     const transaction = await buildTransaction(
       chain,
@@ -44,8 +47,8 @@ export class SimpleXyoSigner implements XyoSigner {
     return transaction[0]
   }
 
-  async signTransaction(tx: [UnsignedBoundWitness<TransactionBoundWitness>, Payload[]]): Promise<SignedHydratedTransactionWithHashMeta> {
+  async signTransaction(tx: [UnsignedTransactionBoundWitness, Payload[]]): Promise<SignedHydratedTransactionWithHashMeta> {
     const txBW = await signTransaction(tx[0], this._account)
-    return [await PayloadBuilder.addStorageMeta(txBW), await PayloadBuilder.addStorageMeta(tx[1])]
+    return SignedHydratedTransactionWithHashMetaZod.parse([await PayloadBuilder.addStorageMeta(txBW), await PayloadBuilder.addStorageMeta(tx[1])])
   }
 }

package/src/transaction/buildTransaction.ts

@@ -9,7 +9,9 @@ import type {
   ChainId,
   ExecutableFields,
   FromFields,
-  SignedHydratedTransactionWithStorageMeta, TransactionBoundWitness, TransactionBoundWitnessFields, TransactionFeesBigInt,
+  SignedHydratedTransactionWithHashMeta,
+  TransactionBoundWitness, TransactionBoundWitnessFields, TransactionFeesBigInt,
+  XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 import { defaultTransactionFees } from '@xyo-network/xl1-protocol'
 
@@ -18,16 +20,16 @@ export async function buildTransaction(
   onChainPayloads: AllowedBlockPayload[],
   offChainPayloads: Payload[],
   signer: AccountInstance | AccountInstance[],
-  nbf: number,
-  exp: number,
+  nbf: XL1BlockNumber,
+  exp: XL1BlockNumber,
   from?: Address,
   fees: TransactionFeesBigInt = defaultTransactionFees,
-): Promise<SignedHydratedTransactionWithStorageMeta> {
+): Promise<SignedHydratedTransactionWithHashMeta> {
   if (from === undefined && Array.isArray(signer)) {
     throw new Error('from is required when signer is an array')
   }
 
-  const txBoundWitnessFields: TransactionBoundWitnessFields = {
+  const txBoundWitnessFields: Omit<TransactionBoundWitnessFields, 'from'> = {
     chain,
     fees: {
       base: toHex(fees.base),
@@ -61,5 +63,5 @@ export async function buildTransaction(
     .signers(Array.isArray(signer) ? signer : [signer])
     .build()
 
-  return [await PayloadBuilder.addStorageMeta(tx), await PayloadBuilder.addStorageMeta(txPayloads)]
+  return [await PayloadBuilder.addHashMeta(tx), await PayloadBuilder.addHashMeta(txPayloads)]
 }

package/src/transaction/buildUnsignedTransaction.ts

@@ -6,6 +6,7 @@ import type { Payload } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload, ChainId, ExecutableFields, FromFields, TransactionBoundWitness, TransactionBoundWitnessFields, TransactionFeesBigInt,
   UnsignedHydratedTransaction,
+  XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 import { defaultTransactionFees } from '@xyo-network/xl1-protocol'
 
@@ -13,12 +14,12 @@ export async function buildUnsignedTransaction(
   chain: ChainId,
   onChainPayloads: AllowedBlockPayload[],
   offChainPayloads: Payload[],
-  nbf: number,
-  exp: number,
+  nbf: XL1BlockNumber,
+  exp: XL1BlockNumber,
   from: Address,
   fees: TransactionFeesBigInt = defaultTransactionFees,
 ): Promise<UnsignedHydratedTransaction> {
-  const txBoundWitnessFields: TransactionBoundWitnessFields = {
+  const txBoundWitnessFields: Omit<TransactionBoundWitnessFields, 'from'> = {
     chain,
     fees: {
       base: toHex(fees.base),
@@ -49,7 +50,7 @@ export async function buildUnsignedTransaction(
     .fields(fields)
     .meta({ $signatures: [] })
     .payloads([...onChainPayloads, ...offChainPayloads])
-    .build()
+    .build(false)
 
   return [tx, txPayloads]
 }

package/src/transaction/hydrateTransaction.ts

@@ -3,8 +3,8 @@ import { assertEx } from '@xylabs/sdk-js'
 import { hydrateTypedBoundWitness, tryHydrateTypedBoundWitness } from '@xyo-network/archivist-model'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import type {
-  AllowedBlockPayload,
-  SignedHydratedTransaction, SignedHydratedTransactionWithStorageMeta, TransactionBoundWitness,
+  AllowedBlockPayload, SignedHydratedTransaction,
+  SignedHydratedTransactionWithStorageMeta, TransactionBoundWitness,
 } from '@xyo-network/xl1-protocol'
 import { isAllowedBlockPayload, isSignedTransactionBoundWitnessWithStorageMeta } from '@xyo-network/xl1-protocol'
 

package/src/transaction/primitives/transactionBlockByteCount.ts

@@ -1,8 +1,8 @@
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+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]: SignedHydratedTransaction): number {
+export function transactionBlockByteCount([transaction, payloads]: HydratedTransaction): number {
   const cleanTransaction = PayloadBuilder.omitStorageMeta(transaction)
   const transactionBytes = JSON.stringify(cleanTransaction).length
   const cleanPayloads = PayloadBuilder.omitStorageMeta(payloads)

package/src/transaction/primitives/transactionElevatedPayloads.ts

@@ -1,6 +1,6 @@
 import { asHash, type Hash } from '@xylabs/sdk-js'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
-import type { SignedHydratedTransactionWithStorageMeta, TransactionBoundWitness } from '@xyo-network/xl1-protocol'
+import type { HydratedTransactionWithHashMeta, TransactionBoundWitness } from '@xyo-network/xl1-protocol'
 
 import { crackOperations } from './transactionOperations.ts'
 
@@ -9,7 +9,7 @@ export function transactionElevatedPayloadHashes(transaction: TransactionBoundWi
   return elevateOperations.map(op => asHash(op[1][0], true))
 }
 
-export function transactionElevatedPayloads([transaction, payloads]: SignedHydratedTransactionWithStorageMeta): WithHashMeta<Payload>[] {
+export function transactionElevatedPayloads([transaction, payloads]: HydratedTransactionWithHashMeta): WithHashMeta<Payload>[] {
   const hashes = transactionElevatedPayloadHashes(transaction)
   const elevatedPayloads = payloads.filter(payload => hashes.includes(payload._hash))
   return elevatedPayloads

package/src/transaction/primitives/transactionRequiredGas.ts

@@ -1,16 +1,16 @@
-import type { SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import type { HydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
 import { AttoXL1, TransactionGasCosts } from '@xyo-network/xl1-protocol'
 
 import { transactionBlockByteCount } from './transactionBlockByteCount.ts'
 import { transactionElevatedPayloads } from './transactionElevatedPayloads.ts'
 
 /** The required gas for the byte storage on the block chain for a transaction */
-export function transactionBytesRequiredGas([transaction, payloads]: SignedHydratedTransactionWithStorageMeta): AttoXL1 {
+export function transactionBytesRequiredGas([transaction, payloads]: HydratedTransactionWithHashMeta): AttoXL1 {
   const transactionBlockBytes = transactionBlockByteCount([transaction, payloads])
   return AttoXL1(TransactionGasCosts.characterStorage * BigInt(transactionBlockBytes))
 }
 
-export function transactionRequiredGas(hydratedTransaction: SignedHydratedTransactionWithStorageMeta): AttoXL1 {
+export function transactionRequiredGas(hydratedTransaction: HydratedTransactionWithHashMeta): AttoXL1 {
   const elevatedPayloads = transactionElevatedPayloads(hydratedTransaction)
   const hashes = elevatedPayloads.length + 1 /* for transaction itself */
   const signatures = hydratedTransaction[0].addresses.length

package/src/transaction/script.ts

@@ -1,7 +1,7 @@
 import { asHash, type Hash } from '@xylabs/sdk-js'
 import { assertEx, filterAs } from '@xylabs/sdk-js'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
-import type { AllowedBlockPayload, HydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import type { AllowedBlockPayload, HydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
 import { isAllowedBlockPayloadWithHashMeta } from '@xyo-network/xl1-protocol'
 
 export const tryExtractElevatedHashesFromScript = (strings: string[]): Hash[] => {
@@ -20,7 +20,7 @@ export const extractElevatedHashesFromScript = (strings: string[]): Hash[] => {
   return filtered
 }
 
-export const tryExtractElevatedHashes = (tx: HydratedTransactionWithStorageMeta): WithStorageMeta<AllowedBlockPayload>[] => {
+export const tryExtractElevatedHashes = (tx: HydratedTransactionWithHashMeta): WithStorageMeta<AllowedBlockPayload>[] => {
   const [bw, payloads] = tx
   const { script } = bw
   const hashes = script ? tryExtractElevatedHashesFromScript(script) : []
@@ -29,7 +29,7 @@ export const tryExtractElevatedHashes = (tx: HydratedTransactionWithStorageMeta)
     .filter(isAllowedBlockPayloadWithHashMeta)
 }
 
-export const extractElevatedHashes = (tx: HydratedTransactionWithStorageMeta): WithStorageMeta<AllowedBlockPayload>[] => {
+export const extractElevatedHashes = (tx: HydratedTransactionWithHashMeta): WithStorageMeta<AllowedBlockPayload>[] => {
   const [bw, payloads] = tx
   const { script } = bw
   const hashes = script ? tryExtractElevatedHashesFromScript(script) : []

package/src/transaction/signTransaction.ts

@@ -2,9 +2,9 @@ import {
   assertEx, hexFromArrayBuffer, toArrayBuffer,
 } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
-import type { Unsigned } from '@xyo-network/boundwitness-model'
+import type { Signed } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { TransactionBoundWitness } from '@xyo-network/xl1-protocol'
+import type { TransactionBoundWitness, UnsignedTransactionBoundWitness } from '@xyo-network/xl1-protocol'
 
 /**
  * Signs an unsigned transaction with the provided account.
@@ -12,19 +12,22 @@ import type { TransactionBoundWitness } from '@xyo-network/xl1-protocol'
  * @param account The account to sign the transaction with
  * @returns The signed transaction
  */
-export async function signTransaction(tx: Unsigned<TransactionBoundWitness>, account: AccountInstance) {
+export async function signTransaction(tx: UnsignedTransactionBoundWitness, account: AccountInstance) {
   assertEx(tx.from === account.address, () => 'Signer address does not match transaction from address')
   // Clone tx to prevent modifying original
-  const signedTx = structuredClone(tx)
+  const unsignedTx = structuredClone(tx)
   // Update dynamic fields based on account
-  signedTx.addresses = [account.address]
-  signedTx.previous_hashes = [account.previousHash ?? null]
+  unsignedTx.addresses = [account.address]
+  unsignedTx.previous_hashes = [account.previousHash ?? null]
   // Calculate tx hash and sign it
-  const hash = await PayloadBuilder.dataHash(signedTx)
+  const hash = await PayloadBuilder.dataHash(unsignedTx)
   const hashBytes = toArrayBuffer(hash)
   const [signature] = await account.sign(hashBytes)
   // Append the signatures to the transaction
-  signedTx.$signatures = [hexFromArrayBuffer(signature)]
+  const result: Signed<TransactionBoundWitness> = {
+    ...unsignedTx,
+    $signatures: [hexFromArrayBuffer(signature)],
+  }
   // Return the signed transaction
-  return signedTx
+  return result
 }

package/src/validation/block/HydratedBlockStateValidationFunction.ts

@@ -1,5 +1,5 @@
 import type { Promisable } from '@xylabs/sdk-js'
-import type { ChainId, HydratedBlock } from '@xyo-network/xl1-protocol'
+import type { ChainId, HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 
 import type { AccountBalanceViewer } from '../../viewers/index.ts'
 import type { HydratedBlockStateValidationError } from './error.ts'
@@ -12,7 +12,7 @@ import type { HydratedBlockStateValidationError } from './error.ts'
  * @returns An array of errors if the block is invalid, or an empty array if it is valid.
  */
 export type HydratedBlockStateValidationFunction = (
-  hydratedBlock: HydratedBlock,
+  hydratedBlock: HydratedBlockWithHashMeta,
   chainId: ChainId,
   services: { accountBalance: AccountBalanceViewer },
 ) => Promisable<HydratedBlockStateValidationError[]>

package/src/validation/block/HydratedBlockValidationFunction.ts

@@ -1,5 +1,5 @@
 import type { Promisable } from '@xylabs/sdk-js'
-import type { ChainId, HydratedBlock } from '@xyo-network/xl1-protocol'
+import type { ChainId, HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 
 import type { HydratedBlockValidationError } from './error.ts'
 
@@ -10,6 +10,6 @@ import type { HydratedBlockValidationError } from './error.ts'
  * @returns An array of errors if the block is invalid, or an empty array if it is valid.
  */
 export type HydratedBlockValidationFunction = (
-  hydratedBlock: HydratedBlock,
+  hydratedBlock: HydratedBlockWithHashMeta,
   chainId?: ChainId,
 ) => Promisable<HydratedBlockValidationError[]>

package/src/viewers/AccountBalance.ts

@@ -7,10 +7,9 @@ import {
   TransferZod,
   type XL1BlockRange,
 } from '@xyo-network/xl1-protocol'
+import { BlockBoundWitnessZod, TransactionBoundWitnessZod } from '@xyo-network/xl1-protocol'
 import z from 'zod'
 
-import { BlockBoundWitnessZod, TransactionBoundWitnessZod } from '../zod/index.ts'
-
 export const AccountBalanceHistoryItemZod = z.tuple([
   WithHashMetaZod(BlockBoundWitnessZod),
   WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
@@ -20,11 +19,11 @@ export const AccountBalanceHistoryItemZod = z.tuple([
 export type AccountBalanceHistoryItem = z.infer<typeof AccountBalanceHistoryItemZod>
 
 export interface AccountBalanceViewerMethods {
-  accountBalance(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AttoXL1>
-  accountBalanceHistory(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AccountBalanceHistoryItem[]>
-
   accountsBalances(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Partial<Record<Address, AttoXL1>>>
   accountsBalancesHistory(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Partial<Record<Address, AccountBalanceHistoryItem[]>>>
 }
 
-export interface AccountBalanceViewer extends AccountBalanceViewerMethods {}
+export interface AccountBalanceViewer extends AccountBalanceViewerMethods {
+  accountBalance(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AttoXL1>
+  accountBalanceHistory(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AccountBalanceHistoryItem[]>
+}

package/src/viewers/Block.ts

@@ -1,12 +1,12 @@
 import type { Hash, Promisable } from '@xylabs/sdk-js'
-import type { HydratedBlock, XL1BlockNumber } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedBlockWithHashMeta, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 
 export interface BlockViewierMethods {
-  blockByHash(hash: Hash): Promisable<HydratedBlock | null>
-  blockByNumber(block: XL1BlockNumber): Promisable<HydratedBlock | null>
-  blocksByHash(hash: Hash, limit?: number): Promisable<HydratedBlock[]>
+  blockByHash(hash: Hash): Promisable<SignedHydratedBlockWithHashMeta | null>
+  blockByNumber(block: XL1BlockNumber): Promisable<SignedHydratedBlockWithHashMeta | null>
+  blocksByHash(hash: Hash, limit?: number): Promisable<SignedHydratedBlockWithHashMeta[]>
 
-  currentBlock(): Promisable<HydratedBlock>
+  currentBlock(): Promisable<SignedHydratedBlockWithHashMeta>
   currentBlockHash(): Promisable<Hash>
   currentBlockNumber(): Promisable<XL1BlockNumber>
 }

package/src/viewers/Mempool.ts

@@ -0,0 +1,18 @@
+import { HashZod } from '@xylabs/sdk-js'
+import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
+import { XL1BlockRangeZod } from '@xyo-network/xl1-protocol'
+import z from 'zod'
+
+export const PendingTransactionsOptionsZod = z.object({
+  cursor: HashZod.optional(),
+  limit: z.number().int().positive().optional(),
+  window: XL1BlockRangeZod.optional(),
+})
+
+export type PendingTransactionsOptions = z.infer<typeof PendingTransactionsOptionsZod>
+
+export interface MempoolViewerMethods {
+  pendingTransactions(options?: PendingTransactionsOptions): Promise<SignedHydratedTransactionWithHashMeta[]>
+}
+
+export interface MempoolViewer extends MempoolViewerMethods {}

package/src/viewers/index.ts

@@ -3,6 +3,7 @@ export * from './Block.ts'
 export * from './Chain.ts'
 export * from './ChainContract.ts'
 export * from './Fork.ts'
+export * from './Mempool.ts'
 export * from './NetworkStakeStepReward.ts'
 export * from './Stake.ts'
 export * from './StakeEvents.ts'

package/dist/neutral/config/App.d.ts

@@ -1,6 +0,0 @@
-import * as z from 'zod';
-export declare const AppConfigZod: z.ZodObject<{
-    port: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
-}, z.core.$strip>;
-export type AppConfig = z.infer<typeof AppConfigZod>;
-//# sourceMappingURL=App.d.ts.map

package/dist/neutral/config/App.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../src/config/App.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,eAAO,MAAM,YAAY;;iBAOvB,CAAA;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAA"}

package/dist/neutral/zod/ArrayBuffer.d.ts

@@ -1,4 +0,0 @@
-import * as z from 'zod';
-export declare const ArrayBufferToJsonZod: z.ZodPipe<z.ZodCustom<ArrayBuffer, ArrayBuffer>, z.ZodTransform<string, ArrayBuffer>>;
-export declare const JsonToArrayBufferZod: z.ZodPipe<z.ZodString, z.ZodTransform<ArrayBuffer | SharedArrayBuffer, string>>;
-//# sourceMappingURL=ArrayBuffer.d.ts.map