@xyo-network/chain-bridge 1.19.7 → 1.19.9

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

@@ -1,14 +1,14 @@
 import type { RouteDefinition } from '@xylabs/express'
-import type { Config } from '@xyo-network/xl1-sdk'
+import type { Config, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 
 import {
   makeBridgeConfigRoute, makeBridgeFromRemoteStatusRoute, makeBridgeToRemoteEstimateRoute, makeBridgeToRemoteRoute, makeBridgeToRemoteStatusRoute,
 } from './routes/index.ts'
 
-export const getRouteDefinitions = (config: Config): RouteDefinition[] => {
+export const getRouteDefinitions = (config: Config, gateway: XyoGatewayRunner): RouteDefinition[] => {
   return [
     makeBridgeConfigRoute(config),
-    makeBridgeToRemoteEstimateRoute(config),
+    makeBridgeToRemoteEstimateRoute(config, gateway),
     makeBridgeToRemoteRoute(config),
     makeBridgeToRemoteStatusRoute(config),
     makeBridgeFromRemoteStatusRoute(config),

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

@@ -2,15 +2,13 @@ import type { RouteDefinition } from '@xylabs/express'
 import { requestHandlerValidator } from '@xylabs/express'
 import { assertEx, toAddress } from '@xylabs/sdk-js'
 import { PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
+import type { Config, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 import {
-  buildUnsignedTransaction, type Config, TransferZod,
-} from '@xyo-network/xl1-sdk'
-import {
-  BridgeIntentFieldsZod, BridgeIntentSchema, toXL1BlockNumber, TransactionBoundWitnessZod,
+  BridgeIntentFieldsZod, BridgeIntentSchema, buildUnsignedTransaction, toXL1BlockNumber, TransactionBoundWitnessZod, TransferZod,
 } from '@xyo-network/xl1-sdk'
 import { z } from 'zod'
 
-import { getGateway, getXl1ChainId } from '../../../../../config/index.ts'
+import { getXl1ChainId } from '../../../../../config/index.ts'
 import { generateBridgeEstimate } from '../../../../../util/index.ts'
 import { getRemoteChainIdZod } from '../pathParams/index.ts'
 
@@ -29,7 +27,7 @@ export const BridgeToRemoteEstimateResponseZod = z.tuple([
 
 export type BridgeToRemoteEstimateResponse = z.infer<typeof BridgeToRemoteEstimateResponseZod>
 
-export const makeBridgeToRemoteEstimateRoute = (config: Config): RouteDefinition => {
+export const makeBridgeToRemoteEstimateRoute = (config: Config, gateway: XyoGatewayRunner): RouteDefinition => {
   const params = z.object({ chainId: getRemoteChainIdZod(config) })
   const validateRequest = requestHandlerValidator({
     params, body: BridgeToRemoteEstimateBodyZod, response: BridgeToRemoteEstimateResponseZod,
@@ -46,7 +44,6 @@ export const makeBridgeToRemoteEstimateRoute = (config: Config): RouteDefinition
       const sender = toAddress(srcAddress)
 
       // Use viewer to get current block
-      const gateway = await getGateway(config)
       const viewer = assertEx(gateway.connection.viewer, () => new Error('Viewer not available on gateway connection'))
       const currentBlockNumber = await viewer.currentBlockNumber()
       // Calculate nbf/exp

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-sdk'
+import type { Config, XyoGatewayRunner } from '@xyo-network/xl1-sdk'
 
 import { getNode, getServices } from '../manifest/index.ts'
 import { addWorkers } from './addWorkers.ts'
@@ -18,7 +18,7 @@ const hostname = '::'
 const getSeedPhrase = async (bios: BiosExternalInterface, config: Config, logger?: Logger): Promise<string> => {
   const storedSeedPhrase = await bios.seedPhraseStore.get('os')
   logger?.debug(`[Bridge] Stored mnemonic: ${storedSeedPhrase}`)
-  const { mnemonic } = config.api
+  const { mnemonic } = config.actors.api
   if (isString(storedSeedPhrase) && isString(mnemonic)) {
     logger?.warn('[Bridge] Stored mnemonic does not match supplied. Updating stored mnemonic to supplied.')
     await bios.seedPhraseStore.set('os', mnemonic)
@@ -42,9 +42,9 @@ interface GetServerContext {
   node?: NodeInstance
 }
 
-export const getServer = async (context: GetServerContext) => {
+export const getServer = async (context: GetServerContext, gateway: XyoGatewayRunner) => {
   const { logger, config } = context
-  const { port, mnemonic } = config.bridge
+  const { port, mnemonic } = config.actors.bridge
   const bios = await boot()
   const seedPhrase = isDefined(mnemonic) ? mnemonic : await getSeedPhrase(bios, config, logger)
   const wallet = await HDWallet.fromPhrase(seedPhrase)
@@ -52,8 +52,8 @@ export const getServer = async (context: GetServerContext) => {
     wallet, logger, config,
   }
   const node = context.node ?? await getNode(nodeContext)
-  const app = getApp(node, config)
-  const services = await getServices({ config, logger })
+  const app = getApp(node, config, gateway)
+  const services = await getServices({ config, logger }, gateway)
   addWorkers(config, services)
   const server = app.listen(port, hostname, () => logger?.log(`[Bridge] Server listening at http://${hostname}:${port}`))
   server.setTimeout(20_000)

package/src/util/calculateBridgeFees.ts

@@ -2,7 +2,7 @@ import type { Hex } from '@xylabs/sdk-js'
 import { hexToBigInt, toHex } from '@xylabs/sdk-js'
 import type { Config } from '@xyo-network/xl1-sdk'
 
-export type FeeStructure = Pick<Config['bridge'], 'feeFixed' | 'feeRateBasisPoints'>
+export type FeeStructure = Pick<Config['actors']['bridge'], 'feeFixed' | 'feeRateBasisPoints'>
 
 export interface FeeCalculationResult {
   destAmount: Hex