@xyo-network/chain-bridge 1.16.16 → 1.16.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/chain-bridge",
-  "version": "1.16.16",
+  "version": "1.16.18",
   "description": "XYO Layer One Bridge",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -33,7 +33,10 @@
   "types": "./dist/node/index.d.ts",
   "files": [
     "dist",
-    "src"
+    "src",
+    "!**/*.bench.*",
+    "!**/*.spec.*",
+    "!**/*.test.*"
   ],
   "scripts": {
     "build-tests": "tsc --noEmit --lib dom,esnext",
@@ -53,7 +56,7 @@
     "@xylabs/sdk-js": "~5.0.34",
     "@xyo-network/archivist-model": "~5.1.23",
     "@xyo-network/boundwitness-model": "~5.1.23",
-    "@xyo-network/chain-protocol": "~1.16.16",
+    "@xyo-network/chain-protocol": "~1.16.18",
     "@xyo-network/manifest-model": "~5.1.23",
     "@xyo-network/module-factory-locator": "~5.1.23",
     "@xyo-network/module-model": "~5.1.23",
@@ -65,7 +68,7 @@
     "@xyo-network/typechain": "~4.0.10",
     "@xyo-network/wallet-model": "~5.1.23",
     "@xyo-network/xl1-protocol": "~1.13.11",
-    "@xyo-network/xl1-protocol-sdk": "~1.16.16",
+    "@xyo-network/xl1-protocol-sdk": "~1.16.18",
     "compression": "~1.8.1",
     "cors": "~2.8.5",
     "express": "~5.1.0",
@@ -93,10 +96,10 @@
     "@xyo-network/bios": "~7.1.1",
     "@xyo-network/bios-model": "~7.1.1",
     "@xyo-network/boundwitness-builder": "~5.1.23",
-    "@xyo-network/chain-modules": "~1.16.16",
-    "@xyo-network/chain-protocol": "~1.16.16",
-    "@xyo-network/chain-services": "~1.16.16",
-    "@xyo-network/chain-telemetry": "~1.16.16",
+    "@xyo-network/chain-modules": "~1.16.18",
+    "@xyo-network/chain-protocol": "~1.16.18",
+    "@xyo-network/chain-services": "~1.16.18",
+    "@xyo-network/chain-telemetry": "~1.16.18",
     "@xyo-network/manifest-wrapper": "~5.1.23",
     "@xyo-network/module-abstract": "~5.1.23",
     "@xyo-network/module-abstract-mongodb": "~5.1.23",

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ChainBlocksObservable.spec.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ChainBlocksObservable.spec.d.ts","sourceRoot":"","sources":["../../../../../src/driver/indexer/spec/ChainBlocksObservable.spec.ts"],"names":[],"mappings":""}

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ChainHydratedBlocksObservable.spec.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ChainHydratedBlocksObservable.spec.d.ts","sourceRoot":"","sources":["../../../../../src/driver/indexer/spec/ChainHydratedBlocksObservable.spec.ts"],"names":[],"mappings":""}

package/dist/node/interface/service/Observer/ERC20TransferObserver/spec/ERC20TransferObserver.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ERC20TransferObserver.spec.d.ts.map

package/dist/node/interface/service/Observer/ERC20TransferObserver/spec/ERC20TransferObserver.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ERC20TransferObserver.spec.d.ts","sourceRoot":"","sources":["../../../../../../../src/interface/service/Observer/ERC20TransferObserver/spec/ERC20TransferObserver.spec.ts"],"names":[],"mappings":""}

package/dist/node/interface/service/Observer/LiquidityPoolBridgeObserver/spec/LiquidityPoolBridgeObserver.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=LiquidityPoolBridgeObserver.spec.d.ts.map

package/dist/node/interface/service/Observer/LiquidityPoolBridgeObserver/spec/LiquidityPoolBridgeObserver.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LiquidityPoolBridgeObserver.spec.d.ts","sourceRoot":"","sources":["../../../../../../../src/interface/service/Observer/LiquidityPoolBridgeObserver/spec/LiquidityPoolBridgeObserver.spec.ts"],"names":[],"mappings":""}

package/dist/node/interface/service/Relay/ChainBridgeRelay/spec/ChainBridgeRelayService.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ChainBridgeRelayService.spec.d.ts.map

package/dist/node/interface/service/Relay/ChainBridgeRelay/spec/ChainBridgeRelayService.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ChainBridgeRelayService.spec.d.ts","sourceRoot":"","sources":["../../../../../../../src/interface/service/Relay/ChainBridgeRelay/spec/ChainBridgeRelayService.spec.ts"],"names":[],"mappings":""}

package/dist/node/interface/service/Relay/LiquidityPoolBridgeRelay/spec/LiquidityPoolBridgeRelay.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=LiquidityPoolBridgeRelay.spec.d.ts.map

package/dist/node/interface/service/Relay/LiquidityPoolBridgeRelay/spec/LiquidityPoolBridgeRelay.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"LiquidityPoolBridgeRelay.spec.d.ts","sourceRoot":"","sources":["../../../../../../../src/interface/service/Relay/LiquidityPoolBridgeRelay/spec/LiquidityPoolBridgeRelay.spec.ts"],"names":[],"mappings":""}

package/dist/node/manifest/public/spec/Node.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Node.spec.d.ts.map

package/dist/node/manifest/public/spec/Node.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Node.spec.d.ts","sourceRoot":"","sources":["../../../../../src/manifest/public/spec/Node.spec.ts"],"names":[],"mappings":""}

package/src/driver/indexer/spec/ChainBlocksObservable.spec.ts

@@ -1,62 +0,0 @@
-import { Account } from '@xyo-network/account'
-import type { AccountInstance } from '@xyo-network/account-model'
-import { MemoryArchivist, MemoryArchivistConfigSchema } from '@xyo-network/archivist-memory'
-import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import { buildRandomChain } from '@xyo-network/chain-protocol'
-import { ChainBlockNumberIterationService } from '@xyo-network/chain-services'
-import type { HydratedBlock } from '@xyo-network/xl1-protocol'
-import type { EventingChainBlockNumberIteratorService } from '@xyo-network/xl1-protocol-sdk'
-import {
-  flattenHydratedBlocks, getDefaultConfig, readPayloadMapFromStore,
-} from '@xyo-network/xl1-protocol-sdk'
-import {
-  firstValueFrom, take, toArray,
-} from 'rxjs'
-import {
-  beforeAll, beforeEach, describe, expect, it,
-} from 'vitest'
-
-import { chainBlocks$ } from '../ChainBlocksObservable.ts'
-
-describe('chainBlocks$', () => {
-  let chainArchivist: ArchivistInstance
-  let producer: AccountInstance
-  let chain: HydratedBlock[]
-  let chainIterator: EventingChainBlockNumberIteratorService
-  const config = getDefaultConfig()
-
-  beforeAll(async () => {
-    producer = await Account.random()
-  })
-
-  beforeEach(async () => {
-    chain = await buildRandomChain(producer, 10)
-    chainArchivist = await MemoryArchivist.create({ config: { schema: MemoryArchivistConfigSchema }, account: 'random' })
-    await chainArchivist.insert(flattenHydratedBlocks(chain))
-    const chainMap = readPayloadMapFromStore(chainArchivist)
-    chainIterator = await ChainBlockNumberIterationService.create({ chainMap, config })
-  })
-  it('emits blocks in order when head updates', async () => {
-    // Arrange
-    // Setup initial head
-    await chainIterator.updateHead(chain[4][0])
-
-    // Setup observable to collect 3 blocks
-    const resultPromise = firstValueFrom(
-      chainBlocks$(chainIterator).pipe(
-        take(3), // wait for 3 blocks
-        toArray(), // collect into array
-      ),
-    )
-
-    // Act
-    // Simulate head updates
-    await chainIterator.updateHead(chain[6][0])
-    await chainIterator.updateHead(chain[7][0])
-    const blocks = await resultPromise
-
-    // Assert
-    // Assert blocks are in ascending order
-    expect(blocks.map(b => b.block)).toEqual([5, 6, 7])
-  })
-})

package/src/driver/indexer/spec/ChainHydratedBlocksObservable.spec.ts

@@ -1,64 +0,0 @@
-import { Account } from '@xyo-network/account'
-import type { AccountInstance } from '@xyo-network/account-model'
-import { MemoryArchivist, MemoryArchivistConfigSchema } from '@xyo-network/archivist-memory'
-import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import { buildRandomChain } from '@xyo-network/chain-protocol'
-import { ChainBlockNumberIterationService } from '@xyo-network/chain-services'
-import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { HydratedBlock } from '@xyo-network/xl1-protocol'
-import type { EventingChainBlockNumberIteratorService, PayloadMapRead } from '@xyo-network/xl1-protocol-sdk'
-import {
-  flattenHydratedBlocks, getDefaultConfig, readPayloadMapFromStore,
-} from '@xyo-network/xl1-protocol-sdk'
-import {
-  firstValueFrom, take, toArray,
-} from 'rxjs'
-import {
-  beforeAll, beforeEach, describe, expect, it,
-} from 'vitest'
-
-import { hydratedChainBlocks$ } from '../ChainHydratedBlocksObservable.ts'
-
-describe('hydratedChainBlocks$', () => {
-  let chainArchivist: ArchivistInstance
-  let producer: AccountInstance
-  let chain: HydratedBlock[]
-  let chainIterator: EventingChainBlockNumberIteratorService
-  let chainMap: PayloadMapRead<WithStorageMeta<Payload>>
-  const config = getDefaultConfig()
-
-  beforeAll(async () => {
-    producer = await Account.random()
-  })
-
-  beforeEach(async () => {
-    chain = await buildRandomChain(producer, 10)
-    chainArchivist = await MemoryArchivist.create({ config: { schema: MemoryArchivistConfigSchema }, account: 'random' })
-    await chainArchivist.insert(flattenHydratedBlocks(chain))
-    chainMap = readPayloadMapFromStore(chainArchivist)
-    chainIterator = await ChainBlockNumberIterationService.create({ chainMap, config })
-  })
-  it('emits blocks in order when head updates', async () => {
-    // Arrange
-    // Setup initial head
-    await chainIterator.updateHead(chain[4][0])
-
-    // Setup observable to collect 3 blocks
-    const resultPromise = firstValueFrom(
-      hydratedChainBlocks$(chainIterator, { chainMap }).pipe(
-        take(3), // wait for 3 blocks
-        toArray(), // collect into array
-      ),
-    )
-
-    // Act
-    // Simulate head updates
-    await chainIterator.updateHead(chain[6][0])
-    await chainIterator.updateHead(chain[7][0])
-    const blocks = await resultPromise
-
-    // Assert
-    // Assert blocks are in ascending order
-    expect(blocks.map(b => b[0].block)).toEqual([5, 6, 7])
-  })
-})

package/src/interface/service/Observer/ERC20TransferObserver/spec/ERC20TransferObserver.spec.ts

@@ -1,272 +0,0 @@
-import type { Address } from '@xylabs/sdk-js'
-import {
-  assertEx, delay,
-  toAddress, toHex,
-} from '@xylabs/sdk-js'
-import { Account } from '@xyo-network/account'
-import type { BridgeableToken } from '@xyo-network/typechain'
-import { BridgeableToken__factory } from '@xyo-network/typechain'
-import {
-  AttoXL1ConvertFactor, type BridgeIntent, BridgeIntentSchema, type ChainId,
-} from '@xyo-network/xl1-protocol'
-import {
-  parseEther, Wallet, WebSocketProvider,
-} from 'ethers'
-import {
-  beforeAll, beforeEach, describe, expect, it, vi,
-} from 'vitest'
-
-import type {
-  BridgeDestinationObservationIndexerInterface, BridgeIntentIndexerInterface, BridgeSourceObservationIndexerInterface,
-} from '../../../../interface/index.ts'
-import { ERC20TransferObserver } from '../ERC20TransferObserver.ts'
-
-describe.skip('ERC20TransferObserver', () => {
-  // Test ERC-20 deployed to Hardhat local chain
-  const TOKEN_ADDRESS = '0x5FbDB2315678afecb367f032d93F642f64180aa3'
-  const WS_URL = 'ws://127.0.0.1:8545'
-  const provider = new WebSocketProvider(WS_URL)
-  let ethBridgeSender: Wallet
-  let ethBridgeReceiver: Wallet
-  let custodialWallet: Wallet
-  let token: BridgeableToken
-  let xl1Address: Address
-  let xl1ChainId: ChainId
-  let sourceObservations: BridgeSourceObservationIndexerInterface
-  let destinationObservations: BridgeDestinationObservationIndexerInterface
-  let intents: BridgeIntentIndexerInterface
-
-  const srcAmountBigint = 100n * AttoXL1ConvertFactor.xl1
-  const srcAmount = toHex(srcAmountBigint)
-  const destAmount = srcAmount // 1:1 for test
-  const ethChainId = toHex('0x7A69')
-  const bridgeableTokenContract = toHex(TOKEN_ADDRESS)
-
-  const createRandomWallet = async (): Promise<Wallet> => {
-    // Create random account
-    const account = await Account.random()
-    expect(account.private?.hex).toBeDefined()
-    const key = assertEx(account.private?.hex)
-
-    // Create a wallet from the private key
-    const wallet = new Wallet(key, provider)
-    const deployer = await provider.getSigner(0)
-
-    // Fund the wallet with some ETH for gas
-    const fundTx = await deployer.sendTransaction({ to: wallet.address, value: parseEther('1') })
-    await fundTx.wait()
-
-    // Ensure wallet has ETH
-    const balance = await provider.getBalance(wallet.address)
-    expect(balance).toBeGreaterThan(0n)
-
-    // Return the created wallet
-    return wallet
-  }
-
-  beforeAll(async () => {
-    const tokenOwner = await provider.getSigner(0)
-    ethBridgeSender = await createRandomWallet()
-    ethBridgeReceiver = await createRandomWallet()
-    custodialWallet = await createRandomWallet()
-
-    token = BridgeableToken__factory.connect(TOKEN_ADDRESS, tokenOwner)
-    await token.mint(custodialWallet.address, parseEther((srcAmountBigint * 2n).toString()))
-    await token.mint(ethBridgeSender.address, parseEther((srcAmountBigint * 2n).toString()))
-  })
-
-  beforeEach(async () => {
-    xl1Address = (await Account.random()).address
-    xl1ChainId = (await Account.random()).address
-  })
-
-  describe('when bridging from Ethereum', () => {
-    beforeEach(() => {
-      sourceObservations = {
-        addObservation: vi.fn().mockResolvedValue(true),
-        getObservationForIntent: vi.fn().mockResolvedValue(null),
-        getIntentForObservation: vi.fn().mockResolvedValue(null),
-      }
-      destinationObservations = {
-        addObservation: vi.fn().mockResolvedValue(true),
-        getObservationForIntent: vi.fn().mockResolvedValue(null),
-        getIntentForObservation: vi.fn().mockResolvedValue(null),
-      }
-      const nonce = Date.now().toString()
-      const intent: BridgeIntent = {
-      // Source
-        src: ethChainId,
-        srcAddress: toAddress(ethBridgeSender.address),
-        srcAmount,
-        srcToken: bridgeableTokenContract,
-
-        // Destination
-        dest: xl1ChainId,
-        destAddress: xl1Address,
-        destAmount,
-        destToken: xl1ChainId,
-
-        // Details
-        nonce,
-
-        schema: BridgeIntentSchema,
-      }
-      intents = {
-        addIntent: vi.fn().mockResolvedValue(true),
-        getIntentByNonce: vi.fn().mockResolvedValue(intent),
-        getIntentsForDestination: vi.fn().mockResolvedValue([]),
-        getIntentsForSource: vi.fn().mockResolvedValue([intent]),
-      }
-    })
-    describe('for new transfers to custodial wallet', () => {
-      it('should observe transfer', async () => {
-      // Arrange
-      // Create observer before transfer
-        const observer = await ERC20TransferObserver.create({
-          destinationObservations,
-          intents,
-          provider,
-          sourceObservations,
-          tokenAddress: TOKEN_ADDRESS,
-          watchAddress: toAddress(custodialWallet.address),
-          watchDirection: 'incoming',
-        })
-        expect(observer).toBeDefined()
-        // Ensure sender has tokens
-        const balance = await token.balanceOf(ethBridgeSender.address)
-        expect(balance).toBeGreaterThan(0n)
-        const sender = token.connect(ethBridgeSender)
-
-        // Act
-        // Transfer from sender to custodial wallet
-        await sender.transfer(custodialWallet.address, srcAmountBigint)
-
-        // Wait for event
-        await delay(2000)
-
-        // Assert
-        // Ensure transfer was observed
-        expect(sourceObservations.addObservation).toHaveBeenCalled()
-      })
-    })
-    describe('for previous transfers to custodial wallet', () => {
-      it('should observe transfer', async () => {
-      // Arrange
-      // Ensure sender has tokens
-        const balance = await token.balanceOf(ethBridgeSender.address)
-        expect(balance).toBeGreaterThan(0n)
-        const sender = token.connect(ethBridgeSender)
-        // Transfer from sender to custodial wallet
-        await sender.transfer(custodialWallet.address, srcAmountBigint)
-
-        // Act
-        // Create observer after transfer
-        const observer = await ERC20TransferObserver.create({
-          destinationObservations,
-          intents,
-          provider,
-          sourceObservations,
-          tokenAddress: TOKEN_ADDRESS,
-          watchAddress: toAddress(custodialWallet.address),
-          watchDirection: 'incoming',
-        })
-        expect(observer).toBeDefined()
-
-        // Assert
-        // Ensure transfer was observed
-        expect(sourceObservations.addObservation).toHaveBeenCalled()
-      })
-    })
-  })
-
-  describe('when bridging to Ethereum', () => {
-    beforeEach(() => {
-      sourceObservations = {
-        addObservation: vi.fn().mockResolvedValue(true),
-        getObservationForIntent: vi.fn().mockResolvedValue(null),
-        getIntentForObservation: vi.fn().mockResolvedValue(null),
-      }
-      destinationObservations = {
-        addObservation: vi.fn().mockResolvedValue(true),
-        getObservationForIntent: vi.fn().mockResolvedValue(null),
-        getIntentForObservation: vi.fn().mockResolvedValue(null),
-      }
-      const nonce = Date.now().toString()
-      const intent: BridgeIntent = {
-        // Source
-        src: xl1ChainId, // From XL1
-        srcAddress: xl1Address, // From XL1 sender
-        srcAmount,
-        srcToken: xl1ChainId, // In XL1
-
-        // Destination
-        dest: ethChainId, // To Ethereum
-        destAddress: toAddress(ethBridgeReceiver.address),
-        destAmount,
-        destToken: bridgeableTokenContract,
-
-        // Details
-        nonce,
-
-        schema: BridgeIntentSchema,
-      }
-      intents = {
-        addIntent: vi.fn().mockResolvedValue(true),
-        getIntentByNonce: vi.fn().mockResolvedValue(intent),
-        getIntentsForDestination: vi.fn().mockResolvedValue([intent]),
-        getIntentsForSource: vi.fn().mockResolvedValue([]),
-      }
-    })
-    describe('for new transfers from custodial wallet', () => {
-      it('should observe transfer', async () => {
-      // Arrange
-      // Create observer before transfer
-        const observer = await ERC20TransferObserver.create({
-          destinationObservations,
-          intents,
-          provider,
-          sourceObservations,
-          tokenAddress: TOKEN_ADDRESS,
-          watchAddress: toAddress(custodialWallet.address),
-          watchDirection: 'outgoing',
-        })
-        expect(observer).toBeDefined()
-
-        // Act
-        const sender = token.connect(custodialWallet)
-        await sender.transfer(ethBridgeReceiver.address, srcAmountBigint.toString())
-
-        // Wait for event
-        await delay(2000)
-
-        // Assert
-        // Ensure transfer was observed
-        expect(destinationObservations.addObservation).toHaveBeenCalled()
-      })
-    })
-    describe('for previous transfers from custodial wallet', () => {
-      it('should observe transfer', async () => {
-      // Arrange
-        const sender = token.connect(custodialWallet)
-        await sender.transfer(ethBridgeReceiver.address, srcAmountBigint.toString())
-
-        // Act
-        // Create observer after transfer
-        const observer = await ERC20TransferObserver.create({
-          destinationObservations,
-          intents,
-          provider,
-          sourceObservations,
-          tokenAddress: TOKEN_ADDRESS,
-          watchAddress: toAddress(custodialWallet.address),
-          watchDirection: 'outgoing',
-        })
-        expect(observer).toBeDefined()
-
-        // Assert
-        // Ensure transfer was observed
-        expect(destinationObservations.addObservation).toHaveBeenCalled()
-      })
-    })
-  })
-})