@xyo-network/xl1-cli-lib 1.14.4 → 1.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/xl1-cli-lib",
-  "version": "1.14.4",
+  "version": "1.15.0",
   "description": "XYO Layer One CLI Library",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -55,27 +55,28 @@
     "@xyo-network/archivist-lmdb": "~5.1.2",
     "@xyo-network/archivist-memory": "~5.1.2",
     "@xyo-network/archivist-model": "~5.1.2",
-    "@xyo-network/chain-api": "~1.14.4",
-    "@xyo-network/chain-sdk": "~1.14.4",
+    "@xyo-network/chain-api": "~1.15.0",
+    "@xyo-network/chain-sdk": "~1.15.0",
     "@xyo-network/payload-builder": "~5.1.2",
     "@xyo-network/payload-model": "~5.1.2",
     "@xyo-network/wallet": "~5.1.2",
     "@xyo-network/wallet-model": "~5.1.2",
-    "@xyo-network/xl1-protocol": "~1.12.22",
-    "@xyo-network/xl1-protocol-sdk": "~1.14.4",
+    "@xyo-network/xl1-protocol": "~1.12.32",
+    "@xyo-network/xl1-protocol-sdk": "~1.15.0",
     "async-mutex": "~0.5.0",
     "cosmiconfig": "~9.0.0",
     "dotenv": "~17.2.2",
     "ethers": "~6.15.0",
     "lmdb": "~3.4.2",
     "yargs": "~18.0.0",
-    "zod": "~4.1.5"
+    "zod": "~4.1.8"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "~7.1.7",
     "@xylabs/tsconfig": "~7.1.7",
     "@xylabs/vitest-extended": "~5.0.11",
-    "eslint": "^9.34.0",
+    "@xyo-network/account-model": "~5.1.2",
+    "eslint": "^9.35.0",
     "nodemon": "~3.1.10",
     "rimraf": "~6.0.1",
     "tslib": "~2.8.1",

package/src/optionsFromGlobalZodRegistry.ts

@@ -9,7 +9,7 @@ const usageMetaToOptions = (meta: UsageMeta): Options => {
 
 export const optionsFromGlobalZodRegistry = (): Record<string, Options> => {
   const opts: Record<string, Options> = {}
-  for (const schema of globalRegistry._map.values()) {
+  for (const schema of Object.values(globalRegistry._map)) {
     if (isUsageMeta(schema)) {
       if (schema.hidden) continue // skip hidden options
       opts[schema.title] = usageMetaToOptions(schema)

package/src/orchestration/initServices.ts

@@ -5,7 +5,7 @@ import type { Logger } from '@xylabs/logger'
 import { isDefined } from '@xylabs/typeof'
 import type { BaseBlockProducerServiceParams, XyoValidatorParams } from '@xyo-network/chain-sdk'
 import {
-  balanceSummaryRepositoryFromMap, BaseTimeSyncService, initTelemetry, startupSpanAsync, validateHydratedBlockState,
+  balanceSummaryRepositoryFromMap, initTelemetry, startupSpanAsync, validateHydratedBlockState,
 } from '@xyo-network/chain-sdk'
 import type { ChainServiceCollectionV2, Config } from '@xyo-network/xl1-protocol-sdk'
 
@@ -15,10 +15,12 @@ import {
 } from './archivists/index.ts'
 import type { ChainInitializableParams } from './ChainInitializableParams.ts'
 import { initHealthEndpoints } from './health/index.ts'
-import { initBalanceSummaryMap } from './map/index.ts'
+import { initBalanceSummaryMap, initTransferSummaryMap } from './map/index.ts'
 import {
-  initAccount, initBalanceService, initBlockProducer, initBlockRewardService, initChainIterator, initChainService, initElectionService, initHead,
+  initAccount, initBalanceService, initBlockProducer,
+  initBlockRewardService, initChainIterator, initChainService, initElectionService, initHead,
   initPendingTransactions, initStakeIntentService,
+  initTimeService,
 } from './services/index.ts'
 import { RuntimeStatusMonitor } from './status/index.ts'
 
@@ -81,6 +83,7 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     stakeIntentStateArchivist,
     chainService,
     balanceSummaryMap,
+    transferSummaryMap,
   ] = await Promise.all([
     startupSpanAsync(
       'ChainFinalizedArchivist',
@@ -112,6 +115,10 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
       'BalanceSummaryMap',
       () => initBalanceSummaryMap(initParams),
     ),
+    startupSpanAsync(
+      'TransferSummaryMap',
+      () => initTransferSummaryMap(initParams),
+    ),
   ])
 
   const chainId = chainService.chainId
@@ -164,17 +171,28 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     ),
   ])
 
-  const stakeIntentService = await startupSpanAsync(
-    'StakeIntentService',
-    () => initStakeIntentService({
-      name: 'StakeIntentService' as CreatableName,
-      chainArchivist,
-      chainIterator,
-      chainStakeViewer,
-      stakeIntentStateArchivist,
-      ...initParams,
-    }),
-  )
+  const [stakeIntentService, time] = await Promise.all([
+    startupSpanAsync(
+      'StakeIntentService',
+      () => initStakeIntentService({
+        name: 'StakeIntentService' as CreatableName,
+        chainArchivist,
+        chainIterator,
+        chainStakeViewer,
+        stakeIntentStateArchivist,
+        ...initParams,
+      }),
+    ),
+    startupSpanAsync(
+      'TimeService',
+      () => initTimeService({
+        name: 'TimeService' as CreatableName,
+        chainArchivist,
+        chainIterator,
+        ...initParams,
+      }),
+    ),
+  ])
 
   const electionService = await startupSpanAsync(
     'ElectionService',
@@ -200,8 +218,6 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
     ...initParams,
   }
 
-  const time = await BaseTimeSyncService.create({ chainArchivist, chainIterator })
-
   const rewardAddress = isDefined(config.producer.rewardAddress)
     ? assertEx(asAddress(config.producer.rewardAddress), () => 'Invalid block reward address provided')
     : account.address

package/src/orchestration/map/BalanceSummary/index.ts

@@ -1 +1,2 @@
 export * from './initBalanceSummaryMap.ts'
+export * from './initTransferSummaryMap.ts'

package/src/orchestration/map/BalanceSummary/initBalanceSummaryMap.ts

@@ -7,7 +7,7 @@ import type { BalancesStepSummary } from '@xyo-network/xl1-protocol-sdk'
 import { Mutex } from 'async-mutex'
 
 import type { ChainInitializableParams } from '../../ChainInitializableParams.ts'
-import { initLocalBalanceSummaryMap } from './local.ts'
+import { initLocalBalanceSummaryMap } from './initLocalBalanceSummaryMap.ts'
 
 const mutex = new Mutex()
 let singleton: MapType<Hash, WithStorageMeta<BalancesStepSummary>> | undefined

package/src/orchestration/map/BalanceSummary/initLocalTransferSummaryMap.ts

@@ -0,0 +1,21 @@
+import type { Hash } from '@xylabs/hex'
+import { isDefined } from '@xylabs/typeof'
+import type { MapType } from '@xyo-network/chain-sdk'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
+import type { BalancesStepSummary } from '@xyo-network/xl1-protocol-sdk'
+import { Mutex } from 'async-mutex'
+
+import type { ChainInitializableParams } from '../../ChainInitializableParams.ts'
+import { getLocalPersistentMap } from '../localPersistentMap.ts'
+
+const mutex = new Mutex()
+let singleton: MapType<Hash, WithStorageMeta<BalancesStepSummary>> | undefined
+
+export const initLocalTransferSummaryMap = async (params: ChainInitializableParams): Promise<MapType<Hash, WithStorageMeta<BalancesStepSummary>>> => {
+  return await mutex.runExclusive(async () => {
+    if (isDefined(singleton)) return singleton
+    const { root } = params.config.storage
+    singleton = await getLocalPersistentMap<Hash, WithStorageMeta<BalancesStepSummary>>('transfer', 'summary', root)
+    return singleton
+  })
+}

package/src/orchestration/map/BalanceSummary/initTransferSummaryMap.ts

@@ -0,0 +1,22 @@
+import type { Hash } from '@xylabs/hex'
+import { isDefined } from '@xylabs/typeof'
+import type { MapType } from '@xyo-network/chain-sdk'
+import { startupSpanAsync } from '@xyo-network/chain-sdk'
+import type { WithStorageMeta } from '@xyo-network/payload-model'
+import type { BalancesStepSummary } from '@xyo-network/xl1-protocol-sdk'
+import { Mutex } from 'async-mutex'
+
+import type { ChainInitializableParams } from '../../ChainInitializableParams.ts'
+import { initLocalTransferSummaryMap } from './initLocalTransferSummaryMap.ts'
+
+const mutex = new Mutex()
+let singleton: MapType<Hash, WithStorageMeta<BalancesStepSummary>> | undefined
+
+export async function initTransferSummaryMap(params: ChainInitializableParams): Promise<MapType<Hash, WithStorageMeta<BalancesStepSummary>>> {
+  return await mutex.runExclusive(async () => {
+    if (isDefined(singleton)) return singleton
+    const local = await startupSpanAsync('TransferSummaryMap:initLocal', () => initLocalTransferSummaryMap(params))
+    singleton = local
+    return singleton
+  })
+}

package/src/orchestration/services/implementation/evm/initEvmProvider.ts

@@ -1,6 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import type { Logger } from '@xylabs/logger'
 import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Provider } from 'ethers'
 import type { JsonRpcProvider } from 'ethers/providers'
 
 import { canUseInfuraProvider, initInfuraProvider } from './initInfuraProvider.ts'
@@ -8,7 +9,7 @@ import { canUseJsonRpcProvider, initJsonRpcProvider } from './initJsonRpcProvide
 
 let provider: Promise<JsonRpcProvider> | undefined
 
-export const initEvmProvider = async ({ config }: { config: Config; logger?: Logger }) => {
+export const initEvmProvider = async ({ config }: { config: Config; logger?: Logger }): Promise<Provider> => {
   if (provider) return provider
   if (canUseInfuraProvider(config)) {
     provider = initInfuraProvider(config)

package/src/orchestration/services/implementation/head/createBootstrapHead.ts

@@ -1,8 +1,30 @@
-import { ZERO_ADDRESS } from '@xylabs/hex'
-import { createGenesisBlock } from '@xyo-network/chain-sdk'
+import {
+  buildNextBlock, createDeclarationIntent, createGenesisBlock,
+} from '@xyo-network/chain-sdk'
 import type { WalletInstance } from '@xyo-network/wallet-model'
-import type { HydratedBlock } from '@xyo-network/xl1-protocol'
+import type { ChainService, HydratedBlock } from '@xyo-network/xl1-protocol'
 
-export const createBootstrapHead = async (account: WalletInstance): Promise<HydratedBlock> => {
-  return await createGenesisBlock(account, ZERO_ADDRESS, 10_000_000n, account.address)
+export const createBootstrapHead = async (account: WalletInstance, chainService: ChainService): Promise<HydratedBlock[]> => {
+  const chainId = chainService.chainId
+  const chain: HydratedBlock[] = []
+
+  // Create genesis block
+  const genesisBlock = await createGenesisBlock(account, chainId, 10_000_000n, account.address)
+  chain.push(genesisBlock)
+
+  // Create producer declaration block
+  const producerDeclarationPayload = createDeclarationIntent(
+    account.address,
+    'producer',
+    genesisBlock[0].block,
+    genesisBlock[0].block + 10_000,
+  )
+  const producerDeclarationBlock = await buildNextBlock(
+    genesisBlock[0],
+    [],
+    [producerDeclarationPayload],
+    [account],
+  )
+  chain.push(producerDeclarationBlock)
+  return chain
 }

package/src/orchestration/services/implementation/head/createForkedHead/config/getBridgeDestinationDetails.ts

@@ -7,9 +7,9 @@ import { getForkBlockRewardHex } from './getForkDetails.ts'
 // const bridgeDestAddress = toHex('0xe53218d47913b5f9E58bb74F0a0eD790bbF21972')
 // const destConfirmation = toHex('0x4fa05d7e799f36f1d45c441a4866eb4570a00a753a39377f404a8d113c01a657') // Eth TX for mint
 const ethChainId = toHex('0x1')
-const bridgeableTokenContract = toHex('0x7789e11BB83b398A8Cca8E8D582B33F91499D6f5')
-const bridgeDestAddress = toHex('0xe53218d47913b5f9E58bb74F0a0eD790bbF21972')
-const destConfirmation = toHex('0x772ee028f9ad291ec692912c1a33ecd4409e71383fe06f6ebf39f7cdbb779069') // Eth TX for mint
+const bridgeableTokenContract = toHex('0xf72aE3E0DA743033AbD7A407557D684c1aE66aed')
+const bridgeDestAddress = toHex('0x0e65b65B10C791942665030402c35023d88B14dA')
+const destConfirmation = toHex('0x950861b10523b52cdbb4a9ee52ed26601db555d2652bfec21c709e5e70d5b7d3') // Eth TX for mint
 
 export const getBridgeDestChainId = () => ethChainId
 export const getBridgeDestToken = () => bridgeableTokenContract

package/src/orchestration/services/implementation/head/createForkedHead/getFirstBlockForNewChain.ts

@@ -1,13 +1,13 @@
 import type { BuildNextBlockOptions } from '@xyo-network/chain-sdk'
-import { buildBlock } from '@xyo-network/chain-sdk'
+import {
+  AttoXL1, buildBlock, XYO_STEP_REWARD_ADDRESS,
+} from '@xyo-network/chain-sdk'
 import type { WithHashStorageMeta } from '@xyo-network/payload-model'
 import type { WalletInstance } from '@xyo-network/wallet-model'
 import type {
   BlockBoundWitness, ChainService, HydratedBlock,
 } from '@xyo-network/xl1-protocol'
 
-import { getForkBlockReward } from './config/index.ts'
-
 /**
  * Get the first block for the new forked chain.
  * @param forkBlock The block to fork from
@@ -24,7 +24,6 @@ export const getFirstBlockForNewChain = async (
     _hash: previousBlockHash, block: previousBlockNumber, step_hashes: previousStepHashes, protocol,
   } = forkBlock
   const chainId = chainService.chainId
-  const forkBlockReward = getForkBlockReward()
   const options: BuildNextBlockOptions = {
     blockPayloads: [],
     chainId,
@@ -34,8 +33,8 @@ export const getFirstBlockForNewChain = async (
     signers: [account],
     txs: [],
     protocol,
-    reward: forkBlockReward,
-    rewardAddress: account.address,
+    stepRewardAddress: XYO_STEP_REWARD_ADDRESS,
+    stepRewardPoolBalance: AttoXL1(0n),
   }
   // NOTE: Can not use buildNextBlock because we need to control the chain id change here
   return await buildBlock(options)

package/src/orchestration/services/implementation/head/head.ts

@@ -43,9 +43,10 @@ export const initHead: Initializable<{
      }
    } else {
      // If there is no head, create one
-     const genesisBlock = await createBootstrapHead(account)
-     await submitNewChain([genesisBlock], chainArchivist, chainSubmissionsArchivistWrite)
-     head = genesisBlock[0]
+     const chain = await createBootstrapHead(account, chainService)
+     await submitNewChain(chain, chainArchivist, chainSubmissionsArchivistWrite)
+     const newBlock = assertEx(chain.at(-1), () => new Error('Failed to get new head after genesis'))
+     head = newBlock[0]
    }
    headSingleton = head
    return headSingleton

package/src/orchestration/services/implementation/index.ts

@@ -7,4 +7,5 @@ export * from './iterator.ts'
 export * from './pendingTransactions.ts'
 export * from './producer.ts'
 export * from './reward.ts'
+export * from './time.ts'
 export * from './validator.ts'

package/src/orchestration/services/implementation/time.ts

@@ -0,0 +1,23 @@
+import type { Promisable } from '@xylabs/promise'
+import type { BaseTimeServiceParams } from '@xyo-network/chain-sdk'
+import { BaseTimeSyncService } from '@xyo-network/chain-sdk'
+import type { Initializable, TimeSyncServiceV2 } from '@xyo-network/xl1-protocol'
+
+import { canUseEvmProvider, initEvmProvider } from './evm/index.ts'
+
+let timeSyncServiceSingleton: Promisable<TimeSyncServiceV2> | undefined
+
+export const initTimeService: Initializable<BaseTimeServiceParams, TimeSyncServiceV2> = async ({
+  chainArchivist, chainIterator, config, logger, meterProvider, traceProvider,
+}) => {
+  if (timeSyncServiceSingleton) return timeSyncServiceSingleton
+
+  // Configure provider for optional Ethereum time sync
+  const ethProvider = canUseEvmProvider({ config }) ? await initEvmProvider({ config }) : undefined
+
+  // Create service
+  timeSyncServiceSingleton = BaseTimeSyncService.create({
+    chainArchivist, chainIterator, ethProvider, logger, meterProvider, traceProvider,
+  })
+  return await timeSyncServiceSingleton
+}

package/src/orchestration/services/implementation/transfer.ts

@@ -0,0 +1,13 @@
+import type { Promisable } from '@xylabs/promise'
+import type { BaseAccountTransferServiceParams } from '@xyo-network/chain-sdk'
+import { BaseAccountTransfersService } from '@xyo-network/chain-sdk'
+import type { AccountTransfersService, Initializable } from '@xyo-network/xl1-protocol'
+
+let transferServiceSingleton: Promisable<AccountTransfersService> | undefined
+
+export const initTransferService: Initializable<BaseAccountTransferServiceParams, AccountTransfersService>
+= async (params): Promise<AccountTransfersService> => {
+  if (transferServiceSingleton) return transferServiceSingleton
+  transferServiceSingleton = await BaseAccountTransfersService.create(params)
+  return transferServiceSingleton
+}

package/src/runCLI.ts

@@ -66,6 +66,7 @@ Usage:
 $0 <command> [options]`)
     .parserConfiguration({
       '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
     })
     .env('XL1')

package/dist/node/orchestration/map/BalanceSummary/local.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../../../../src/orchestration/map/BalanceSummary/local.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAGxE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAA;AAMjF,eAAO,MAAM,0BAA0B,GAAU,QAAQ,wBAAwB,KAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAO9I,CAAA"}