@xyo-network/chain-bridge 1.19.6 → 1.19.8

package/src/server/server.ts

@@ -8,6 +8,7 @@ import { HDWallet } from '@xyo-network/wallet'
 import { type Config } from '@xyo-network/xl1-sdk'
 
 import { getNode, getServices } from '../manifest/index.ts'
+import { addWorkers } from './addWorkers.ts'
 import { getApp } from './app.ts'
 
 const hostname = '::'
@@ -17,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)
@@ -43,7 +44,7 @@ interface GetServerContext {
 
 export const getServer = async (context: GetServerContext) => {
   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,7 +53,8 @@ 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 services = await getServices({ config, logger })
+  addWorkers(config, services)
   const server = app.listen(port, hostname, () => logger?.log(`[Bridge] Server listening at http://${hostname}:${port}`))
   server.setTimeout(20_000)
   return server

package/src/services/IBridgeServiceCollection.ts

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

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

package/src/util/getConfigFromEnv.ts

@@ -0,0 +1,15 @@
+import { type Config, ConfigZod } from '@xyo-network/xl1-sdk'
+import type { Configuration } from 'yargs-parser'
+import parser from 'yargs-parser'
+
+export const ConfigParserEnvPrefix = 'XL1_'
+export const ConfigParserConfiguration: Partial<Configuration> = {
+  'dot-notation': true, // foo.bar → { foo: { bar } }
+  'parse-numbers': false, // Don't auto-parse numbers to allow strings like "0x1"
+  'populate--': true, // Populate -- with all options so we can detected user-supplied vs defaults
+}
+
+export const getConfigFromEnv = (): Config => {
+  const parsed = parser([], { configuration: ConfigParserConfiguration, envPrefix: ConfigParserEnvPrefix })
+  return ConfigZod.parse(parsed)
+}

package/src/util/index.ts

@@ -1,5 +1,6 @@
 export * from './calculateBridgeFees.ts'
 export * from './generateBridgeEstimate.ts'
+export * from './getConfigFromEnv.ts'
 export * from './validateBridgeEstimate.ts'
 export * from './validateBridgeEstimateExact.ts'
 export * from './validateBridgeTransaction.ts'

package/dist/node/queue/workers/ethTransactionMonitor.d.ts

@@ -1,3 +0,0 @@
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const ethTransactionMonitor: WorkerDescription;
-//# sourceMappingURL=ethTransactionMonitor.d.ts.map

package/dist/node/queue/workers/ethTransactionMonitor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethTransactionMonitor.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/ethTransactionMonitor.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AA+B/D,eAAO,MAAM,qBAAqB,EAAE,iBAEnC,CAAA"}

package/dist/node/queue/workers/ethTransactionPreparation.d.ts

@@ -1,5 +0,0 @@
-import type { Redis } from 'ioredis';
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const createWorker: (connection: Redis) => void;
-export declare const ethTransactionPreparation: WorkerDescription;
-//# sourceMappingURL=ethTransactionPreparation.d.ts.map

package/dist/node/queue/workers/ethTransactionPreparation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethTransactionPreparation.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/ethTransactionPreparation.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAGpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAS/D,eAAO,MAAM,YAAY,GAAI,YAAY,KAAK,SAwB7C,CAAA;AAED,eAAO,MAAM,yBAAyB,EAAE,iBAEvC,CAAA"}

package/dist/node/queue/workers/ethTransactionSubmission.d.ts

@@ -1,3 +0,0 @@
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const ethTransactionSubmission: WorkerDescription;
-//# sourceMappingURL=ethTransactionSubmission.d.ts.map

package/dist/node/queue/workers/ethTransactionSubmission.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ethTransactionSubmission.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/ethTransactionSubmission.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAkE/D,eAAO,MAAM,wBAAwB,EAAE,iBAEtC,CAAA"}

package/dist/node/queue/workers/xl1ToEthBridgeParent.d.ts

@@ -1,3 +0,0 @@
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const xl1ToEthBridgeParent: WorkerDescription;
-//# sourceMappingURL=xl1ToEthBridgeParent.d.ts.map

package/dist/node/queue/workers/xl1ToEthBridgeParent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xl1ToEthBridgeParent.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/xl1ToEthBridgeParent.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAkB/D,eAAO,MAAM,oBAAoB,EAAE,iBAElC,CAAA"}

package/dist/node/queue/workers/xl1TransactionMonitor.d.ts

@@ -1,3 +0,0 @@
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const xl1TransactionMonitor: WorkerDescription;
-//# sourceMappingURL=xl1TransactionMonitor.d.ts.map

package/dist/node/queue/workers/xl1TransactionMonitor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xl1TransactionMonitor.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/xl1TransactionMonitor.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAqD/D,eAAO,MAAM,qBAAqB,EAAE,iBAEnC,CAAA"}

package/dist/node/queue/workers/xl1TransactionPreparation.d.ts

@@ -1,3 +0,0 @@
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const xl1TransactionPreparation: WorkerDescription;
-//# sourceMappingURL=xl1TransactionPreparation.d.ts.map

package/dist/node/queue/workers/xl1TransactionPreparation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xl1TransactionPreparation.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/xl1TransactionPreparation.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AA0B/D,eAAO,MAAM,yBAAyB,EAAE,iBAEvC,CAAA"}

package/dist/node/queue/workers/xl1TransactionSubmission.d.ts

@@ -1,3 +0,0 @@
-import type { WorkerDescription } from './WorkerDescription.ts';
-export declare const xl1TransactionSubmission: WorkerDescription;
-//# sourceMappingURL=xl1TransactionSubmission.d.ts.map

package/dist/node/queue/workers/xl1TransactionSubmission.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xl1TransactionSubmission.d.ts","sourceRoot":"","sources":["../../../../src/queue/workers/xl1TransactionSubmission.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAiD/D,eAAO,MAAM,wBAAwB,EAAE,iBAEtC,CAAA"}

package/dist/node/server/flowProducer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"flowProducer.d.ts","sourceRoot":"","sources":["../../../src/server/flowProducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAItC,eAAO,MAAM,eAAe,GAAI,KAAK,OAAO,EAAE,QAAQ,MAAM,KAAG,OAK9D,CAAA"}