@xyo-network/chain-bridge 1.18.0 → 1.18.1

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'

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'

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'

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'

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'