@xyo-network/chain-bridge 1.17.7 → 1.18.0

package/src/server/index.ts

@@ -2,12 +2,17 @@ export * from './app.ts'
 export * from './server.ts'
 
 import type { NodeInstance } from '@xyo-network/node-model'
+import type { FlowProducer } from 'bullmq'
+
+import type { IBridgeServiceCollection } from '../services/index.ts'
 
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Express {
     interface Application {
+      flowProducer: FlowProducer
       node: NodeInstance
+      services: IBridgeServiceCollection
     }
   }
 }

package/src/server/routes/bridge/routeDefinitions/routes/bridgeToRemote.ts

@@ -1,18 +1,17 @@
 import type { RouteDefinition } from '@xylabs/express'
 import { requestHandlerValidator } from '@xylabs/express'
-import { assertEx } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
-import { asSentinelInstance } from '@xyo-network/sentinel-model'
 import type {
   BridgeSourceObservation, BridgeSourceObservationFields, SignedHydratedTransaction,
 } from '@xyo-network/xl1-protocol'
 import {
   BridgeIntentFieldsZod, BridgeIntentSchema, BridgeSourceObservationFieldsZod, BridgeSourceObservationSchema, SignedTransactionBoundWitnessZod, TransferZod,
 } from '@xyo-network/xl1-protocol'
-import { type Config, flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
+import { type Config } from '@xyo-network/xl1-protocol-sdk'
 import { z } from 'zod'
 
+import { createXl1ToEthBridgeJob } from '../../../../../queue/index.ts'
 import { validateBridgeEstimateExact, validateBridgeTransaction } from '../../../../../util/index.ts'
 import { getRemoteChainIdZod } from '../pathParams/index.ts'
 
@@ -33,7 +32,7 @@ export const makeBridgeToRemoteRoute = (config: Config): RouteDefinition => {
     path: '/bridge/chains/:chainId/bridgeToRemote',
     handlers: validateRequest(async (req, res) => {
       const [signedTxBw, bridgeIntent, transfer] = req.body
-      const { node } = req.app
+      const { flowProducer } = req.app
 
       // Validate request
       const transactionValid = await validateBridgeTransaction(signedTxBw, bridgeIntent, transfer, config)
@@ -49,19 +48,12 @@ export const makeBridgeToRemoteRoute = (config: Config): RouteDefinition => {
         return
       }
 
-      // Submit to sentinel
-      const mod = await node.resolve('XL1BridgeIntentTransactionCompletionMonitorSentinel')
-      const sentinel = assertEx(asSentinelInstance(mod), () => 'Error resolving XL1BridgeIntentTransactionCompletionMonitorSentinel')
+      // Submit to job queue
       const singedHydratedTransaction: SignedHydratedTransaction = [signedTxBw, [transfer, bridgeIntent]]
-      const observation = await sentinel.report(flattenHydratedTransaction(singedHydratedTransaction))
-      if (observation.length === 0) {
-        console.error('Error submitting bridge intent transaction to sentinel')
-        res.status(500).send()
-        return
-      }
-      const srcConfirmation = await PayloadBuilder.hash(signedTxBw)
+      await createXl1ToEthBridgeJob(flowProducer, singedHydratedTransaction)
 
       // Create BridgeObservation
+      const srcConfirmation = await PayloadBuilder.hash(signedTxBw)
       const bridgeCommonFieldsZod = z.object({}).extend(BridgeSourceObservationFieldsZod.shape)
       const bridgeCommonFields = bridgeCommonFieldsZod.parse(bridgeIntent)
       const bridgeObservationFields: BridgeSourceObservationFields = { ...bridgeCommonFields, srcConfirmation }

package/src/server/routes/bridge/routeDefinitions/routes/bridgeToRemoteStatus.ts

@@ -78,6 +78,7 @@ export const makeBridgeToRemoteStatusRoute = (config: Config): RouteDefinition =
           srcAddress,
           srcAmount,
           srcToken,
+          srcConfirmation: toHex('0x8888'),
         }
         result[1] = observation
       }

package/src/server/server.ts

@@ -7,7 +7,7 @@ import type { NodeInstance } from '@xyo-network/node-model'
 import { HDWallet } from '@xyo-network/wallet'
 import { type Config } from '@xyo-network/xl1-protocol-sdk'
 
-import { getNode } from '../manifest/index.ts'
+import { getNode, getServices } from '../manifest/index.ts'
 import { getApp } from './app.ts'
 
 const hostname = '::'
@@ -52,6 +52,7 @@ export const getServer = async (context: GetServerContext) => {
   }
   const node = context.node ?? await getNode(nodeContext)
   const app = getApp(node, config)
+  app.services = await getServices({ config, logger })
   const server = app.listen(port, hostname, () => logger?.log(`[Bridge] Server listening at http://${hostname}:${port}`))
   server.setTimeout(20_000)
   return server

package/src/services/EthTxState.ts

@@ -0,0 +1,5 @@
+import type { TransactionRequest } from 'ethers'
+
+import type { TxState } from './TxState.ts'
+
+export interface EthTxState extends TxState<TransactionRequest> {}

package/src/services/IBridgeServiceCollection.ts

@@ -0,0 +1,18 @@
+import type { Hash } from '@xylabs/sdk-js'
+import type { AccountInstance } from '@xyo-network/account-model'
+import type { LiquidityPoolBridge } from '@xyo-network/typechain'
+import type { IterableMap, XyoGatewayRunner } from '@xyo-network/xl1-protocol-sdk'
+import type { Provider, Wallet } from 'ethers'
+
+import type { EthTxState } from './EthTxState.ts'
+import type { Xl1TxState } from './Xl1TxState.ts'
+
+export interface IBridgeServiceCollection {
+  account: AccountInstance
+  bridge: LiquidityPoolBridge
+  ethTxStateMap: IterableMap<Hash, EthTxState>
+  gateway: XyoGatewayRunner
+  provider: Provider
+  wallet: Wallet
+  xl1TxStateMap: IterableMap<Hash, Xl1TxState>
+}

package/src/services/TxState.ts

@@ -0,0 +1,32 @@
+import { isDefined } from '@xylabs/sdk-js'
+
+export interface TxState<TTx, TTxHash extends string = string, TConfHash extends string = string> {
+  /**
+   * The confirmation hash of the transaction
+   */
+  confirmationHash?: TConfHash
+  /**
+   * The transaction that has been prepared for submission
+   */
+  preparedTx?: TTx
+  /**
+   * The hash of the submitted transaction
+   */
+  submissionHash?: TTxHash
+}
+
+export type TxCompletionStates = 'pendingSubmission' | 'submitted' | 'confirmed' | 'failed'
+
+/**
+ * Determines the transaction state based on the TxState object
+ * @param state The transaction state
+ * @returns The state of the transaction
+ */
+export const getTransactionCompletionState = <T>(state: TxState<T>): TxCompletionStates => {
+  // Prepared, submitted, and confirmed
+  if (isDefined(state.preparedTx) && isDefined(state.submissionHash) && isDefined(state.confirmationHash)) return 'confirmed'
+  // Prepared and submitted
+  if (isDefined(state.preparedTx) && isDefined(state.submissionHash)) return 'submitted'
+  // Prepared
+  return 'pendingSubmission'
+}

package/src/services/Xl1TxState.ts

@@ -0,0 +1,6 @@
+import type { Hash } from '@xylabs/sdk-js'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+
+import type { TxState } from './TxState.ts'
+
+export interface Xl1TxState extends TxState<SignedHydratedTransaction, Hash, Hash> {}

package/src/services/index.ts

@@ -0,0 +1,4 @@
+export * from './EthTxState.ts'
+export * from './IBridgeServiceCollection.ts'
+export * from './TxState.ts'
+export * from './Xl1TxState.ts'

package/src/util/generateBridgeEstimate.ts

@@ -1,12 +1,11 @@
 import type { Hex } from '@xylabs/sdk-js'
 import { hexToBigInt, toAddress } from '@xylabs/sdk-js'
-import { createTransferPayload } from '@xyo-network/chain-protocol'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type {
   BridgeIntent, BridgeIntentFields, Transfer,
 } from '@xyo-network/xl1-protocol'
 import { BridgeIntentSchema } from '@xyo-network/xl1-protocol'
-import { type Config } from '@xyo-network/xl1-protocol-sdk'
+import { type Config, createTransferPayload } from '@xyo-network/xl1-protocol-sdk'
 import { v4 } from 'uuid'
 
 import { getBridgeSettings } from '../config/index.ts'

package/src/util/validateBridgeTransaction.ts

@@ -8,6 +8,8 @@ import type {
 } from '@xyo-network/xl1-protocol'
 import { type Config } from '@xyo-network/xl1-protocol-sdk'
 
+import { getXl1ChainId } from '../config/index.ts'
+
 /**
  * Validates a bridge estimate by checking the intent and transfer against the provided configuration. This method
  * exists to allow for "at least" validation of a bridge estimates in case we want to allow for some flexibility in
@@ -27,6 +29,9 @@ export const validateBridgeTransaction = async (
 ): Promise<boolean> => {
   const { srcAddress } = intent
 
+  const chainId = getXl1ChainId(config)
+  if (signedTxBw.chain !== chainId) return false
+
   const errors = await new BoundWitnessValidator(signedTxBw).validate()
   if (isDefined(errors) && errors.length > 0) return false
 

package/dist/node/driver/index.d.ts

@@ -1,2 +0,0 @@
-export * from './indexer/index.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/node/driver/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/driver/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}

package/dist/node/driver/indexer/ChainBlockIteration/ChainHashIterationService.d.ts

@@ -1,24 +0,0 @@
-import type { Hash, Hex, Promisable } from '@xylabs/sdk-js';
-import type { ArchivistInstance } from '@xyo-network/archivist-model';
-import type { BaseServiceParams } from '@xyo-network/chain-services';
-import { BaseService } from '@xyo-network/chain-services';
-import type { WithStorageMeta } from '@xyo-network/payload-model';
-import { type BlockBoundWitness } from '@xyo-network/xl1-protocol';
-import type { ChainIteratorServiceEventData, EventingChainHashIteratorService } from '@xyo-network/xl1-protocol-sdk';
-export interface ChainHashIterationServiceParams extends BaseServiceParams {
-    chainArchivist: ArchivistInstance;
-    head: BlockBoundWitness;
-}
-export declare class ChainHashIterationService extends BaseService<ChainHashIterationServiceParams, ChainIteratorServiceEventData> implements EventingChainHashIteratorService {
-    protected _currentHead: WithStorageMeta<BlockBoundWitness> | undefined;
-    get chainArchivist(): ArchivistInstance;
-    get chainId(): Hex;
-    get(id: Hash): Promisable<BlockBoundWitness | undefined>;
-    head(): Promise<WithStorageMeta<BlockBoundWitness>>;
-    next(_id: Hex): Promise<WithStorageMeta<BlockBoundWitness> | undefined>;
-    previous(block?: Hash | undefined, count?: number): Promise<WithStorageMeta<BlockBoundWitness>[]>;
-    updateHead(head: BlockBoundWitness): Promise<void>;
-    private getBoundWitnessAsBlockBoundWitnessWithStorageMeta;
-    private getHashAsBlockBoundWitnessWithStorageMeta;
-}
-//# sourceMappingURL=ChainHashIterationService.d.ts.map

package/dist/node/driver/indexer/ChainBlockIteration/ChainHashIterationService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainHashIterationService.d.ts","sourceRoot":"","sources":["../../../../../src/driver/indexer/ChainBlockIteration/ChainHashIterationService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAAE,GAAG,EAAE,UAAU,EACtB,MAAM,gBAAgB,CAAA;AAKvB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAEzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAC+B,KAAK,iBAAiB,EAE3D,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EAAE,6BAA6B,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAA;AAEpH,MAAM,WAAW,+BAAgC,SAAQ,iBAAiB;IACxE,cAAc,EAAE,iBAAiB,CAAA;IACjC,IAAI,EAAE,iBAAiB,CAAA;CACxB;AAED,qBAAa,yBAA0B,SAAQ,WAAW,CAAC,+BAA+B,EAAE,6BAA6B,CACvH,YAAW,gCAAgC;IAC3C,SAAS,CAAC,YAAY,EAAE,eAAe,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAA;IAEtE,IAAI,cAAc,IAAI,iBAAiB,CAAgD;IAEvF,IAAI,OAAO,IAAI,GAAG,CAA2G;IAE7H,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,UAAU,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAIlD,IAAI,IAAI,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;IAUnD,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAKvE,QAAQ,CAAC,KAAK,GAAE,IAAI,GAAG,SAAqB,EAAE,KAAK,GAAE,MAAU,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAqB/G,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YAM1C,iDAAiD;YAKjD,yCAAyC;CAMxD"}

package/dist/node/driver/indexer/ChainBlockIteration/index.d.ts

@@ -1,2 +0,0 @@
-export * from './ChainHashIterationService.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/node/driver/indexer/ChainBlockIteration/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/driver/indexer/ChainBlockIteration/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAA"}

package/dist/node/driver/indexer/ChainBlocksObservable.d.ts

@@ -1,6 +0,0 @@
-import type { WithStorageMeta } from '@xyo-network/payload-model';
-import type { BlockBoundWitness } from '@xyo-network/xl1-protocol';
-import type { EventingChainBlockNumberIteratorService } from '@xyo-network/xl1-protocol-sdk';
-import type { Observable } from 'rxjs';
-export declare const chainBlocks$: (chainIterator: EventingChainBlockNumberIteratorService) => Observable<WithStorageMeta<BlockBoundWitness>>;
-//# sourceMappingURL=ChainBlocksObservable.d.ts.map

package/dist/node/driver/indexer/ChainBlocksObservable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainBlocksObservable.d.ts","sourceRoot":"","sources":["../../../../src/driver/indexer/ChainBlocksObservable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,KAAK,EAAE,uCAAuC,EAAiB,MAAM,+BAA+B,CAAA;AAC3G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAKtC,eAAO,MAAM,YAAY,GACvB,eAAe,uCAAuC,KACrD,UAAU,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAkC/C,CAAA"}

package/dist/node/driver/indexer/ChainHydratedBlocksObservable.d.ts

@@ -1,11 +0,0 @@
-import type { HydratedBlock } from '@xyo-network/xl1-protocol';
-import type { ChainStoreRead } from '@xyo-network/xl1-protocol-sdk';
-import type { Observable } from 'rxjs';
-import { chainBlocks$ } from './ChainBlocksObservable.ts';
-/**
- * Creates an observable of HydratedBlocks from a chain iterator + context.
- * @param chainIterator - EventingChainBlockNumberIteratorService that emits heads
- * @param context - ChainStoreContextRead used to fetch payloads and hydrate blocks
- */
-export declare const hydratedChainBlocks$: (chainIterator: Parameters<typeof chainBlocks$>[0], context: ChainStoreRead) => Observable<HydratedBlock>;
-//# sourceMappingURL=ChainHydratedBlocksObservable.d.ts.map

package/dist/node/driver/indexer/ChainHydratedBlocksObservable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainHydratedBlocksObservable.d.ts","sourceRoot":"","sources":["../../../../src/driver/indexer/ChainHydratedBlocksObservable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAqB,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAEnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAGtC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAEzD;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,eAAe,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,EACjD,SAAS,cAAc,KACtB,UAAU,CAAC,aAAa,CAK1B,CAAA"}

package/dist/node/driver/indexer/index.d.ts

@@ -1,2 +0,0 @@
-export * from './ChainBlocksObservable.ts';
-//# sourceMappingURL=index.d.ts.map

package/dist/node/driver/indexer/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/driver/indexer/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA"}

package/src/driver/index.ts

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

package/src/driver/indexer/ChainBlockIteration/ChainHashIterationService.ts

@@ -1,89 +0,0 @@
-import type {
-  Hash, Hex, Promisable,
-} from '@xylabs/sdk-js'
-import {
-  assertEx,
-  isDefined, isNull, isUndefined,
-} from '@xylabs/sdk-js'
-import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import type { BaseServiceParams } from '@xyo-network/chain-services'
-import { BaseService } from '@xyo-network/chain-services'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { WithStorageMeta } from '@xyo-network/payload-model'
-import {
-  asBlockBoundWitnessWithStorageMeta, type BlockBoundWitness,
-  isBlockBoundWitnessWithStorageMeta,
-} from '@xyo-network/xl1-protocol'
-import type { ChainIteratorServiceEventData, EventingChainHashIteratorService } from '@xyo-network/xl1-protocol-sdk'
-
-export interface ChainHashIterationServiceParams extends BaseServiceParams {
-  chainArchivist: ArchivistInstance
-  head: BlockBoundWitness
-}
-
-export class ChainHashIterationService extends BaseService<ChainHashIterationServiceParams, ChainIteratorServiceEventData>
-  implements EventingChainHashIteratorService {
-  protected _currentHead: WithStorageMeta<BlockBoundWitness> | undefined
-
-  get chainArchivist(): ArchivistInstance { return assertEx(this.params.chainArchivist) }
-
-  get chainId(): Hex { return assertEx(this._currentHead?.chain ?? this.params?.head?.chain, () => 'Current head is not set') }
-
-  get(id: Hash): Promisable<BlockBoundWitness | undefined> {
-    return this.getHashAsBlockBoundWitnessWithStorageMeta(id)
-  }
-
-  async head(): Promise<WithStorageMeta<BlockBoundWitness>> {
-    if (isDefined(this._currentHead)) return this._currentHead
-    if (isDefined(this.params.head)) {
-      const newHead = await this.getBoundWitnessAsBlockBoundWitnessWithStorageMeta(this.params.head)
-      this._currentHead = newHead
-      return newHead
-    }
-    throw new Error('Head is not set')
-  }
-
-  async next(_id: Hex): Promise<WithStorageMeta<BlockBoundWitness> | undefined> {
-    await Promise.resolve() // to make this function async
-    throw new Error('Next method not implemented for ChainHashIterationService.')
-  }
-
-  async previous(block: Hash | undefined = undefined, count: number = 1): Promise<WithStorageMeta<BlockBoundWitness>[]> {
-    const results: WithStorageMeta<BlockBoundWitness>[] = []
-    let currentBlock: WithStorageMeta<BlockBoundWitness> | undefined = await this.head()
-    if (isDefined(block)) {
-      currentBlock = await this.getHashAsBlockBoundWitnessWithStorageMeta(block)
-    }
-    while (currentBlock && results.length < count) {
-      if (isBlockBoundWitnessWithStorageMeta(currentBlock)) {
-        results.push(currentBlock)
-        const { previous } = currentBlock
-        if (isNull(previous)) break
-        const nextBlock = await this.chainArchivist.get([previous])
-        currentBlock = asBlockBoundWitnessWithStorageMeta(nextBlock[0])
-      } else {
-        const hash = await PayloadBuilder.hash(currentBlock)
-        assertEx(asBlockBoundWitnessWithStorageMeta(currentBlock), () => `Expected hash to be a block bound witness [${hash}]`)
-      }
-    }
-    return results
-  }
-
-  async updateHead(head: BlockBoundWitness): Promise<void> {
-    const newHead = await this.getBoundWitnessAsBlockBoundWitnessWithStorageMeta(head)
-    this._currentHead = newHead
-    void this.emit('headUpdated', { blocks: [newHead] })
-  }
-
-  private async getBoundWitnessAsBlockBoundWitnessWithStorageMeta(head: BlockBoundWitness): Promise<WithStorageMeta<BlockBoundWitness>> {
-    const hash = await PayloadBuilder.hash(head)
-    return this.getHashAsBlockBoundWitnessWithStorageMeta(hash)
-  }
-
-  private async getHashAsBlockBoundWitnessWithStorageMeta(hash: Hash): Promise<WithStorageMeta<BlockBoundWitness>> {
-    const stored = (await this.chainArchivist.get([hash])).at(-1)
-    const bw = asBlockBoundWitnessWithStorageMeta(stored)
-    if (isUndefined(bw)) throw new Error(`Block not found in archivist [${hash}]`)
-    return bw
-  }
-}

package/src/driver/indexer/ChainBlockIteration/index.ts

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

package/src/driver/indexer/ChainBlocksObservable.ts

@@ -1,46 +0,0 @@
-import { isDefined, isUndefined } from '@xylabs/sdk-js'
-import type { WithStorageMeta } from '@xyo-network/payload-model'
-import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
-import type { EventingChainBlockNumberIteratorService, HeadEventArgs } from '@xyo-network/xl1-protocol-sdk'
-import type { Observable } from 'rxjs'
-import {
-  concatMap, defer, fromEvent, mergeMap,
-} from 'rxjs'
-
-export const chainBlocks$ = (
-  chainIterator: EventingChainBlockNumberIteratorService,
-): Observable<WithStorageMeta<BlockBoundWitness>> => {
-  // Event source: head updated
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const headUpdates$ = fromEvent<HeadEventArgs>(chainIterator as any, 'headUpdated')
-
-  return defer(async () => {
-    // seed with current head (optional)
-    const head = await chainIterator.head()
-    return head
-  }).pipe(
-    // merge initial head + updates into a single stream
-    mergeMap((firstHead) => {
-      let lastSeen: number | undefined = firstHead.block
-
-      return headUpdates$.pipe(
-        concatMap(async (blocks: HeadEventArgs) => {
-          // walk backwards from newHead until we reach lastSeen
-          const history: WithStorageMeta<BlockBoundWitness>[] = []
-          const newHead = blocks.blocks.at(-1)
-          let cursor: number | undefined = newHead?.block
-          while (isDefined(cursor) && (isUndefined(lastSeen) || cursor > lastSeen)) {
-            const blocks = await chainIterator.previous(cursor, 1)
-            if (blocks.length === 0) break
-            history.push(blocks[0])
-            cursor = blocks[0].block - 1
-          }
-          if (isDefined(newHead)) lastSeen = newHead.block
-          // emit in ascending order
-          return history.toReversed()
-        }),
-        mergeMap(blocks => blocks), // flatten
-      )
-    }),
-  )
-}

package/src/driver/indexer/ChainHydratedBlocksObservable.ts

@@ -1,23 +0,0 @@
-import type { WithStorageMeta } from '@xyo-network/payload-model'
-import type { BlockBoundWitness, HydratedBlock } from '@xyo-network/xl1-protocol'
-import type { ChainStoreRead } from '@xyo-network/xl1-protocol-sdk'
-import { hydrateBlock } from '@xyo-network/xl1-protocol-sdk'
-import type { Observable } from 'rxjs'
-import { concatMap } from 'rxjs'
-
-import { chainBlocks$ } from './ChainBlocksObservable.ts'
-
-/**
- * Creates an observable of HydratedBlocks from a chain iterator + context.
- * @param chainIterator - EventingChainBlockNumberIteratorService that emits heads
- * @param context - ChainStoreContextRead used to fetch payloads and hydrate blocks
- */
-export const hydratedChainBlocks$ = (
-  chainIterator: Parameters<typeof chainBlocks$>[0],
-  context: ChainStoreRead,
-): Observable<HydratedBlock> => {
-  return chainBlocks$(chainIterator).pipe(
-    concatMap((block: WithStorageMeta<BlockBoundWitness>) =>
-      hydrateBlock(context, block._hash)),
-  )
-}

package/src/driver/indexer/index.ts

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