@xyo-network/chain-services 1.18.0 → 1.18.1

package/src/StepStake/BaseStepStakeService.ts

@@ -1,22 +1,18 @@
-import {
-  Address, creatable, Promisable,
-} from '@xylabs/sdk-js'
-import { ReadArchivist } from '@xyo-network/archivist-model'
-import { StepIdentity } from '@xyo-network/xl1-protocol'
-import { StepStakeViewer, StepStakeViewerMoniker } from '@xyo-network/xl1-protocol-sdk'
+import type { Address, Promisable } from '@xylabs/sdk-js'
+import type { ReadArchivist } from '@xyo-network/archivist-model'
+import type { StepIdentity, StepStakeViewer } from '@xyo-network/xl1-sdk'
+import { AbstractCreatableProvider, StepStakeViewerMoniker } from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../BaseService.ts'
-import { BaseServiceParams } from '../model/index.ts'
+import type { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseStepStakeServiceParams extends BaseServiceParams {
   chainArchivist: ReadArchivist
 }
 
-@creatable()
-export class BaseStepStakeService extends BaseService<BaseStepStakeServiceParams> implements StepStakeViewer {
+export abstract class AbstractStepStakeService extends AbstractCreatableProvider<BaseStepStakeServiceParams> implements StepStakeViewer {
   static readonly defaultMoniker = StepStakeViewerMoniker
   static readonly monikers = [StepStakeViewerMoniker]
-  moniker = BaseStepStakeService.defaultMoniker
+  override moniker = AbstractStepStakeService.defaultMoniker
 
   stepStake(_step: StepIdentity): Promisable<Record<Address, bigint>> {
     throw new Error('Method [stepStake] not implemented.')

package/src/blockViewerFromChainIteratorAndArchivist.ts

@@ -4,13 +4,14 @@ import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
 import type {
+  BlockRate,
+  BlockViewer, EventingChainBlockNumberIteratorService,
   SignedHydratedBlockWithHashMeta,
   XL1BlockNumber,
-} from '@xyo-network/xl1-protocol'
-import { asSignedBlockBoundWitness, asSignedBlockBoundWitnessWithStorageMeta } from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
 import {
-  type BlockViewer, BlockViewerMoniker, type EventingChainBlockNumberIteratorService,
-} from '@xyo-network/xl1-protocol-sdk'
+  asSignedBlockBoundWitness, asSignedBlockBoundWitnessWithStorageMeta, BlockViewerMoniker,
+} from '@xyo-network/xl1-sdk'
 
 export function blockViewerFromChainIteratorAndArchivist(
   chainIterator: EventingChainBlockNumberIteratorService,
@@ -87,6 +88,15 @@ export function blockViewerFromChainIteratorAndArchivist(
     payloadsByHash: function (_hashes: Hash[]): Promisable<WithHashMeta<Payload>[]> {
       throw new Error('Function not implemented.')
     },
+    rate(..._args): Promisable<BlockRate> {
+      throw new Error('Function not implemented.')
+    },
+    stepSizeRate(..._args) {
+      throw new Error('Function not implemented.')
+    },
+    timeDurationRate(..._args) {
+      throw new Error('Function not implemented.')
+    },
   } satisfies BlockViewer
   return result
 }

package/src/implementation/chain/evm.ts

@@ -2,8 +2,7 @@ import type { Address, Promisable } from '@xylabs/sdk-js'
 import {
   asAddress, assertEx, isDefined, ZERO_ADDRESS,
 } from '@xylabs/sdk-js'
-import type { Initializable } from '@xyo-network/xl1-protocol'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config, Initializable } from '@xyo-network/xl1-sdk'
 import type { ContractRunner } from 'ethers'
 import { Wallet } from 'ethers/wallet'
 

package/src/implementation/chain/index.ts

@@ -1,8 +1,7 @@
 import {
   assertEx, type CreatableName, type Promisable,
 } from '@xylabs/sdk-js'
-import type { Initializable } from '@xyo-network/xl1-protocol'
-import type { ChainService } from '@xyo-network/xl1-protocol-sdk'
+import type { ChainService, Initializable } from '@xyo-network/xl1-sdk'
 
 import { MemoryChainViewer } from '../../ChainService/index.ts'
 import type { BaseAccountableServiceParams } from '../../model/index.ts'

package/src/implementation/evm/initChainId.ts

@@ -1,7 +1,7 @@
 import {
   assertEx, hexFrom, isDefined, isHex,
 } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 
 export const canUseChainId = (config: Pick<Config, 'evm'>): boolean => {
   return isDefined(config.evm.chainId)

package/src/implementation/evm/initEvmProvider.ts

@@ -1,6 +1,6 @@
 import type { Logger } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import type { Provider } from 'ethers'
 import type { JsonRpcProvider } from 'ethers/providers'
 

package/src/implementation/evm/initInfuraProvider.ts

@@ -1,5 +1,5 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import { InfuraProvider } from 'ethers/providers'
 
 import { canUseChainId, getChainId } from './initChainId.ts'

package/src/implementation/evm/initJsonRpcProvider.ts

@@ -1,5 +1,5 @@
 import { assertEx, isDefined } from '@xylabs/sdk-js'
-import type { Config } from '@xyo-network/xl1-protocol-sdk'
+import type { Config } from '@xyo-network/xl1-sdk'
 import { JsonRpcProvider } from 'ethers/providers'
 
 import { canUseChainId, getChainId } from './initChainId.ts'

package/src/implementation/head/createBootstrapHead.ts

@@ -3,8 +3,8 @@ import { buildNextBlock, createGenesisBlock } from '@xyo-network/chain-protocol'
 import type { WalletInstance } from '@xyo-network/wallet-model'
 import type {
   AttoXL1, ChainId, SignedHydratedBlockWithHashMeta,
-} from '@xyo-network/xl1-protocol'
-import { createDeclarationIntent } from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
+import { createDeclarationIntent } from '@xyo-network/xl1-sdk'
 
 export const createBootstrapHead = async (
   account: WalletInstance,

package/src/index.ts

@@ -1,5 +1,4 @@
 export * from './AccountBalance/index.ts'
-export * from './BaseService.ts'
 export * from './BlockReward/index.ts'
 export * from './blockViewerFromChainIteratorAndArchivist.ts'
 export * from './ChainService/index.ts'

package/src/model/Params.ts

@@ -1,6 +1,5 @@
 import type { AccountInstance } from '@xyo-network/account-model'
-import type { OpenTelemetryProviders } from '@xyo-network/xl1-protocol'
-import type { CreatableProviderParams } from '@xyo-network/xl1-protocol-sdk'
+import type { CreatableProviderParams, OpenTelemetryProviders } from '@xyo-network/xl1-sdk'
 
 export interface BaseServiceParams extends CreatableProviderParams, OpenTelemetryProviders {
 

package/src/simple/block/runner/SimpleBlockRunner.ts

@@ -11,33 +11,31 @@ import {
 import { buildNextBlock } from '@xyo-network/chain-protocol'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { WithHashMeta } from '@xyo-network/payload-model'
-import {
-  AllowedBlockPayload, asBlockBoundWitness, AttoXL1, BlockBoundWitness, BlockNumberPayload, BlockNumberSchema,
-  ChainStakeIntent, defaultRewardRatio, SignedBlockBoundWitnessWithHashMeta,
-  SignedHydratedBlockWithHashMeta, SignedHydratedTransaction,
-  Transfer, XYO_STEP_REWARD_ADDRESS,
-} from '@xyo-network/xl1-protocol'
 import {
   AbstractCreatableProvider,
   AccountBalanceViewer,
   AccountBalanceViewerMoniker,
+  AllowedBlockPayload, asBlockBoundWitness, AttoXL1, BlockBoundWitness, BlockNumberPayload, BlockNumberSchema,
   BlockRewardViewer,
   BlockRewardViewerMoniker,
   BlockRunner,
   BlockRunnerMoniker,
   BlockValidationViewer,
   BlockValidationViewerMoniker,
-  creatableProvider,
+  ChainStakeIntent, creatableProvider,
   CreatableProviderParams,
   createDeclarationIntent,
-  HydratedBlockStateValidationFunction,
+  defaultRewardRatio, HydratedBlockStateValidationFunction,
   MempoolRunner,
   MempoolRunnerMoniker,
   MempoolViewer,
   MempoolViewerMoniker,
+  SignedBlockBoundWitnessWithHashMeta,
+  SignedHydratedBlockWithHashMeta, SignedHydratedTransaction,
   TimeSyncViewer,
   TimeSyncViewerMoniker,
-} from '@xyo-network/xl1-protocol-sdk'
+  Transfer, XYO_STEP_REWARD_ADDRESS,
+} from '@xyo-network/xl1-sdk'
 
 import { generateTransactionFeeTransfers } from './generateTransactionFeeTransfers.ts'
 
@@ -67,6 +65,15 @@ export type SimpleBlockRunnerParams = CreatableProviderParams & {
 @creatableProvider()
 export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunnerParams> implements BlockRunner {
   static readonly defaultMoniker = BlockRunnerMoniker
+  static readonly dependencies = [
+    AccountBalanceViewerMoniker,
+    BlockRewardViewerMoniker,
+    BlockValidationViewerMoniker,
+    MempoolRunnerMoniker,
+    MempoolViewerMoniker,
+    TimeSyncViewerMoniker,
+  ]
+
   static readonly monikers = [BlockRunnerMoniker]
   moniker = SimpleBlockRunner.defaultMoniker
 
@@ -148,7 +155,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   }
 
   protected get rewardAddress(): Address {
-    return assertEx(this.params.rewardAddress, () => 'No reward address provided')
+    return this._rewardAddress!
   }
 
   // protected get stakeIntentService(): StakeIntentService {
@@ -166,13 +173,13 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
   override async createHandler() {
     this._rejectedTransactionsArchivist = this.params.rejectedTransactionsArchivist ?? await MemoryArchivist.create()
     this._account = assertEx(this.params.account, () => 'Account is required')
-    this._rewardAddress = assertEx(this.params.rewardAddress, () => 'No reward address provided')
     this._address = this.account.address
     this._accountBalanceViewer = await this.locateAndCreate<AccountBalanceViewer>(AccountBalanceViewerMoniker)
     this._blockRewardViewer = await this.locateAndCreate<BlockRewardViewer>(BlockRewardViewerMoniker)
     this._blockValidationViewer = await this.locator.getInstance<BlockValidationViewer>(BlockValidationViewerMoniker)
     this._mempoolRunner = await this.locateAndCreate<MempoolRunner>(MempoolRunnerMoniker)
     this._mempoolViewer = await this.locateAndCreate<MempoolViewer>(MempoolViewerMoniker)
+    this._rewardAddress = this.params.rewardAddress ?? this.context.config.producer.rewardAddress
     this._timeSyncViewer = await this.locateAndCreate<TimeSyncViewer>(TimeSyncViewerMoniker)
   }
 
@@ -268,7 +275,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
 
         const transactionTransfers = await generateTransactionFeeTransfers(this.address, nextBlockTransactions)
         const timeStart = Date.now()
-        const timePayload = await this.generateTimePayload(head)
+        const timePayload = await this.generateTimePayload()
         const timeDuration = Date.now() - timeStart
         if (timeDuration > 100) {
           this.logger?.warn(`[Slow] Generated time payload in ${timeDuration}ms`)
@@ -334,7 +341,7 @@ export class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunn
     return [fundedTransactions, fundedTransfers]
   }
 
-  private async generateTimePayload(head: WithHashMeta<BlockBoundWitness>) {
+  private async generateTimePayload() {
     return await this.timeSyncViewer.currentTimePayload()
   }
 

package/src/simple/block/runner/generateTransactionFeeTransfers.ts

@@ -5,10 +5,11 @@ import type {
   SignedHydratedTransaction,
   Transfer,
   XL1,
-} from '@xyo-network/xl1-protocol'
-import { TransferSchema, XYO_ZERO_ADDRESS } from '@xyo-network/xl1-protocol'
-import { transactionRequiredGas } from '@xyo-network/xl1-protocol-sdk'
-import { HydratedTransactionWrapper } from '@xyo-network/xl1-wrappers'
+} from '@xyo-network/xl1-sdk'
+import {
+  HydratedTransactionWrapper,
+  transactionRequiredGas, TransferSchema, XYO_ZERO_ADDRESS,
+} from '@xyo-network/xl1-sdk'
 
 export async function generateTransactionFeeTransfers(address: Address, transactions: SignedHydratedTransaction[]): Promise<Transfer[]> {
   const txs = await Promise.all(transactions.map(async (tx) => {

package/dist/neutral/BaseService.d.ts

@@ -1,19 +0,0 @@
-import type { EventData, Promisable } from '@xylabs/sdk-js';
-import { AbstractCreatableProvider } from '@xyo-network/xl1-protocol-sdk';
-import type { BaseAccountableServiceParams, BaseServiceParams } from './model/index.ts';
-declare global {
-    var xyoServiceSingletons: Record<string, unknown>;
-}
-export declare class BaseService<TParams extends BaseServiceParams = BaseServiceParams, TEventData extends EventData = EventData> extends AbstractCreatableProvider<TParams, TEventData> {
-    private static singletonInitMutex;
-    static get singletons(): Record<string, unknown>;
-    static initSingleton<TService extends BaseService<TParams>, TParams extends BaseServiceParams>(params: Partial<TParams>): Promise<TService>;
-}
-export declare abstract class BaseAccountableService<TParams extends BaseAccountableServiceParams = BaseAccountableServiceParams> extends BaseService<TParams> {
-}
-export interface CreatableService<T extends BaseService = BaseService> {
-    new (params: T['params']): T;
-    create<T extends BaseService>(this: CreatableService<T>, params?: Partial<T['params']>): Promisable<T>;
-}
-export declare function creatableService<T extends BaseService = BaseService>(): <U extends CreatableService<T>>(constructor: U) => void;
-//# sourceMappingURL=BaseService.d.ts.map

package/dist/neutral/BaseService.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BaseService.d.ts","sourceRoot":"","sources":["../../src/BaseService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AAGzE,OAAO,KAAK,EAAE,4BAA4B,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEvF,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClD;AAED,qBACa,WAAW,CAAC,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,UAAU,SAAS,SAAS,GAAG,SAAS,CACtH,SAAQ,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC;IACtD,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAc;IAE/C,MAAM,KAAK,UAAU,4BAEpB;IAED,MAAM,CAAC,aAAa,CAAC,QAAQ,SAAS,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,SAAS,iBAAiB,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC;CAMxH;AAED,8BAAsB,sBAAsB,CAC1C,OAAO,SAAS,4BAA4B,GAAG,4BAA4B,CAC3E,SAAQ,WAAW,CAAC,OAAO,CAAC;CAE7B;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW;IACnE,KAAI,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAC3B,MAAM,CAAC,CAAC,SAAS,WAAW,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;CACvG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,WAAW,GAAG,WAAW,MAC1D,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,UAItD"}

package/src/BaseService.ts

@@ -1,45 +0,0 @@
-import type { EventData, Promisable } from '@xylabs/sdk-js'
-import { creatable } from '@xylabs/sdk-js'
-import { AbstractCreatableProvider } from '@xyo-network/xl1-protocol-sdk'
-import { Mutex } from 'async-mutex'
-
-import type { BaseAccountableServiceParams, BaseServiceParams } from './model/index.ts'
-
-declare global {
-  var xyoServiceSingletons: Record<string, unknown>
-}
-
-@creatable()
-export class BaseService<TParams extends BaseServiceParams = BaseServiceParams, TEventData extends EventData = EventData>
-  extends AbstractCreatableProvider<TParams, TEventData> {
-  private static singletonInitMutex = new Mutex()
-
-  static get singletons() {
-    return globalThis['xyoServiceSingletons'] ?? (globalThis['xyoServiceSingletons'] = {})
-  }
-
-  static initSingleton<TService extends BaseService<TParams>, TParams extends BaseServiceParams>(params: Partial<TParams>) {
-    if (this.singletons[this.name]) throw new Error(`Singleton already initialized for ${this.name}`)
-    return this.singletonInitMutex.runExclusive(async () => {
-      return await this.create(params) as TService
-    })
-  }
-}
-
-export abstract class BaseAccountableService<
-  TParams extends BaseAccountableServiceParams = BaseAccountableServiceParams,
-> extends BaseService<TParams> {
-  // Base class for services that have an account
-}
-
-export interface CreatableService<T extends BaseService = BaseService> {
-  new(params: T['params']): T
-  create<T extends BaseService>(this: CreatableService<T>, params?: Partial<T['params']>): Promisable<T>
-}
-
-export function creatableService<T extends BaseService = BaseService>() {
-  return <U extends CreatableService<T>>(constructor: U) => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    constructor
-  }
-}