@xyo-network/chain-bridge 1.18.0 → 1.18.2

package/src/interface/service/Relay/LiquidityPoolBridgeRelay/LiquidityPoolBridgeRelay.ts

@@ -3,13 +3,13 @@ import {
   asHex, assertEx, hexFromBigInt, hexToBigInt, isNull,
   toAddress,
 } from '@xylabs/sdk-js'
-import { BaseAccountableService } from '@xyo-network/chain-services'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { LiquidityPoolBridge } from '@xyo-network/typechain'
 import { LiquidityPoolBridge__factory } from '@xyo-network/typechain'
+import { AbstractCreatableProvider } from '@xyo-network/xl1-sdk'
 import {
   type BridgeDestinationObservation, BridgeDestinationObservationSchema, type BridgeIntent,
-} from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
 import type { WebSocketProvider } from 'ethers'
 import { getAddress, Wallet } from 'ethers'
 
@@ -30,7 +30,8 @@ export type LiquidityPoolBridgeRelayParams = BridgeServiceParams & {
 }
 
 export class LiquidityPoolBridgeRelay<TParams extends LiquidityPoolBridgeRelayParams = LiquidityPoolBridgeRelayParams>
-  extends BaseAccountableService<TParams> implements ChainBridgeRelayInterface {
+  extends AbstractCreatableProvider<TParams> implements ChainBridgeRelayInterface {
+  moniker = 'LiquidityPoolBridgeRelay'
   protected _bridge: LiquidityPoolBridge | undefined
   protected _bridgeChainId: Hex | undefined
   protected _bridgeRemoteChainId: Hex | undefined
@@ -107,7 +108,7 @@ export class LiquidityPoolBridgeRelay<TParams extends LiquidityPoolBridgeRelayPa
             getAddress(bridgeIntent.srcAddress),
             getAddress(bridgeIntent.destAddress),
             amount,
-            { nonce },
+            nonce,
           )
           return true
         }
@@ -203,7 +204,7 @@ export class LiquidityPoolBridgeRelay<TParams extends LiquidityPoolBridgeRelayPa
             getAddress(bridgeIntent.srcAddress),
             getAddress(bridgeIntent.destAddress),
             amount,
-            { nonce },
+            nonce,
           )
           const confirmation = await tx.wait()
           const transactionResponse = await confirmation?.getTransaction()

package/src/interface/util/getBridgeIntentIdentifier.ts

@@ -2,7 +2,7 @@ import type { Hash } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import {
   type BridgeDestinationObservation, type BridgeIntent, BridgeIntentSchema, type BridgeSourceObservation,
-} from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
 
 export const getBridgeIntentFromObservation = (observation: BridgeSourceObservation | BridgeDestinationObservation, nonce: string): BridgeIntent => {
   const {

package/src/manifest/{getLocator.ts → getModuleLocator.ts}

@@ -11,15 +11,14 @@ import { AbstractModule, LoggerModuleStatusReporter } from '@xyo-network/module-
 import { ModuleFactoryLocator } from '@xyo-network/module-factory-locator'
 import type { MongoDBModuleParamsV2 } from '@xyo-network/module-model-mongodb'
 import { MemorySentinel } from '@xyo-network/sentinel-memory'
-import { HDWallet } from '@xyo-network/wallet'
-import type { BridgeDestinationObservation, SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 import type {
-  Config, IterableMap, XyoGatewayRunner,
-} from '@xyo-network/xl1-protocol-sdk'
+  BridgeDestinationObservation, Config, IterableMap, ProviderFactoryLocator, SignedHydratedTransaction,
+  XyoGatewayRunner,
+} from '@xyo-network/xl1-sdk'
 import {
-  hasMongoConfig, mapToMapType, SimpleXyoGatewayRunner, SimpleXyoSigner,
-} from '@xyo-network/xl1-protocol-sdk'
-import { SimpleXyoConnection } from '@xyo-network/xl1-providers'
+  hasMongoConfig, mapToMapType,
+  XyoGatewayRunnerMoniker,
+} from '@xyo-network/xl1-sdk'
 import type { Document } from 'mongodb'
 
 import type { EVMLiquidityBridgeTransactionCompletionMonitorSentinelParams, XL1TransactionCompletionMonitorSentinelParams } from '../modules/index.ts'
@@ -30,6 +29,7 @@ import {
 
 export interface GetLocatorContext {
   config: Config
+  locator: ProviderFactoryLocator
   logger?: Logger
 }
 
@@ -38,8 +38,10 @@ export interface GetLocatorContext {
  * operation of the node (entirely in memory)
  * @returns A locator with the necessary modules registered
  */
-export const getLocator = async (context: GetLocatorContext) => {
-  const { config, logger } = context
+export const getModuleLocator = async (context: GetLocatorContext) => {
+  const {
+    config, locator, logger,
+  } = context
   const { otlpEndpoint } = config.telemetry?.otel ?? {}
   const { path: endpoint = '/metrics', port: port = 9468 } = config.telemetry?.metrics?.scrape ?? {}
   const { traceProvider, meterProvider } = await initTelemetry({
@@ -54,7 +56,7 @@ export const getLocator = async (context: GetLocatorContext) => {
   if (isDefined(logger)) AbstractModule.defaultLogger = logger
   const statusReporter = logger ? new LoggerModuleStatusReporter(logger) : undefined
 
-  const locator = new ModuleFactoryLocator()
+  const moduleLocator = new ModuleFactoryLocator()
   // If there's a MongoDB configuration
   const mongoConfig = config.storage?.mongo
   if (hasMongoConfig(mongoConfig)) {
@@ -69,21 +71,21 @@ export const getLocator = async (context: GetLocatorContext) => {
       meterProvider, payloadSdkConfig, statusReporter, traceProvider,
     }
     // Register the MongoDB Archivist as the default
-    locator.register(MongoDBArchivistV2.factory(params), undefined, true)
+    moduleLocator.register(MongoDBArchivistV2.factory(params), undefined, true)
   }
 
-  locator.register(MemoryArchivist.factory({
+  moduleLocator.register(MemoryArchivist.factory({
     traceProvider, meterProvider, statusReporter,
   }))
-  locator.register(MemorySentinel.factory({
+  moduleLocator.register(MemorySentinel.factory({
     traceProvider, meterProvider, statusReporter,
   }))
-  locator.register(ViewArchivist.factory({
+  moduleLocator.register(ViewArchivist.factory({
     traceProvider, meterProvider, statusReporter,
   }))
 
-  const gateway = await getGateway(config)
-  const viewer = assertEx(gateway.connectionInstance.viewer, () => 'Gateway viewer is not defined')
+  const gateway = await locator.getInstance<XyoGatewayRunner>(XyoGatewayRunnerMoniker)
+  const viewer = assertEx(gateway.connection.viewer, () => 'Gateway viewer is not defined')
   const pendingXl1ToEthXl1BridgeIntentTransactions = await getIterableMap<Hash, SignedHydratedTransaction>(
     config,
     'liquidity_bridge_xl1_to_eth_xl1_pending',
@@ -102,7 +104,7 @@ export const getLocator = async (context: GetLocatorContext) => {
     traceProvider,
     viewer,
   }
-  locator.register(XL1TransactionCompletionMonitorSentinel.factory(xl1TransactionCompletionMonitorSentinelParams))
+  moduleLocator.register(XL1TransactionCompletionMonitorSentinel.factory(xl1TransactionCompletionMonitorSentinelParams))
 
   const completedEthXl1BridgeTransactions = await getIterableMap<Hash, BridgeDestinationObservation>(
     config,
@@ -120,21 +122,9 @@ export const getLocator = async (context: GetLocatorContext) => {
     statusReporter,
     traceProvider,
   }
-  locator.register(EVMLiquidityBridgeTransactionCompletionMonitorSentinel.factory(evmLiquidityBridgeTransactionCompletionMonitorSentinelParams))
+  moduleLocator.register(EVMLiquidityBridgeTransactionCompletionMonitorSentinel.factory(evmLiquidityBridgeTransactionCompletionMonitorSentinelParams))
 
-  return locator
-}
-
-const getGateway = async (
-  config: Config,
-): Promise<XyoGatewayRunner> => {
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge
-  const walletPromise = isDefined(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random()
-  const account = await walletPromise
-  const signer = new SimpleXyoSigner(account)
-  const connection = await SimpleXyoConnection.create()
-  const gateway = new SimpleXyoGatewayRunner(connection, signer)
-  return gateway
+  return moduleLocator
 }
 
 /**

package/src/manifest/getNode.ts

@@ -1,9 +1,12 @@
 import type { Logger } from '@xylabs/sdk-js'
 import { ManifestWrapper } from '@xyo-network/manifest-wrapper'
 import type { WalletInstance } from '@xyo-network/wallet-model'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  Config, RpcSchemaMap, TransportFactory,
+} from '@xyo-network/xl1-sdk'
+import { buildJsonRpcProviderLocator, HttpRpcTransport } from '@xyo-network/xl1-sdk'
 
-import { getLocator } from './getLocator.ts'
+import { getModuleLocator } from './getModuleLocator.ts'
 import { NodeManifest } from './nodeManifest.ts'
 import { PrivateChildManifests } from './private/index.ts'
 import { PublicChildManifests } from './public/index.ts'
@@ -21,8 +24,11 @@ export interface GetNodeContext {
  */
 export const getNode = async (context: GetNodeContext) => {
   const { wallet } = context
-  const locator = await getLocator(context)
-  const wrapper = new ManifestWrapper(NodeManifest, wallet, locator, PublicChildManifests, PrivateChildManifests)
+  const { chainRpcApiUrl: endpoint } = context.config.bridge
+  const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
+  const locator = await buildJsonRpcProviderLocator({ transportFactory })
+  const moduleLocator = await getModuleLocator({ ...context, locator })
+  const wrapper = new ManifestWrapper(NodeManifest, wallet, moduleLocator, PublicChildManifests, PrivateChildManifests)
   const [node, ...childNodes] = await wrapper.loadNodes()
   if (childNodes?.length > 0) {
     await Promise.all(childNodes.map(childNode => node.register(childNode)))

package/src/manifest/getServices.ts

@@ -5,20 +5,15 @@ import { MongoMap } from '@xyo-network/chain-protocol'
 import { initEvmProvider } from '@xyo-network/chain-services'
 import { LiquidityPoolBridge__factory } from '@xyo-network/typechain'
 import { HDWallet } from '@xyo-network/wallet'
-import type {
-  Config, IterableMap, XyoGatewayRunner,
-} from '@xyo-network/xl1-protocol-sdk'
+import type { Config, IterableMap } from '@xyo-network/xl1-sdk'
 import {
-  hasMongoConfig, mapToMapType, SimpleXyoGatewayRunner, SimpleXyoSigner,
-  XyoConnectionMoniker,
-} from '@xyo-network/xl1-protocol-sdk'
-import type { SimpleXyoConnection } from '@xyo-network/xl1-providers'
-import { buildJsonRpcProviderLocator } from '@xyo-network/xl1-providers'
-import type { RpcSchemaMap, TransportFactory } from '@xyo-network/xl1-rpc'
-import { HttpRpcTransport } from '@xyo-network/xl1-rpc'
+  hasMongoConfig,
+  mapToMapType,
+} from '@xyo-network/xl1-sdk'
 import { getAddress, Wallet } from 'ethers'
 import type { Document } from 'mongodb'
 
+import { getGateway } from '../config/index.ts'
 import type {
   EthTxState, IBridgeServiceCollection, Xl1TxState,
 } from '../services/index.ts'
@@ -60,20 +55,6 @@ export const getServices = async (context: GetServicesContext): Promise<IBridgeS
   }
 }
 
-const getGateway = async (
-  config: Config,
-): Promise<XyoGatewayRunner> => {
-  const { mnemonic, chainRpcApiUrl: endpoint } = config.bridge
-  const walletPromise = isDefined(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random()
-  const account = await walletPromise
-  const signer = new SimpleXyoSigner(account)
-  const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
-  const locator = await buildJsonRpcProviderLocator({ transportFactory })
-  const connection = await locator.getInstance<SimpleXyoConnection>(XyoConnectionMoniker)
-  const gateway = new SimpleXyoGatewayRunner(connection, signer)
-  return gateway
-}
-
 /**
  * Gets an iterable map based on the storage instructions in the config
  * @param config The config containing storage instructions

package/src/manifest/index.ts

@@ -1,4 +1,4 @@
-export * from './getLocator.ts'
+export * from './getModuleLocator.ts'
 export * from './getNode.ts'
 export * from './getServices.ts'
 export * from './nodeManifest.ts'

package/src/modules/EVMLiquidityBridgeTransactionCompletionMonitorSentinel/EVMLiquidityBridgeTransactionCompletionMonitorSentinel.ts

@@ -13,13 +13,14 @@ import type {
   SentinelConfig, SentinelInstance, SentinelModuleEventData, SentinelParams,
 } from '@xyo-network/sentinel-model'
 import { type LiquidityPoolBridge, LiquidityPoolBridge__factory } from '@xyo-network/typechain'
+import type {
+  BridgeDestinationObservation, BridgeIntent, IterableMap, MapType,
+  SignedHydratedTransaction,
+} from '@xyo-network/xl1-sdk'
 import {
-  type BridgeDestinationObservation, BridgeDestinationObservationSchema, type BridgeIntent, isBridgeIntent, type SignedHydratedTransaction,
-} from '@xyo-network/xl1-protocol'
-import type { IterableMap, MapType } from '@xyo-network/xl1-protocol-sdk'
-import {
-  flattenHydratedTransaction, flattenHydratedTransactions, tryUnflattenHydratedTransaction,
-} from '@xyo-network/xl1-protocol-sdk'
+  BridgeDestinationObservationSchema, flattenHydratedTransaction, flattenHydratedTransactions, isBridgeIntent,
+  tryUnflattenHydratedTransaction,
+} from '@xyo-network/xl1-sdk'
 import { Mutex } from 'async-mutex'
 import { getAddress } from 'ethers/address'
 import type { Provider } from 'ethers/providers'
@@ -222,7 +223,7 @@ export class EVMLiquidityBridgeTransactionCompletionMonitorSentinel<
     const nonce = await this.wallet.getNonce()
     const srcAddress = getAddress(bridgeIntent.srcAddress)
     const destAddress = getAddress(bridgeIntent.destAddress)
-    const tx = await this.bridge.bridgeFromRemote(srcAddress, destAddress, amount, { nonce })
+    const tx = await this.bridge.bridgeFromRemote(srcAddress, destAddress, amount, nonce)
     const confirmation = await tx.wait()
     const transactionResponse = await confirmation?.getTransaction()
     const destConfirmation = asHex(transactionResponse?.hash ?? '', true)

package/src/modules/XL1TransactionCompletionMonitorSentinel/XL1TransactionCompletionMonitorSentinel.ts

@@ -10,13 +10,13 @@ import { AbstractSentinel } from '@xyo-network/sentinel-abstract'
 import type {
   SentinelConfig, SentinelInstance, SentinelModuleEventData, SentinelParams,
 } from '@xyo-network/sentinel-model'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 import type {
-  IterableMap, MapType, XyoViewer,
-} from '@xyo-network/xl1-protocol-sdk'
+  IterableMap, MapType, SignedHydratedTransaction,
+  XyoViewer,
+} from '@xyo-network/xl1-sdk'
 import {
   flattenHydratedTransaction, flattenHydratedTransactions, tryUnflattenHydratedTransaction,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 import { Mutex } from 'async-mutex'
 
 export const XL1TransactionCompletionMonitorSentinelConfigSchema = 'network.xyo.sentinel.chain.transaction.completion.monitor.config'

package/src/queue/connection.ts

@@ -1,5 +1,5 @@
 import { isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import { Redis } from 'ioredis'
 
 let connection: Redis | undefined

package/src/queue/flows/createXl1ToEthBridgeJob.ts

@@ -1,4 +1,4 @@
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { FlowProducer } from 'bullmq'
 
 import {

package/src/queue/workers/ethTransactionMonitor.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import type { Redis } from 'ioredis'

package/src/queue/workers/ethTransactionPreparation.ts

@@ -1,6 +1,6 @@
 import { assertEx, hexToBigInt } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { isBridgeIntent, type SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import { isBridgeIntent, type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import { getAddress } from 'ethers'
@@ -30,7 +30,7 @@ export const createWorker = (connection: Redis) => {
       const amount = hexToBigInt(bridgeIntent.destAmount)
       const srcAddress = getAddress(bridgeIntent.srcAddress)
       const destAddress = getAddress(bridgeIntent.destAddress)
-      const preparedTx = await bridge.getFunction('bridgeFromRemote').populateTransaction(srcAddress, destAddress, amount)
+      const preparedTx = await bridge.getFunction('bridgeFromRemote').populateTransaction(srcAddress, destAddress, amount, 0n)
       await job.log(`[${hash}] built ETH transaction`)
       await job.log(`[${hash}] storing ETH preparedTx`)
       await stateMap.set(hash, { preparedTx })

package/src/queue/workers/ethTransactionSubmission.ts

@@ -1,6 +1,6 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { type SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import { type SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import type { Redis } from 'ioredis'

package/src/queue/workers/xl1TransactionMonitor.ts

@@ -2,7 +2,7 @@ import {
   assertEx, isDefined, isNull,
 } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { UnrecoverableError, Worker } from 'bullmq'
 import type { Redis } from 'ioredis'
@@ -27,7 +27,7 @@ const createWorker = (connection: Redis) => {
       // Get the hash of the transaction
       const hash = await PayloadBuilder.hash(tx[0])
       // Get the state of the transaction
-      const viewer = assertEx(gateway.connectionInstance.viewer, () => `[${hash}] viewer not defined on gateway`)
+      const viewer = assertEx(gateway.connection.viewer, () => `[${hash}] viewer not defined on gateway`)
       const state = assertEx(await stateMap.get(hash), () => `[${hash}] state not found`)
 
       // Check for transaction inclusion on chain

package/src/queue/workers/xl1TransactionPreparation.ts

@@ -1,5 +1,5 @@
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import type { Redis } from 'ioredis'

package/src/queue/workers/xl1TransactionSubmission.ts

@@ -1,6 +1,6 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 import type { Job } from 'bullmq'
 import { Worker } from 'bullmq'
 import type { Redis } from 'ioredis'

package/src/server/app.ts

@@ -3,7 +3,7 @@ import {
   standardErrors, standardResponses,
 } from '@xylabs/express'
 import type { NodeInstance } from '@xyo-network/node-model'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import compression from 'compression'
 import cors from 'cors'
 import type { Express } from 'express'

package/src/server/flowProducer.ts

@@ -1,4 +1,4 @@
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import type { Express } from 'express'
 
 import { getConnection, getFlowProducer } from '../queue/index.ts'

package/src/server/routes/addRoutes.ts

@@ -1,4 +1,4 @@
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import type { Express } from 'express'
 
 import { addBridgeRoutes } from './bridge/index.ts'

package/src/server/routes/bridge/addBridgeRoutes.ts

@@ -1,4 +1,4 @@
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import type { Express } from 'express'
 
 import { getRouteDefinitions } from './routeDefinitions/index.ts'

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

@@ -1,5 +1,5 @@
 import type { RouteDefinition } from '@xylabs/express'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 
 import {
   makeBridgeConfigRoute, makeBridgeFromRemoteStatusRoute, makeBridgeToRemoteEstimateRoute, makeBridgeToRemoteRoute, makeBridgeToRemoteStatusRoute,

package/src/server/routes/bridge/routeDefinitions/pathParams/ChainIdPathParam.ts

@@ -1,8 +1,7 @@
 import {
   asHex, HexZod, isUndefined,
 } from '@xylabs/sdk-js'
-import type { ChainId } from '@xyo-network/xl1-protocol'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { ChainId, Config } from '@xyo-network/xl1-sdk'
 
 import { getRemoteChainId } from '../../../../../config/index.ts'
 

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

@@ -1,6 +1,6 @@
 import type { RouteDefinition } from '@xylabs/express'
 import { requestHandlerValidator } from '@xylabs/express'
-import { BridgeSettingsZod, type Config } from '@xyo-network/xl1-protocol-sdk'
+import { BridgeSettingsZod, type Config } from '@xyo-network/xl1-sdk'
 
 import { getBridgeSettings } from '../../../../../config/index.ts'
 

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

@@ -2,12 +2,11 @@ import type { RouteDefinition } from '@xylabs/express'
 import { requestHandlerValidator } from '@xylabs/express'
 import { toAddress, toHex } from '@xylabs/sdk-js'
 import { PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
-import type { BridgeDestinationObservation } from '@xyo-network/xl1-protocol'
+import type { BridgeDestinationObservation, Config } from '@xyo-network/xl1-sdk'
 import {
   BridgeDestinationObservationFieldsZod,
   BridgeDestinationObservationSchema,
-} from '@xyo-network/xl1-protocol'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 import { z } from 'zod'
 
 import { getBridgeSettings } from '../../../../../config/index.ts'

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

@@ -3,12 +3,12 @@ import { requestHandlerValidator } from '@xylabs/express'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
 import type {
-  BridgeSourceObservation, BridgeSourceObservationFields, SignedHydratedTransaction,
-} from '@xyo-network/xl1-protocol'
+  BridgeSourceObservation, BridgeSourceObservationFields, Config,
+  SignedHydratedTransaction,
+} from '@xyo-network/xl1-sdk'
 import {
   BridgeIntentFieldsZod, BridgeIntentSchema, BridgeSourceObservationFieldsZod, BridgeSourceObservationSchema, SignedTransactionBoundWitnessZod, TransferZod,
-} from '@xyo-network/xl1-protocol'
-import { type Config } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 import { z } from 'zod'
 
 import { createXl1ToEthBridgeJob } from '../../../../../queue/index.ts'

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

@@ -2,10 +2,10 @@ import type { RouteDefinition } from '@xylabs/express'
 import { requestHandlerValidator } from '@xylabs/express'
 import { assertEx, toAddress } from '@xylabs/sdk-js'
 import { PayloadZodLooseOfSchema, PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
+import { buildUnsignedTransaction, type Config } from '@xyo-network/xl1-sdk'
 import {
   BridgeIntentFieldsZod, BridgeIntentSchema, toXL1BlockNumber, TransactionBoundWitnessZod, TransferSchema,
-} from '@xyo-network/xl1-protocol'
-import { buildUnsignedTransaction, type Config } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 import { z } from 'zod'
 
 import { getGateway, getXl1ChainId } from '../../../../../config/index.ts'
@@ -41,7 +41,7 @@ export const makeBridgeToRemoteEstimateRoute = (config: Config): RouteDefinition
 
       // Use viewer to get current block
       const gateway = await getGateway(config)
-      const viewer = assertEx(gateway.connectionInstance.viewer, () => new Error('Viewer not available on gateway connection'))
+      const viewer = assertEx(gateway.connection.viewer, () => new Error('Viewer not available on gateway connection'))
       const currentBlockNumber = await viewer.currentBlockNumber()
       // Calculate nbf/exp
       const nbf = toXL1BlockNumber(currentBlockNumber, true)

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

@@ -4,12 +4,13 @@ import {
   asAddress, asHex, toHex,
 } from '@xylabs/sdk-js'
 import { PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
-import type { BridgeDestinationObservation, BridgeSourceObservation } from '@xyo-network/xl1-protocol'
+import type {
+  BridgeDestinationObservation, BridgeSourceObservation, Config,
+} from '@xyo-network/xl1-sdk'
 import {
   BridgeDestinationObservationFieldsZod, BridgeDestinationObservationSchema, BridgeIntentFieldsZod, BridgeIntentSchema, BridgeSourceObservationFieldsZod,
   BridgeSourceObservationSchema,
-} from '@xyo-network/xl1-protocol'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 import { z } from 'zod'
 
 import { getBridgeSettings } from '../../../../../config/index.ts'

package/src/server/server.ts

@@ -5,7 +5,7 @@ import { boot } from '@xyo-network/bios'
 import type { BiosExternalInterface } from '@xyo-network/bios-model'
 import type { NodeInstance } from '@xyo-network/node-model'
 import { HDWallet } from '@xyo-network/wallet'
-import { type Config } from '@xyo-network/xl1-protocol-sdk'
+import { type Config } from '@xyo-network/xl1-sdk'
 
 import { getNode, getServices } from '../manifest/index.ts'
 import { getApp } from './app.ts'

package/src/services/IBridgeServiceCollection.ts

@@ -1,7 +1,7 @@
 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 { IterableMap, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 import type { Provider, Wallet } from 'ethers'
 
 import type { EthTxState } from './EthTxState.ts'

package/src/services/Xl1TxState.ts

@@ -1,5 +1,5 @@
 import type { Hash } from '@xylabs/sdk-js'
-import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-sdk'
 
 import type { TxState } from './TxState.ts'
 

package/src/util/calculateBridgeFees.ts

@@ -1,6 +1,6 @@
 import type { Hex } from '@xylabs/sdk-js'
 import { hexToBigInt, toHex } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 
 export type FeeStructure = Pick<Config['bridge'], 'feeFixed' | 'feeRateBasisPoints'>
 

package/src/util/generateBridgeEstimate.ts

@@ -2,10 +2,10 @@ import type { Hex } from '@xylabs/sdk-js'
 import { hexToBigInt, toAddress } from '@xylabs/sdk-js'
 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, createTransferPayload } from '@xyo-network/xl1-protocol-sdk'
+  BridgeIntent, BridgeIntentFields, Config,
+  Transfer,
+} from '@xyo-network/xl1-sdk'
+import { BridgeIntentSchema, createTransferPayload } from '@xyo-network/xl1-sdk'
 import { v4 } from 'uuid'
 
 import { getBridgeSettings } from '../config/index.ts'

package/src/util/validateBridgeEstimate.ts

@@ -1,6 +1,7 @@
 import { hexToBigInt, isUndefined } from '@xylabs/sdk-js'
-import type { BridgeIntent, Transfer } from '@xyo-network/xl1-protocol'
-import { type Config } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  BridgeIntent, Config, Transfer,
+} from '@xyo-network/xl1-sdk'
 
 import { getBridgeSettings } from '../config/index.ts'
 import { calculateBridgeFees } from './calculateBridgeFees.js'

package/src/util/validateBridgeEstimateExact.ts

@@ -1,7 +1,8 @@
 import { isUndefined } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { BridgeIntent, Transfer } from '@xyo-network/xl1-protocol'
-import { type Config } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  BridgeIntent, Config, Transfer,
+} from '@xyo-network/xl1-sdk'
 
 import { generateBridgeEstimate } from './generateBridgeEstimate.ts'
 

package/src/util/validateBridgeTransaction.ts

@@ -4,9 +4,9 @@ import {
 } from '@xyo-network/boundwitness-validator'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type {
-  BridgeIntent, TransactionBoundWitness, Transfer,
-} from '@xyo-network/xl1-protocol'
-import { type Config } from '@xyo-network/xl1-protocol-sdk'
+  BridgeIntent, Config,
+  TransactionBoundWitness, Transfer,
+} from '@xyo-network/xl1-sdk'
 
 import { getXl1ChainId } from '../config/index.ts'
 

package/dist/node/manifest/getLocator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getLocator.d.ts","sourceRoot":"","sources":["../../../src/manifest/getLocator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,gBAAgB,CAAA;AASlD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAK1E,OAAO,KAAK,EACV,MAAM,EACP,MAAM,+BAA+B,CAAA;AAatC,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAU,SAAS,iBAAiB,kCAqF1D,CAAA"}