@xyo-network/chain-producer 1.18.0 → 1.18.1

package/dist/node/ProducerActor.d.ts

@@ -1,9 +1,10 @@
 import type { Attributes, Counter } from '@opentelemetry/api';
-import type { CreatableName } from '@xylabs/sdk-js';
-import { Actor, type ActorParams } from '@xyo-network/chain-orchestration';
-import type { ChainStakeIntent, HydratedBlockWithHashMeta, XL1BlockNumber } from '@xyo-network/xl1-protocol';
-import { AccountBalanceViewer, BlockRunner, BlockViewer, MempoolRunner, MempoolViewer, StakeTotalsViewer } from '@xyo-network/xl1-protocol-sdk';
-export type ProducerActorParams = ActorParams;
+import type { Address } from '@xylabs/sdk-js';
+import type { ChainStakeIntent, HydratedBlockWithHashMeta, XL1BlockNumber } from '@xyo-network/xl1-sdk';
+import { AccountBalanceViewer, Actor, ActorParams, BlockRunner, BlockViewer, MempoolRunner, MempoolViewer, StakeTotalsViewer } from '@xyo-network/xl1-sdk';
+export type ProducerActorParams = ActorParams<{
+    rewardAddress: Address;
+}>;
 export declare class ProducerActor extends Actor<ProducerActorParams> {
     static readonly RedeclarationWindow = 10000;
     protected _lastProducedBlock?: HydratedBlockWithHashMeta;
@@ -23,119 +24,37 @@ export declare class ProducerActor extends Actor<ProducerActorParams> {
     private _stakeTotalsViewer?;
     protected get accountBalanceViewer(): AccountBalanceViewer;
     protected get blockRunner(): BlockRunner;
-    protected get blockViewer(): BlockViewer;
-    protected get chainId(): import("@xylabs/sdk-js").Hex;
+    protected get blockViewer(): BlockViewer<"BlockViewer">;
+    protected get chainId(): import("@xylabs/sdk-js").BrandedHex;
     protected get mempoolRunner(): MempoolRunner;
     protected get mempoolViewer(): MempoolViewer;
+    protected get rewardAddress(): Lowercase<string> & {
+        readonly __hex: true;
+    } & {
+        readonly __address: true;
+    };
     protected get stakeTotalsViewer(): StakeTotalsViewer;
-    static paramsHandler<T extends ActorParams>(params?: Partial<T>): Promise<{
-        account: T["account"] | import("@xyo-network/wallet-model").WalletInstance;
-        context: T["context"] | {
-            config: {
-                api: {
-                    host: string;
-                    initRewardsCache: boolean;
-                    port: number;
-                    mnemonic?: string | undefined;
-                };
-                bridge: {
-                    chainRpcApiUrl: string;
-                    feeFixed: import("@xylabs/sdk-js").Hex;
-                    feeRateBasisPoints: number;
-                    host: string;
-                    maxBridgeAmount: import("@xylabs/sdk-js").Hex;
-                    minBridgeAmount: import("@xylabs/sdk-js").Hex;
-                    port: number;
-                    redisHost: string;
-                    redisPort: number;
-                    remoteBridgeContractAddress: import("@xylabs/sdk-js").Address;
-                    remoteChainId: import("@xylabs/sdk-js").Hex;
-                    remoteTokenAddress: import("@xylabs/sdk-js").Hex;
-                    remoteChainWalletPrivateKey: import("@xylabs/sdk-js").Hex;
-                    escrowAddress?: import("@xylabs/sdk-js").Address | undefined;
-                    feesAddress?: import("@xylabs/sdk-js").Address | undefined;
-                    mnemonic?: string | undefined;
-                    xl1ChainId?: import("@xylabs/sdk-js").Hex | undefined;
-                    xl1TokenAddress?: import("@xylabs/sdk-js").Hex | undefined;
-                };
-                chain: {
-                    id?: import("@xylabs/sdk-js").Hex | undefined;
-                    genesisRewardAddress?: import("@xylabs/sdk-js").Address | undefined;
-                };
-                evm: {
-                    chainId?: string | undefined;
-                    infura?: {
-                        projectId?: string | undefined;
-                        projectSecret?: string | undefined;
-                    } | undefined;
-                    jsonRpc?: {
-                        url?: string | undefined;
-                    } | undefined;
-                };
-                mempool: {
-                    enabled: boolean;
-                    host: string;
-                    port: number;
-                    mnemonic?: string | undefined;
-                };
-                producer: {
-                    heartbeatInterval: number;
-                    minStake: number;
-                    port: number;
-                    allowlist?: import("@xylabs/sdk-js").Address[] | undefined;
-                    disableIntentRedeclaration?: boolean | undefined;
-                    healthCheckPort?: number | undefined;
-                    mnemonic?: string | undefined;
-                    rewardAddress?: string | undefined;
-                };
-                rewardRedemptionApi: {
-                    chainRpcApiUrl: string;
-                    host: string;
-                    port: number;
-                    mnemonic?: string | undefined;
-                };
-                services: {
-                    accountBalanceViewerEndpoint: string;
-                    apiEndpoint: string;
-                };
-                storage: {
-                    mongo?: {
-                        connectionString?: string | undefined;
-                        database?: string | undefined;
-                        domain?: string | undefined;
-                        password?: string | undefined;
-                        username?: string | undefined;
-                    } | undefined;
-                    root?: string | undefined;
-                };
-                telemetry: {
-                    metrics?: {
-                        scrape: {
-                            path: string;
-                            port: number;
-                        };
-                    } | undefined;
-                    otel?: {
-                        otlpEndpoint?: string | undefined;
-                    } | undefined;
-                };
-                validation: {
-                    allowedRewardRedeemers?: import("@xylabs/sdk-js").Address[] | undefined;
-                    allowedRewardEscrowAccountSigners?: import("@xylabs/sdk-js").Address[] | undefined;
-                };
-                logLevel: "info" | "error" | "warn" | "log" | "debug" | "trace";
-                silent: boolean;
-            };
-            locator: import("@xyo-network/xl1-protocol-sdk").ProviderFactoryLocator;
+    static paramsHandler<T extends ProducerActor>(params?: Partial<T['params']>): Promise<{
+        rewardAddress: Lowercase<string> & {
+            readonly __hex: true;
+        } & {
+            readonly __address: true;
         };
-        displayName: CreatableName | NonNullable<T["displayName"]> | undefined;
-        id: CreatableName | T["id"] | undefined;
-        logger: import("@xylabs/sdk-js").Logger;
         name?: import("@xylabs/sdk-js").CreatableName;
         statusReporter?: import("@xylabs/sdk-js").CreatableStatusReporter<void> | undefined;
+        logger: import("@xylabs/sdk-js").Logger;
         meterProvider?: import("@opentelemetry/api").MeterProvider;
         traceProvider?: import("@opentelemetry/api").TracerProvider;
+        account: import("@xyo-network/account-model").AccountInstance;
+        context: import("@xyo-network/xl1-sdk").ActorContext;
+        displayName: string | (string & {
+            __baseClassName: true;
+        }) | undefined;
+        id: string | (string & {
+            __baseClassName: true;
+        });
     }>;
+    protected static initContext(params: ProducerActorParams): Promise<import("@xyo-network/xl1-sdk").CreatableProviderContext>;
     createHandler(): Promise<void>;
     startHandler(): Promise<void>;
     protected calculateBlocksUntilProducerDeclarationExpiration(currentBlock: number): number;

package/dist/node/ProducerActor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProducerActor.d.ts","sourceRoot":"","sources":["../../src/ProducerActor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProducerActor.d.ts","sourceRoot":"","sources":["../../src/ProducerActor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAQ7C,OAAO,KAAK,EAEV,gBAAgB,EAAE,yBAAyB,EAC3C,cAAc,EACf,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,oBAAoB,EAA+B,KAAK,EAAE,WAAW,EACrE,WAAW,EACX,WAAW,EAKO,aAAa,EAE/B,aAAa,EAIb,iBAAiB,EAGlB,MAAM,sBAAsB,CAAA;AAG7B,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAC5C,aAAa,EAAE,OAAO,CAAA;CACvB,CAAC,CAAA;AAKF,qBACa,aAAc,SAAQ,KAAK,CAAC,mBAAmB,CAAC;IAC3D,MAAM,CAAC,QAAQ,CAAC,mBAAmB,SAAS;IAE5C,SAAS,CAAC,kBAAkB,CAAC,EAAE,yBAAyB,CAAA;IACxD,SAAS,CAAC,wBAAwB,CAAC,EAAE,gBAAgB,CAAA;IACrD,SAAS,CAAC,iBAAiB,CAAC,EAAE,UAAU,CAAA;IACxC,SAAS,CAAC,qCAAqC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;IACrE,SAAS,CAAC,mCAAmC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;IACnE,SAAS,CAAC,4BAA4B,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;IAC5D,SAAS,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA;IAE7D,OAAO,CAAC,qBAAqB,CAAC,CAAsB;IACpD,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,YAAY,CAAC,CAAa;IAClC,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAC,CAAe;IAEtC,OAAO,CAAC,kBAAkB,CAAc;IAExC,OAAO,CAAC,kBAAkB,CAAC,CAAmB;IAE9C,SAAS,KAAK,oBAAoB,yBAEjC;IAED,SAAS,KAAK,WAAW,gBAExB;IAED,SAAS,KAAK,WAAW,+BAExB;IAED,SAAS,KAAK,OAAO,wCAEpB;IAED,SAAS,KAAK,aAAa,kBAE1B;IAED,SAAS,KAAK,aAAa,kBAE1B;IAED,SAAS,KAAK,aAAa;;;;MAE1B;IAED,SAAS,KAAK,iBAAiB,sBAE9B;WAEqB,aAAa,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;qBAwB1D,WAAW,CACzC,MAAM,EAAE,mBAAmB;IAqBd,aAAa;IAgDb,YAAY;IAe3B,SAAS,CAAC,iDAAiD,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;cAIzE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;cAwC7B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;cAiEhC,yBAAyB,CAAC,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;cAkB7G,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;cAe1C,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;CAWzD"}

package/dist/node/index.mjs

@@ -2,11 +2,11 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/ProducerActor.ts
-import { creatable, isDefined, isUndefined, toHex } from "@xylabs/sdk-js";
-import { Actor, initProducerAccount } from "@xyo-network/chain-orchestration";
+import { assertEx, creatable, isDefined, isUndefined, toHex } from "@xylabs/sdk-js";
+import { initProducerAccount } from "@xyo-network/chain-orchestration";
 import { SimpleBlockRunner } from "@xyo-network/chain-services";
-import { asXL1BlockNumber } from "@xyo-network/xl1-protocol";
-import { AccountBalanceViewerMoniker, BlockRunnerMoniker, BlockViewerMoniker, buildTransaction, createDeclarationIntent, getDefaultConfig, MempoolRunnerMoniker, MempoolViewerMoniker, StakeTotalsViewerMoniker } from "@xyo-network/xl1-protocol-sdk";
+import { validateHydratedBlock, validateHydratedBlockState } from "@xyo-network/chain-validation";
+import { AccountBalanceViewerMoniker, Actor, asXL1BlockNumber, BlockRunnerMoniker, BlockViewerMoniker, buildJsonRpcProviderLocator, buildTransaction, createDeclarationIntent, getDefaultConfig, HttpRpcTransport, MempoolRunnerMoniker, MempoolViewerMoniker, SimpleBlockRewardViewer, SimpleBlockValidationViewer, StakeTotalsViewerMoniker } from "@xyo-network/xl1-sdk";
 import { Mutex } from "async-mutex";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -55,19 +55,55 @@ var ProducerActor = class _ProducerActor extends Actor {
   get mempoolViewer() {
     return this._mempoolViewer;
   }
+  get rewardAddress() {
+    return this.params.rewardAddress;
+  }
   get stakeTotalsViewer() {
     return this._stakeTotalsViewer;
   }
   static async paramsHandler(params) {
+    const logger = params?.context?.logger;
     const config = params?.context?.config ?? getDefaultConfig();
+    const displayName = params?.displayName ?? "ProducerActor";
     const account = params?.account ?? await initProducerAccount({
       config
     });
-    return await super.paramsHandler({
-      ...params,
-      name: params?.name ?? "Producer",
-      account
+    const id = account?.address.toString() ?? "unknown";
+    logger?.info(`Running producer for account ${account.address}`);
+    const rewardAddress = params?.rewardAddress ?? account.address;
+    logger?.info(`Using reward address ${rewardAddress}`);
+    if (rewardAddress === account.address) {
+      logger?.warn(`Using producer account address as reward address: ${account.address}`);
+    }
+    return {
+      ...await super.paramsHandler({
+        ...params,
+        account,
+        displayName,
+        id
+      }),
+      rewardAddress
+    };
+  }
+  static async initContext(params) {
+    const config = params?.context?.config ?? getDefaultConfig();
+    const endpoint = assertEx(config.services.apiEndpoint, () => "API endpoint is required in config.services.apiEndpoint");
+    const context = await super.initContext(params);
+    const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(endpoint, schemas), "transportFactory");
+    const locator = await buildJsonRpcProviderLocator({
+      context,
+      transportFactory
     });
+    locator.register(SimpleBlockRewardViewer.factory(SimpleBlockRewardViewer.dependencies));
+    locator.register(SimpleBlockValidationViewer.factory(SimpleBlockValidationViewer.dependencies, {
+      state: validateHydratedBlockState,
+      protocol: validateHydratedBlock
+    }));
+    locator.register(SimpleBlockRunner.factory(SimpleBlockRunner.dependencies, {
+      account: params.account,
+      rewardAddress: params.rewardAddress
+    }));
+    return locator.context;
   }
   async createHandler() {
     await super.createHandler();
@@ -86,12 +122,12 @@ var ProducerActor = class _ProducerActor extends Actor {
     this._producerActorBlocksPublished = this.meter?.createCounter("producer_actor_blocks_published", {
       description: "Number of blocks published"
     });
-    this._accountBalanceViewer = await this.locator.getInstance(AccountBalanceViewerMoniker);
-    this._blockRunner = await this.locator.getInstance(BlockRunnerMoniker);
-    this._blockViewer = await this.locator.getInstance(BlockViewerMoniker);
-    this._mempoolRunner = await this.locator.getInstance(MempoolRunnerMoniker);
-    this._mempoolViewer = await this.locator.getInstance(MempoolViewerMoniker);
-    this._stakeTotalsViewer = await this.locator.getInstance(StakeTotalsViewerMoniker);
+    this._accountBalanceViewer = assertEx(await this.locator?.getInstance(AccountBalanceViewerMoniker), () => "Unable to locate AccountBalanceViewer");
+    this._blockRunner = assertEx(await this.locator?.getInstance(BlockRunnerMoniker), () => "Unable to locate BlockRunner");
+    this._blockViewer = assertEx(await this.locator?.getInstance(BlockViewerMoniker), () => "Unable to locate BlockViewer");
+    this._mempoolRunner = assertEx(await this.locator?.getInstance(MempoolRunnerMoniker), () => "Unable to locate MempoolRunner");
+    this._mempoolViewer = assertEx(await this.locator?.getInstance(MempoolViewerMoniker), () => "Unable to locate MempoolViewer");
+    this._stakeTotalsViewer = assertEx(await this.locator?.getInstance(StakeTotalsViewerMoniker), () => "Unable to locate StakeTotalsViewer");
   }
   async startHandler() {
     await super.startHandler();
@@ -216,54 +252,24 @@ ProducerActor = _ts_decorate([
 ], ProducerActor);
 
 // src/runProducer.ts
-import { asAddress, assertEx, exists } from "@xylabs/sdk-js";
+import { asAddress, exists, IdLogger } from "@xylabs/sdk-js";
 import { initProducerAccount as initProducerAccount2 } from "@xyo-network/chain-orchestration";
-import { validateHydratedBlock, validateHydratedBlockState } from "@xyo-network/chain-validation";
-import { SimpleBlockRunner as SimpleBlockRunner2 } from "@xyo-network/chain-services";
-import { SimpleBlockRewardViewer, SimpleBlockValidationViewer } from "@xyo-network/xl1-protocol-sdk";
-import { buildJsonRpcProviderLocator } from "@xyo-network/xl1-providers";
-import { HttpRpcTransport } from "@xyo-network/xl1-rpc";
-var getProviderFactoryLocator = /* @__PURE__ */ __name(async (context, account, rewardAddress) => {
-  const endpoint = assertEx(context.config.services.apiEndpoint, () => "API endpoint is required in config.services.apiEndpoint");
-  const transportFactory = /* @__PURE__ */ __name((schemas) => new HttpRpcTransport(endpoint, schemas), "transportFactory");
-  const locator = await buildJsonRpcProviderLocator({
-    context,
-    transportFactory
-  });
-  locator.register(SimpleBlockRewardViewer.factory());
-  locator.register(SimpleBlockValidationViewer.factory({
-    state: validateHydratedBlockState,
-    value: validateHydratedBlock
-  }));
-  locator.register(SimpleBlockRunner2.factory({
-    account,
-    rewardAddress
-  }));
-  return locator;
-}, "getProviderFactoryLocator");
-var runProducer = /* @__PURE__ */ __name(async ({ config, logger, orchestrator }) => {
+var runProducer = /* @__PURE__ */ __name(async ({ config, logger, orchestrator, locator }) => {
+  const localLogger = logger ?? new IdLogger(logger ?? console, () => "ResolveHelper [runProducer]");
   const account = await initProducerAccount2({
     config
   });
-  logger.info(`Running producer for account ${account.address}`);
+  localLogger.info(`Running producer for account ${account.address}`);
   const rewardAddress = asAddress(config.producer.rewardAddress, () => "rewardAddress is required in config.producer");
-  logger.info(`Using reward address ${rewardAddress}`);
-  const locator = await getProviderFactoryLocator({
-    config,
+  localLogger.info(`Using reward address ${rewardAddress}`);
+  const producer = await ProducerActor.create({
     logger,
-    singletons: {}
-  }, account, rewardAddress);
-  const context = {
-    locator,
-    config,
-    singletons: locator.context.singletons
-  };
-  const params = {
-    id: "ProducerActor",
-    context,
-    account
-  };
-  const producer = await ProducerActor.create(params);
+    context: {
+      config,
+      locator,
+      singletons: {}
+    }
+  });
   const actors = [
     producer
   ].filter(exists);

package/dist/node/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/ProducerActor.ts","../../src/runProducer.ts"],"sourcesContent":["import type { Attributes, Counter } from '@opentelemetry/api'\nimport type { CreatableName } from '@xylabs/sdk-js'\nimport {\n  creatable, isDefined, isUndefined, toHex,\n} from '@xylabs/sdk-js'\nimport {\n  Actor, type ActorParams, initProducerAccount,\n} from '@xyo-network/chain-orchestration'\nimport { SimpleBlockRunner } from '@xyo-network/chain-services'\nimport type {\n  ChainId,\n  ChainStakeIntent, HydratedBlockWithHashMeta,\n  XL1BlockNumber,\n} from '@xyo-network/xl1-protocol'\nimport { asXL1BlockNumber } from '@xyo-network/xl1-protocol'\nimport {\n  AccountBalanceViewer, AccountBalanceViewerMoniker, BlockRunner, BlockRunnerMoniker,\n  BlockViewer, BlockViewerMoniker, buildTransaction,\n  Config,\n  createDeclarationIntent,\n  getDefaultConfig,\n  MempoolRunner,\n  MempoolRunnerMoniker,\n  MempoolViewer,\n  MempoolViewerMoniker,\n  StakeTotalsViewer,\n  StakeTotalsViewerMoniker,\n} from '@xyo-network/xl1-protocol-sdk'\nimport { Mutex } from 'async-mutex'\n\nexport type ProducerActorParams = ActorParams\n\nconst SHOULD_REGISTER_REDECLARATION_INTENT_TIMER = true\nconst TEN_MINUTES = 10 * 60 * 1000 // 10 minutes in milliseconds\n\n@creatable()\nexport class ProducerActor extends Actor<ProducerActorParams> {\n  static readonly RedeclarationWindow = 10_000\n\n  protected _lastProducedBlock?: HydratedBlockWithHashMeta\n  protected _lastRedeclarationIntent?: ChainStakeIntent\n  protected _metricAttributes?: Attributes\n  protected _producerActorBlockProductionAttempts?: Counter<Attributes>\n  protected _producerActorBlockProductionChecks?: Counter<Attributes>\n  protected _producerActorBlocksProduced?: Counter<Attributes>\n  protected _producerActorBlocksPublished?: Counter<Attributes>\n\n  private _accountBalanceViewer?: AccountBalanceViewer\n  private _blockRunner?: BlockRunner\n  private _blockViewer?: BlockViewer\n  private _chainId?: ChainId\n  private _mempoolRunner?: MempoolRunner\n  private _mempoolViewer?: MempoolViewer\n\n  private _produceBlockMutex = new Mutex()\n\n  private _stakeTotalsViewer?: StakeTotalsViewer\n\n  protected get accountBalanceViewer() {\n    return this._accountBalanceViewer!\n  }\n\n  protected get blockRunner() {\n    return this._blockRunner!\n  }\n\n  protected get blockViewer() {\n    return this._blockViewer!\n  }\n\n  protected get chainId() {\n    return this._chainId!\n  }\n\n  protected get mempoolRunner() {\n    return this._mempoolRunner!\n  }\n\n  protected get mempoolViewer() {\n    return this._mempoolViewer!\n  }\n\n  protected get stakeTotalsViewer() {\n    return this._stakeTotalsViewer!\n  }\n\n  static override async paramsHandler<T extends ActorParams>(params?: Partial<T>) {\n    const config: Config = params?.context?.config ?? getDefaultConfig()\n    const account = params?.account ?? await initProducerAccount({ config })\n    return await super.paramsHandler({\n      ...params, name: (params?.name ?? 'Producer') as CreatableName, account,\n    })\n  }\n\n  override async createHandler() {\n    await super.createHandler()\n    // Create the consistent meter attributes that will\n    // be included with all metrics from this actor\n    this._metricAttributes = { address: this.account.address.toString() }\n    // Create the metrics\n    this._producerActorBlockProductionChecks = this.meter?.createCounter(\n      'producer_actor_block_production_checks',\n      { description: 'Number of block production checks' },\n    )\n    this._producerActorBlockProductionAttempts = this.meter?.createCounter(\n      'producer_actor_block_production_attempts',\n      { description: 'Number of block production attempts' },\n    )\n    this._producerActorBlocksProduced = this.meter?.createCounter(\n      'producer_actor_blocks_produced',\n      { description: 'Number of blocks produced' },\n    )\n    this._producerActorBlocksPublished = this.meter?.createCounter(\n      'producer_actor_blocks_published',\n      { description: 'Number of blocks published' },\n    )\n    this._accountBalanceViewer = await this.locator.getInstance<AccountBalanceViewer>(AccountBalanceViewerMoniker)\n    this._blockRunner = await this.locator.getInstance<BlockRunner>(BlockRunnerMoniker)\n    this._blockViewer = await this.locator.getInstance<BlockViewer>(BlockViewerMoniker)\n    this._mempoolRunner = await this.locator.getInstance<MempoolRunner>(MempoolRunnerMoniker)\n    this._mempoolViewer = await this.locator.getInstance<MempoolViewer>(MempoolViewerMoniker)\n    this._stakeTotalsViewer = await this.locator.getInstance<StakeTotalsViewer>(StakeTotalsViewerMoniker)\n  }\n\n  override async startHandler() {\n    await super.startHandler()\n    // Register a timer to check if we should produce a block\n    this.registerTimer('BlockProductionTimer', async () => {\n      await this.produceBlock()\n    }, 2000, 1500/* 500 */)\n\n    if (SHOULD_REGISTER_REDECLARATION_INTENT_TIMER) {\n      // Register a timer to check if we should redeclare the producer\n      this.registerTimer('ProducerRedeclarationTimer', async () => {\n        await this.redeclareIntent()\n      }, TEN_MINUTES, TEN_MINUTES)\n    }\n  }\n\n  protected calculateBlocksUntilProducerDeclarationExpiration(currentBlock: number): number {\n    return (this._lastRedeclarationIntent?.exp ?? currentBlock) - currentBlock\n  }\n\n  protected async produceBlock(): Promise<void> {\n    this._producerActorBlockProductionChecks?.add(1, this._metricAttributes)\n    await this.spanAsync('produceBlock', async () => {\n      if (this._produceBlockMutex.isLocked()) {\n        this.logger?.log('Skipping block production, previous production still in progress')\n        return\n      }\n\n      await this._produceBlockMutex.runExclusive(async () => {\n      // Get the updated head\n        const head = (await this.blockViewer.currentBlock())[0]\n        // Check if we've already produced the next block for this head\n        const headHash = head._hash\n        // If our last produced block was the next block for the current head, we do not\n        // need to produce another. This prevents duplicate blocks from being produced\n        if (this._lastProducedBlock && this._lastProducedBlock[0].previous === headHash) {\n          this.logger?.log('Block already produced:', `0x${toHex(this._lastProducedBlock[0].block)}`, this._lastProducedBlock[0].block)\n        } else {\n          this._producerActorBlockProductionAttempts?.add(1, this._metricAttributes)\n          // Produce the next block\n          const nextBlock = await this.blockRunner.next(head)\n          // If it was produced\n          if (nextBlock) {\n            const displayBlockNumber = `0x${toHex(nextBlock[0].block)}`\n            this.logger?.log('Produced block:', displayBlockNumber)\n            this._producerActorBlocksProduced?.add(1, this._metricAttributes)\n            // Insert the block into the chain\n            await this.mempoolRunner.submitBlocks([nextBlock])\n            this.logger?.log('Published block:', displayBlockNumber, nextBlock[0].block)\n            this._producerActorBlocksPublished?.add(1, this._metricAttributes)\n            // Record that we have produced a block so we do not produce it again\n            this._lastProducedBlock = nextBlock\n          } else {\n            this.logger?.log('No block produced at this time.')\n          }\n        }\n      })\n    })\n  }\n\n  protected async redeclareIntent(): Promise<void> {\n    await this.spanAsync('redeclareIntent', async () => {\n      // Decide if we should redeclare intent\n      if (this.config.producer.disableIntentRedeclaration) return\n\n      // Get the current block\n      const head = (await this.blockViewer.currentBlock())[0]\n      if (isUndefined(head)) return\n      const currentBlock = head.block\n\n      // // Calculate the time until the producer's declaration expires\n      const blocksUntilExpiration = this.calculateBlocksUntilProducerDeclarationExpiration(currentBlock)\n\n      // Allow the producer time to redeclare itself via block production\n      // (for free) before submitting a redeclaration intent transaction.\n      if (blocksUntilExpiration > ProducerActor.RedeclarationWindow * 0.1) {\n        // Clear any previous redeclaration intent\n        this._lastRedeclarationIntent = undefined\n        // No need to redeclare yet\n        return\n      }\n\n      // If we already have a valid redeclaration intent, do not create another\n      // unless it has expired.\n      if (this._lastRedeclarationIntent) {\n        // Check if the last redeclaration intent is still valid\n        if (this._lastRedeclarationIntent.exp > currentBlock) return\n        // If it has expired, clear the last redeclaration intent\n        this._lastRedeclarationIntent = undefined\n      }\n\n      // Check if we have a valid balance before declaring intent\n      if (!await this.validateCurrentBalance()) {\n        this.logger?.error(\n          `Add balance to address ${this.account.address} for the producer to declare it's intent.`,\n        )\n        return\n      }\n\n      // Check if we have a valid stake before declaring intent\n      if (!(await this.validateCurrentStake())) {\n        this.logger?.error(\n          `Add stake to contract address ${this.config.chain.id}`\n          + ' for the producer to declare it\\'s intent.',\n        )\n        return\n      }\n\n      // Create a redeclaration intent\n      this.logger?.log('Creating redeclaration intent for producer:', this.account.address)\n      const redeclarationIntent = createDeclarationIntent(\n        this.account.address,\n        'producer',\n        currentBlock,\n        currentBlock + SimpleBlockRunner.RedeclarationDuration,\n      )\n\n      // Submit the redeclaration intent\n      await this.submitRedeclarationIntent(currentBlock, redeclarationIntent)\n\n      // On successful submission, save the redeclaration intent\n      this._lastRedeclarationIntent = redeclarationIntent\n    })\n  }\n\n  protected async submitRedeclarationIntent(currentBlock: XL1BlockNumber, redeclarationIntent: ChainStakeIntent): Promise<void> {\n    this.logger?.log('Submitting redeclaration intent for producer:', this.account.address)\n    // Create a transaction to submit the redeclaration intent\n    const tx = await buildTransaction(\n      this.chainId,\n      [redeclarationIntent],\n      [],\n      this.account,\n      currentBlock,\n      asXL1BlockNumber(currentBlock + 1000, true),\n    )\n\n    // Submit the redeclaration intent\n    await this.mempoolRunner.submitTransactions([tx])\n\n    this.logger?.log('Submitted redeclaration intent for producer:', this.account.address)\n  }\n\n  protected async validateCurrentBalance(): Promise<boolean> {\n    // Check if we have a valid balance before declaring intent\n    const head = this._lastProducedBlock?.[0]._hash\n    if (isDefined(head)) {\n      const balances = await this.accountBalanceViewer.accountBalances([this.account.address], { head })\n      const currentBalance = balances[this.account.address] ?? 0n\n      if (currentBalance <= 0n) {\n        this.logger?.error(`Producer ${this.account.address} has no balance.`)\n        return false\n      }\n      return true\n    }\n    return true\n  }\n\n  protected async validateCurrentStake(): Promise<boolean> {\n    // Use StakeIntentService to get the required minimum stake\n    const requiredMinimumStake = 1n // this.stakeIntentService.getRequiredMinimumStakeForIntent('producer')\n    // Check if we have a valid stake before declaring intent\n    const currentStake = await this.stakeTotalsViewer.activeByStaked(this.account.address)\n    if (currentStake < requiredMinimumStake) {\n      this.logger?.error(`Producer ${this.account.address} has insufficient stake.`)\n      return false\n    }\n    return true\n  }\n}\n","import type { Address, Logger } from '@xylabs/sdk-js'\nimport {\n  asAddress, assertEx, exists,\n} from '@xylabs/sdk-js'\nimport type { AccountInstance } from '@xyo-network/account-model'\nimport {\n  type ActorContext, initProducerAccount, type OrchestratorInstance,\n} from '@xyo-network/chain-orchestration'\nimport { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'\nimport { SimpleBlockRunner } from '@xyo-network/chain-services'\nimport type {\n  Config, CreatableProviderContext, ProviderFactoryLocatorInstance,\n} from '@xyo-network/xl1-protocol-sdk'\nimport { SimpleBlockRewardViewer, SimpleBlockValidationViewer } from '@xyo-network/xl1-protocol-sdk'\nimport { buildJsonRpcProviderLocator } from '@xyo-network/xl1-providers'\nimport {\n  HttpRpcTransport, type RpcSchemaMap, type TransportFactory,\n} from '@xyo-network/xl1-rpc'\n\nimport { ProducerActor, type ProducerActorParams } from './ProducerActor.ts'\n\ninterface RunProducerContext {\n  config: Config\n  locator?: ProviderFactoryLocatorInstance\n  logger: Logger\n  orchestrator: OrchestratorInstance\n}\n\nconst getProviderFactoryLocator = async (\n  context: Omit<CreatableProviderContext, 'locator'>,\n  account: AccountInstance,\n  rewardAddress: Address,\n) => {\n  const endpoint = assertEx(context.config.services.apiEndpoint, () => 'API endpoint is required in config.services.apiEndpoint')\n  const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)\n  const locator = await buildJsonRpcProviderLocator({ context, transportFactory })\n  locator.register(SimpleBlockRewardViewer.factory())\n  locator.register(SimpleBlockValidationViewer.factory<SimpleBlockValidationViewer>({ state: validateHydratedBlockState, value: validateHydratedBlock }))\n  locator.register(SimpleBlockRunner.factory<SimpleBlockRunner>({ account, rewardAddress }))\n  return locator\n}\n\nexport const runProducer = async ({\n  config, logger, orchestrator,\n}: RunProducerContext) => {\n  const account = await initProducerAccount({ config })\n  logger.info(`Running producer for account ${account.address}`)\n  const rewardAddress = asAddress(config.producer.rewardAddress, () => 'rewardAddress is required in config.producer')\n  logger.info(`Using reward address ${rewardAddress}`)\n\n  const locator = await getProviderFactoryLocator({\n    config, logger, singletons: {},\n  }, account, rewardAddress)\n\n  const context: ActorContext = {\n    locator, config, singletons: locator.context.singletons,\n  }\n\n  // Create actors\n  const params = {\n    id: 'ProducerActor', context, account,\n  } satisfies ProducerActorParams\n  // const apiEndpoint = config.services.apiEndpoint\n  // const balances = isDefined(apiEndpoint) ? undefined : await BalanceActor.create(params)\n  const producer = await ProducerActor.create(params)\n  const actors = [producer].filter(exists)\n\n  for (const actor of actors) {\n  // Register the actor with the orchestrator\n    await orchestrator.registerActor(actor)\n  }\n  // Start the orchestrator => automatically activates the actor\n  await orchestrator.start()\n}\n"],"mappings":"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","names":["creatable","isDefined","isUndefined","toHex","Actor","initProducerAccount","SimpleBlockRunner","asXL1BlockNumber","AccountBalanceViewerMoniker","BlockRunnerMoniker","BlockViewerMoniker","buildTransaction","createDeclarationIntent","getDefaultConfig","MempoolRunnerMoniker","MempoolViewerMoniker","StakeTotalsViewerMoniker","Mutex","SHOULD_REGISTER_REDECLARATION_INTENT_TIMER","TEN_MINUTES","ProducerActor","Actor","RedeclarationWindow","_lastProducedBlock","_lastRedeclarationIntent","_metricAttributes","_producerActorBlockProductionAttempts","_producerActorBlockProductionChecks","_producerActorBlocksProduced","_producerActorBlocksPublished","_accountBalanceViewer","_blockRunner","_blockViewer","_chainId","_mempoolRunner","_mempoolViewer","_produceBlockMutex","Mutex","_stakeTotalsViewer","accountBalanceViewer","blockRunner","blockViewer","chainId","mempoolRunner","mempoolViewer","stakeTotalsViewer","paramsHandler","params","config","context","getDefaultConfig","account","initProducerAccount","name","createHandler","address","toString","meter","createCounter","description","locator","getInstance","AccountBalanceViewerMoniker","BlockRunnerMoniker","BlockViewerMoniker","MempoolRunnerMoniker","MempoolViewerMoniker","StakeTotalsViewerMoniker","startHandler","registerTimer","produceBlock","redeclareIntent","calculateBlocksUntilProducerDeclarationExpiration","currentBlock","exp","add","spanAsync","isLocked","logger","log","runExclusive","head","headHash","_hash","previous","toHex","block","nextBlock","next","displayBlockNumber","submitBlocks","producer","disableIntentRedeclaration","isUndefined","blocksUntilExpiration","undefined","validateCurrentBalance","error","validateCurrentStake","chain","id","redeclarationIntent","createDeclarationIntent","SimpleBlockRunner","RedeclarationDuration","submitRedeclarationIntent","tx","buildTransaction","asXL1BlockNumber","submitTransactions","isDefined","balances","accountBalances","currentBalance","requiredMinimumStake","currentStake","activeByStaked","asAddress","assertEx","exists","initProducerAccount","validateHydratedBlock","validateHydratedBlockState","SimpleBlockRunner","SimpleBlockRewardViewer","SimpleBlockValidationViewer","buildJsonRpcProviderLocator","HttpRpcTransport","getProviderFactoryLocator","context","account","rewardAddress","endpoint","assertEx","config","services","apiEndpoint","transportFactory","schemas","HttpRpcTransport","locator","buildJsonRpcProviderLocator","register","SimpleBlockRewardViewer","factory","SimpleBlockValidationViewer","state","validateHydratedBlockState","value","validateHydratedBlock","SimpleBlockRunner","runProducer","logger","orchestrator","initProducerAccount","info","address","asAddress","producer","singletons","params","id","ProducerActor","create","actors","filter","exists","actor","registerActor","start"]}
+{"version":3,"sources":["../../src/ProducerActor.ts","../../src/runProducer.ts"],"sourcesContent":["import type { Attributes, Counter } from '@opentelemetry/api'\nimport type { Address } from '@xylabs/sdk-js'\nimport {\n  assertEx,\n  creatable, isDefined, isUndefined, toHex,\n} from '@xylabs/sdk-js'\nimport { initProducerAccount } from '@xyo-network/chain-orchestration'\nimport { SimpleBlockRunner } from '@xyo-network/chain-services'\nimport { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'\nimport type {\n  ChainId,\n  ChainStakeIntent, HydratedBlockWithHashMeta,\n  XL1BlockNumber,\n} from '@xyo-network/xl1-sdk'\nimport {\n  AccountBalanceViewer, AccountBalanceViewerMoniker, Actor, ActorParams, asXL1BlockNumber,\n  BlockRunner, BlockRunnerMoniker,\n  BlockViewer, BlockViewerMoniker, buildJsonRpcProviderLocator,\n  buildTransaction,\n  Config,\n  createDeclarationIntent,\n  getDefaultConfig,\n  HttpRpcTransport, MempoolRunner,\n  MempoolRunnerMoniker,\n  MempoolViewer,\n  MempoolViewerMoniker,\n  RpcSchemaMap, SimpleBlockRewardViewer,\n  SimpleBlockValidationViewer,\n  StakeTotalsViewer,\n  StakeTotalsViewerMoniker,\n  TransportFactory,\n} from '@xyo-network/xl1-sdk'\nimport { Mutex } from 'async-mutex'\n\nexport type ProducerActorParams = ActorParams<{\n  rewardAddress: Address\n}>\n\nconst SHOULD_REGISTER_REDECLARATION_INTENT_TIMER = true\nconst TEN_MINUTES = 10 * 60 * 1000 // 10 minutes in milliseconds\n\n@creatable()\nexport class ProducerActor extends Actor<ProducerActorParams> {\n  static readonly RedeclarationWindow = 10_000\n\n  protected _lastProducedBlock?: HydratedBlockWithHashMeta\n  protected _lastRedeclarationIntent?: ChainStakeIntent\n  protected _metricAttributes?: Attributes\n  protected _producerActorBlockProductionAttempts?: Counter<Attributes>\n  protected _producerActorBlockProductionChecks?: Counter<Attributes>\n  protected _producerActorBlocksProduced?: Counter<Attributes>\n  protected _producerActorBlocksPublished?: Counter<Attributes>\n\n  private _accountBalanceViewer?: AccountBalanceViewer\n  private _blockRunner?: BlockRunner\n  private _blockViewer?: BlockViewer\n  private _chainId?: ChainId\n  private _mempoolRunner?: MempoolRunner\n  private _mempoolViewer?: MempoolViewer\n\n  private _produceBlockMutex = new Mutex()\n\n  private _stakeTotalsViewer?: StakeTotalsViewer\n\n  protected get accountBalanceViewer() {\n    return this._accountBalanceViewer!\n  }\n\n  protected get blockRunner() {\n    return this._blockRunner!\n  }\n\n  protected get blockViewer() {\n    return this._blockViewer!\n  }\n\n  protected get chainId() {\n    return this._chainId!\n  }\n\n  protected get mempoolRunner() {\n    return this._mempoolRunner!\n  }\n\n  protected get mempoolViewer() {\n    return this._mempoolViewer!\n  }\n\n  protected get rewardAddress() {\n    return this.params.rewardAddress!\n  }\n\n  protected get stakeTotalsViewer() {\n    return this._stakeTotalsViewer!\n  }\n\n  static override async paramsHandler<T extends ProducerActor>(params?: Partial<T['params']>) {\n    const logger = params?.context?.logger\n    const config = params?.context?.config ?? getDefaultConfig()\n    const displayName = params?.displayName ?? 'ProducerActor'\n    const account = params?.account ?? await initProducerAccount({ config })\n    const id = account?.address.toString() ?? 'unknown'\n    logger?.info(`Running producer for account ${account.address}`)\n    const rewardAddress = params?.rewardAddress ?? account.address\n    logger?.info(`Using reward address ${rewardAddress}`)\n    if (rewardAddress === account.address) {\n      logger?.warn(`Using producer account address as reward address: ${account.address}`)\n    }\n\n    return {\n      ...await super.paramsHandler({\n        ...params,\n        account,\n        displayName,\n        id,\n      }),\n      rewardAddress,\n    }\n  }\n\n  protected static override async initContext(\n    params: ProducerActorParams,\n  ) {\n    const config: Config = params?.context?.config ?? getDefaultConfig()\n    const endpoint = assertEx(config.services.apiEndpoint, () => 'API endpoint is required in config.services.apiEndpoint')\n\n    const context = await super.initContext(params)\n\n    const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)\n    const locator = await buildJsonRpcProviderLocator({ context, transportFactory })\n    locator.register(SimpleBlockRewardViewer.factory(SimpleBlockRewardViewer.dependencies))\n    locator.register(SimpleBlockValidationViewer.factory<SimpleBlockValidationViewer>(\n      SimpleBlockValidationViewer.dependencies,\n      { state: validateHydratedBlockState, protocol: validateHydratedBlock },\n    ))\n    locator.register(SimpleBlockRunner.factory<SimpleBlockRunner>(\n      SimpleBlockRunner.dependencies,\n      { account: params.account, rewardAddress: params.rewardAddress },\n    ))\n    return locator.context\n  }\n\n  override async createHandler() {\n    await super.createHandler()\n    // Create the consistent meter attributes that will\n    // be included with all metrics from this actor\n    this._metricAttributes = { address: this.account.address.toString() }\n    // Create the metrics\n    this._producerActorBlockProductionChecks = this.meter?.createCounter(\n      'producer_actor_block_production_checks',\n      { description: 'Number of block production checks' },\n    )\n    this._producerActorBlockProductionAttempts = this.meter?.createCounter(\n      'producer_actor_block_production_attempts',\n      { description: 'Number of block production attempts' },\n    )\n    this._producerActorBlocksProduced = this.meter?.createCounter(\n      'producer_actor_blocks_produced',\n      { description: 'Number of blocks produced' },\n    )\n    this._producerActorBlocksPublished = this.meter?.createCounter(\n      'producer_actor_blocks_published',\n      { description: 'Number of blocks published' },\n    )\n    this._accountBalanceViewer = assertEx(\n      await this.locator?.getInstance<AccountBalanceViewer>(AccountBalanceViewerMoniker),\n      () => 'Unable to locate AccountBalanceViewer',\n    )\n    this._blockRunner = assertEx(\n      await this.locator?.getInstance<BlockRunner>(BlockRunnerMoniker),\n      () => 'Unable to locate BlockRunner',\n    )\n    this._blockViewer = assertEx(\n      await this.locator?.getInstance<BlockViewer>(BlockViewerMoniker),\n      () => 'Unable to locate BlockViewer',\n    )\n    this._mempoolRunner = assertEx(\n      await this.locator?.getInstance<MempoolRunner>(MempoolRunnerMoniker),\n      () => 'Unable to locate MempoolRunner',\n    )\n    this._mempoolViewer = assertEx(\n      await this.locator?.getInstance<MempoolViewer>(MempoolViewerMoniker),\n      () => 'Unable to locate MempoolViewer',\n    )\n    this._stakeTotalsViewer = assertEx(\n      await this.locator?.getInstance<StakeTotalsViewer>(StakeTotalsViewerMoniker),\n      () => 'Unable to locate StakeTotalsViewer',\n    )\n  }\n\n  override async startHandler() {\n    await super.startHandler()\n    // Register a timer to check if we should produce a block\n    this.registerTimer('BlockProductionTimer', async () => {\n      await this.produceBlock()\n    }, 2000, 1500/* 500 */)\n\n    if (SHOULD_REGISTER_REDECLARATION_INTENT_TIMER) {\n      // Register a timer to check if we should redeclare the producer\n      this.registerTimer('ProducerRedeclarationTimer', async () => {\n        await this.redeclareIntent()\n      }, TEN_MINUTES, TEN_MINUTES)\n    }\n  }\n\n  protected calculateBlocksUntilProducerDeclarationExpiration(currentBlock: number): number {\n    return (this._lastRedeclarationIntent?.exp ?? currentBlock) - currentBlock\n  }\n\n  protected async produceBlock(): Promise<void> {\n    this._producerActorBlockProductionChecks?.add(1, this._metricAttributes)\n    await this.spanAsync('produceBlock', async () => {\n      if (this._produceBlockMutex.isLocked()) {\n        this.logger?.log('Skipping block production, previous production still in progress')\n        return\n      }\n\n      await this._produceBlockMutex.runExclusive(async () => {\n      // Get the updated head\n        const head = (await this.blockViewer.currentBlock())[0]\n        // Check if we've already produced the next block for this head\n        const headHash = head._hash\n        // If our last produced block was the next block for the current head, we do not\n        // need to produce another. This prevents duplicate blocks from being produced\n        if (this._lastProducedBlock && this._lastProducedBlock[0].previous === headHash) {\n          this.logger?.log('Block already produced:', `0x${toHex(this._lastProducedBlock[0].block)}`, this._lastProducedBlock[0].block)\n        } else {\n          this._producerActorBlockProductionAttempts?.add(1, this._metricAttributes)\n          // Produce the next block\n          const nextBlock = await this.blockRunner.next(head)\n          // If it was produced\n          if (nextBlock) {\n            const displayBlockNumber = `0x${toHex(nextBlock[0].block)}`\n            this.logger?.log('Produced block:', displayBlockNumber)\n            this._producerActorBlocksProduced?.add(1, this._metricAttributes)\n            // Insert the block into the chain\n            await this.mempoolRunner.submitBlocks([nextBlock])\n            this.logger?.log('Published block:', displayBlockNumber, nextBlock[0].block)\n            this._producerActorBlocksPublished?.add(1, this._metricAttributes)\n            // Record that we have produced a block so we do not produce it again\n            this._lastProducedBlock = nextBlock\n          } else {\n            this.logger?.log('No block produced at this time.')\n          }\n        }\n      })\n    })\n  }\n\n  protected async redeclareIntent(): Promise<void> {\n    await this.spanAsync('redeclareIntent', async () => {\n      // Decide if we should redeclare intent\n      if (this.config.producer.disableIntentRedeclaration) return\n\n      // Get the current block\n      const head = (await this.blockViewer.currentBlock())[0]\n      if (isUndefined(head)) return\n      const currentBlock = head.block\n\n      // // Calculate the time until the producer's declaration expires\n      const blocksUntilExpiration = this.calculateBlocksUntilProducerDeclarationExpiration(currentBlock)\n\n      // Allow the producer time to redeclare itself via block production\n      // (for free) before submitting a redeclaration intent transaction.\n      if (blocksUntilExpiration > ProducerActor.RedeclarationWindow * 0.1) {\n        // Clear any previous redeclaration intent\n        this._lastRedeclarationIntent = undefined\n        // No need to redeclare yet\n        return\n      }\n\n      // If we already have a valid redeclaration intent, do not create another\n      // unless it has expired.\n      if (this._lastRedeclarationIntent) {\n        // Check if the last redeclaration intent is still valid\n        if (this._lastRedeclarationIntent.exp > currentBlock) return\n        // If it has expired, clear the last redeclaration intent\n        this._lastRedeclarationIntent = undefined\n      }\n\n      // Check if we have a valid balance before declaring intent\n      if (!await this.validateCurrentBalance()) {\n        this.logger?.error(\n          `Add balance to address ${this.account.address} for the producer to declare it's intent.`,\n        )\n        return\n      }\n\n      // Check if we have a valid stake before declaring intent\n      if (!(await this.validateCurrentStake())) {\n        this.logger?.error(\n          `Add stake to contract address ${this.config.chain.id}`\n          + ' for the producer to declare it\\'s intent.',\n        )\n        return\n      }\n\n      // Create a redeclaration intent\n      this.logger?.log('Creating redeclaration intent for producer:', this.account.address)\n      const redeclarationIntent = createDeclarationIntent(\n        this.account.address,\n        'producer',\n        currentBlock,\n        currentBlock + SimpleBlockRunner.RedeclarationDuration,\n      )\n\n      // Submit the redeclaration intent\n      await this.submitRedeclarationIntent(currentBlock, redeclarationIntent)\n\n      // On successful submission, save the redeclaration intent\n      this._lastRedeclarationIntent = redeclarationIntent\n    })\n  }\n\n  protected async submitRedeclarationIntent(currentBlock: XL1BlockNumber, redeclarationIntent: ChainStakeIntent): Promise<void> {\n    this.logger?.log('Submitting redeclaration intent for producer:', this.account.address)\n    // Create a transaction to submit the redeclaration intent\n    const tx = await buildTransaction(\n      this.chainId,\n      [redeclarationIntent],\n      [],\n      this.account,\n      currentBlock,\n      asXL1BlockNumber(currentBlock + 1000, true),\n    )\n\n    // Submit the redeclaration intent\n    await this.mempoolRunner.submitTransactions([tx])\n\n    this.logger?.log('Submitted redeclaration intent for producer:', this.account.address)\n  }\n\n  protected async validateCurrentBalance(): Promise<boolean> {\n    // Check if we have a valid balance before declaring intent\n    const head = this._lastProducedBlock?.[0]._hash\n    if (isDefined(head)) {\n      const balances = await this.accountBalanceViewer.accountBalances([this.account.address], { head })\n      const currentBalance = balances[this.account.address] ?? 0n\n      if (currentBalance <= 0n) {\n        this.logger?.error(`Producer ${this.account.address} has no balance.`)\n        return false\n      }\n      return true\n    }\n    return true\n  }\n\n  protected async validateCurrentStake(): Promise<boolean> {\n    // Use StakeIntentService to get the required minimum stake\n    const requiredMinimumStake = 1n // this.stakeIntentService.getRequiredMinimumStakeForIntent('producer')\n    // Check if we have a valid stake before declaring intent\n    const currentStake = await this.stakeTotalsViewer.activeByStaked(this.account.address)\n    if (currentStake < requiredMinimumStake) {\n      this.logger?.error(`Producer ${this.account.address} has insufficient stake.`)\n      return false\n    }\n    return true\n  }\n}\n","import {\n  asAddress, exists, IdLogger,\n} from '@xylabs/sdk-js'\nimport { initProducerAccount, type OrchestratorInstance } from '@xyo-network/chain-orchestration'\nimport type {\n  BaseContext, Config, ProviderFactoryLocatorInstance,\n} from '@xyo-network/xl1-sdk'\n\nimport { ProducerActor } from './ProducerActor.ts'\n\nexport interface RunProducerContext extends BaseContext {\n  config: Config\n  locator?: ProviderFactoryLocatorInstance\n  orchestrator: OrchestratorInstance\n}\n\nexport const runProducer = async ({\n  config, logger, orchestrator, locator,\n}: RunProducerContext) => {\n  const localLogger = logger ?? new IdLogger(logger ?? console, () => 'ResolveHelper [runProducer]')\n  const account = await initProducerAccount({ config })\n  localLogger.info(`Running producer for account ${account.address}`)\n  const rewardAddress = asAddress(config.producer.rewardAddress, () => 'rewardAddress is required in config.producer')\n  localLogger.info(`Using reward address ${rewardAddress}`)\n\n  // Create actors\n  const producer = await ProducerActor.create({\n    logger,\n    context: {\n      config, locator, singletons: {},\n    },\n  })\n  const actors = [producer].filter(exists)\n\n  for (const actor of actors) {\n  // Register the actor with the orchestrator\n    await orchestrator.registerActor(actor)\n  }\n  // Start the orchestrator => automatically activates the actor\n  await orchestrator.start()\n}\n"],"mappings":"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","names":["assertEx","creatable","isDefined","isUndefined","toHex","initProducerAccount","SimpleBlockRunner","validateHydratedBlock","validateHydratedBlockState","AccountBalanceViewerMoniker","Actor","asXL1BlockNumber","BlockRunnerMoniker","BlockViewerMoniker","buildJsonRpcProviderLocator","buildTransaction","createDeclarationIntent","getDefaultConfig","HttpRpcTransport","MempoolRunnerMoniker","MempoolViewerMoniker","SimpleBlockRewardViewer","SimpleBlockValidationViewer","StakeTotalsViewerMoniker","Mutex","SHOULD_REGISTER_REDECLARATION_INTENT_TIMER","TEN_MINUTES","ProducerActor","Actor","RedeclarationWindow","_lastProducedBlock","_lastRedeclarationIntent","_metricAttributes","_producerActorBlockProductionAttempts","_producerActorBlockProductionChecks","_producerActorBlocksProduced","_producerActorBlocksPublished","_accountBalanceViewer","_blockRunner","_blockViewer","_chainId","_mempoolRunner","_mempoolViewer","_produceBlockMutex","Mutex","_stakeTotalsViewer","accountBalanceViewer","blockRunner","blockViewer","chainId","mempoolRunner","mempoolViewer","rewardAddress","params","stakeTotalsViewer","paramsHandler","logger","context","config","getDefaultConfig","displayName","account","initProducerAccount","id","address","toString","info","warn","initContext","endpoint","assertEx","services","apiEndpoint","transportFactory","schemas","HttpRpcTransport","locator","buildJsonRpcProviderLocator","register","SimpleBlockRewardViewer","factory","dependencies","SimpleBlockValidationViewer","state","validateHydratedBlockState","protocol","validateHydratedBlock","SimpleBlockRunner","createHandler","meter","createCounter","description","getInstance","AccountBalanceViewerMoniker","BlockRunnerMoniker","BlockViewerMoniker","MempoolRunnerMoniker","MempoolViewerMoniker","StakeTotalsViewerMoniker","startHandler","registerTimer","produceBlock","redeclareIntent","calculateBlocksUntilProducerDeclarationExpiration","currentBlock","exp","add","spanAsync","isLocked","log","runExclusive","head","headHash","_hash","previous","toHex","block","nextBlock","next","displayBlockNumber","submitBlocks","producer","disableIntentRedeclaration","isUndefined","blocksUntilExpiration","undefined","validateCurrentBalance","error","validateCurrentStake","chain","redeclarationIntent","createDeclarationIntent","RedeclarationDuration","submitRedeclarationIntent","tx","buildTransaction","asXL1BlockNumber","submitTransactions","isDefined","balances","accountBalances","currentBalance","requiredMinimumStake","currentStake","activeByStaked","asAddress","exists","IdLogger","initProducerAccount","runProducer","config","logger","orchestrator","locator","localLogger","IdLogger","console","account","initProducerAccount","info","address","rewardAddress","asAddress","producer","ProducerActor","create","context","singletons","actors","filter","exists","actor","registerActor","start"]}

package/dist/node/runProducer.d.ts

@@ -1,12 +1,9 @@
-import type { Logger } from '@xylabs/sdk-js';
 import { type OrchestratorInstance } from '@xyo-network/chain-orchestration';
-import type { Config, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-protocol-sdk';
-interface RunProducerContext {
+import type { BaseContext, Config, ProviderFactoryLocatorInstance } from '@xyo-network/xl1-sdk';
+export interface RunProducerContext extends BaseContext {
     config: Config;
     locator?: ProviderFactoryLocatorInstance;
-    logger: Logger;
     orchestrator: OrchestratorInstance;
 }
-export declare const runProducer: ({ config, logger, orchestrator, }: RunProducerContext) => Promise<void>;
-export {};
+export declare const runProducer: ({ config, logger, orchestrator, locator, }: RunProducerContext) => Promise<void>;
 //# sourceMappingURL=runProducer.d.ts.map

package/dist/node/runProducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runProducer.d.ts","sourceRoot":"","sources":["../../src/runProducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAKrD,OAAO,EACmC,KAAK,oBAAoB,EAClE,MAAM,kCAAkC,CAAA;AAGzC,OAAO,KAAK,EACV,MAAM,EAA4B,8BAA8B,EACjE,MAAM,+BAA+B,CAAA;AAStC,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,8BAA8B,CAAA;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAgBD,eAAO,MAAM,WAAW,GAAU,mCAE/B,kBAAkB,kBA6BpB,CAAA"}
+{"version":3,"file":"runProducer.d.ts","sourceRoot":"","sources":["../../src/runProducer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACjG,OAAO,KAAK,EACV,WAAW,EAAE,MAAM,EAAE,8BAA8B,EACpD,MAAM,sBAAsB,CAAA;AAI7B,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,8BAA8B,CAAA;IACxC,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAED,eAAO,MAAM,WAAW,GAAU,4CAE/B,kBAAkB,kBAsBpB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/chain-producer",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "XYO Layer One Producer",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -49,13 +49,11 @@
     "types": "tsc --noEmit -p tsconfig.test.json"
   },
   "dependencies": {
-    "@xylabs/sdk-js": "~5.0.51",
-    "@xyo-network/chain-orchestration": "~1.18.0",
-    "@xyo-network/chain-services": "~1.18.0",
-    "@xyo-network/xl1-protocol": "~1.14.17",
-    "@xyo-network/xl1-protocol-sdk": "~1.18.0",
-    "@xyo-network/xl1-providers": "~1.18.0",
-    "@xyo-network/xl1-rpc": "~1.18.0",
+    "@xylabs/sdk-js": "~5.0.61",
+    "@xyo-network/chain-orchestration": "~1.18.1",
+    "@xyo-network/chain-services": "~1.18.1",
+    "@xyo-network/chain-validation": "~1.18.1",
+    "@xyo-network/xl1-sdk": "~1.18.2",
     "async-mutex": "~0.5.0"
   },
   "devDependencies": {
@@ -63,27 +61,28 @@
     "@types/compression": "~1.8.1",
     "@types/cors": "~2.8.19",
     "@types/express": "5.0.6",
-    "@types/express-serve-static-core": "~5.1.0",
-    "@types/node": "~25.0.2",
-    "@xylabs/sdk-js": "~5.0.51",
+    "@types/express-serve-static-core": "~5.1.1",
+    "@types/node": "~25.0.8",
+    "@xylabs/sdk-js": "~5.0.61",
     "@xylabs/ts-scripts-yarn3": "~7.2.32",
     "@xylabs/tsconfig": "~7.2.32",
-    "@xyo-network/account": "~5.2.17",
-    "@xyo-network/account-model": "~5.2.17",
-    "@xyo-network/archivist-abstract": "~5.2.17",
+    "@xyo-network/account": "~5.2.22",
+    "@xyo-network/account-model": "~5.2.22",
+    "@xyo-network/archivist-abstract": "~5.2.22",
     "@xyo-network/bios-model": "~7.2.0",
-    "@xyo-network/boundwitness-builder": "~5.2.17",
-    "@xyo-network/chain-services": "~1.18.0",
-    "@xyo-network/module-abstract-mongodb": "~5.2.17",
-    "@xyo-network/module-model-mongodb": "~5.2.17",
-    "@xyo-network/node-memory": "~5.2.17",
-    "@xyo-network/xl1-protocol": "~1.14.17",
+    "@xyo-network/boundwitness-builder": "~5.2.22",
+    "@xyo-network/chain-services": "~1.18.1",
+    "@xyo-network/chain-validation": "~1.18.1",
+    "@xyo-network/module-abstract-mongodb": "~5.2.22",
+    "@xyo-network/module-model-mongodb": "~5.2.22",
+    "@xyo-network/node-memory": "~5.2.22",
+    "@xyo-network/xl1-sdk": "~1.18.2",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.2",
     "nodemon": "~3.1.11",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.15",
+    "vitest": "~4.0.17",
     "vitest-mock-extended": "~3.1.0"
   },
   "engines": {
@@ -93,4 +92,4 @@
   "publishConfig": {
     "access": "restricted"
   }
-}
+}

package/src/ProducerActor.ts

@@ -1,34 +1,40 @@
 import type { Attributes, Counter } from '@opentelemetry/api'
-import type { CreatableName } from '@xylabs/sdk-js'
+import type { Address } from '@xylabs/sdk-js'
 import {
+  assertEx,
   creatable, isDefined, isUndefined, toHex,
 } from '@xylabs/sdk-js'
-import {
-  Actor, type ActorParams, initProducerAccount,
-} from '@xyo-network/chain-orchestration'
+import { initProducerAccount } from '@xyo-network/chain-orchestration'
 import { SimpleBlockRunner } from '@xyo-network/chain-services'
+import { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'
 import type {
   ChainId,
   ChainStakeIntent, HydratedBlockWithHashMeta,
   XL1BlockNumber,
-} from '@xyo-network/xl1-protocol'
-import { asXL1BlockNumber } from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
 import {
-  AccountBalanceViewer, AccountBalanceViewerMoniker, BlockRunner, BlockRunnerMoniker,
-  BlockViewer, BlockViewerMoniker, buildTransaction,
+  AccountBalanceViewer, AccountBalanceViewerMoniker, Actor, ActorParams, asXL1BlockNumber,
+  BlockRunner, BlockRunnerMoniker,
+  BlockViewer, BlockViewerMoniker, buildJsonRpcProviderLocator,
+  buildTransaction,
   Config,
   createDeclarationIntent,
   getDefaultConfig,
-  MempoolRunner,
+  HttpRpcTransport, MempoolRunner,
   MempoolRunnerMoniker,
   MempoolViewer,
   MempoolViewerMoniker,
+  RpcSchemaMap, SimpleBlockRewardViewer,
+  SimpleBlockValidationViewer,
   StakeTotalsViewer,
   StakeTotalsViewerMoniker,
-} from '@xyo-network/xl1-protocol-sdk'
+  TransportFactory,
+} from '@xyo-network/xl1-sdk'
 import { Mutex } from 'async-mutex'
 
-export type ProducerActorParams = ActorParams
+export type ProducerActorParams = ActorParams<{
+  rewardAddress: Address
+}>
 
 const SHOULD_REGISTER_REDECLARATION_INTENT_TIMER = true
 const TEN_MINUTES = 10 * 60 * 1000 // 10 minutes in milliseconds
@@ -80,16 +86,58 @@ export class ProducerActor extends Actor<ProducerActorParams> {
     return this._mempoolViewer!
   }
 
+  protected get rewardAddress() {
+    return this.params.rewardAddress!
+  }
+
   protected get stakeTotalsViewer() {
     return this._stakeTotalsViewer!
   }
 
-  static override async paramsHandler<T extends ActorParams>(params?: Partial<T>) {
-    const config: Config = params?.context?.config ?? getDefaultConfig()
+  static override async paramsHandler<T extends ProducerActor>(params?: Partial<T['params']>) {
+    const logger = params?.context?.logger
+    const config = params?.context?.config ?? getDefaultConfig()
+    const displayName = params?.displayName ?? 'ProducerActor'
     const account = params?.account ?? await initProducerAccount({ config })
-    return await super.paramsHandler({
-      ...params, name: (params?.name ?? 'Producer') as CreatableName, account,
-    })
+    const id = account?.address.toString() ?? 'unknown'
+    logger?.info(`Running producer for account ${account.address}`)
+    const rewardAddress = params?.rewardAddress ?? account.address
+    logger?.info(`Using reward address ${rewardAddress}`)
+    if (rewardAddress === account.address) {
+      logger?.warn(`Using producer account address as reward address: ${account.address}`)
+    }
+
+    return {
+      ...await super.paramsHandler({
+        ...params,
+        account,
+        displayName,
+        id,
+      }),
+      rewardAddress,
+    }
+  }
+
+  protected static override async initContext(
+    params: ProducerActorParams,
+  ) {
+    const config: Config = params?.context?.config ?? getDefaultConfig()
+    const endpoint = assertEx(config.services.apiEndpoint, () => 'API endpoint is required in config.services.apiEndpoint')
+
+    const context = await super.initContext(params)
+
+    const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
+    const locator = await buildJsonRpcProviderLocator({ context, transportFactory })
+    locator.register(SimpleBlockRewardViewer.factory(SimpleBlockRewardViewer.dependencies))
+    locator.register(SimpleBlockValidationViewer.factory<SimpleBlockValidationViewer>(
+      SimpleBlockValidationViewer.dependencies,
+      { state: validateHydratedBlockState, protocol: validateHydratedBlock },
+    ))
+    locator.register(SimpleBlockRunner.factory<SimpleBlockRunner>(
+      SimpleBlockRunner.dependencies,
+      { account: params.account, rewardAddress: params.rewardAddress },
+    ))
+    return locator.context
   }
 
   override async createHandler() {
@@ -114,12 +162,30 @@ export class ProducerActor extends Actor<ProducerActorParams> {
       'producer_actor_blocks_published',
       { description: 'Number of blocks published' },
     )
-    this._accountBalanceViewer = await this.locator.getInstance<AccountBalanceViewer>(AccountBalanceViewerMoniker)
-    this._blockRunner = await this.locator.getInstance<BlockRunner>(BlockRunnerMoniker)
-    this._blockViewer = await this.locator.getInstance<BlockViewer>(BlockViewerMoniker)
-    this._mempoolRunner = await this.locator.getInstance<MempoolRunner>(MempoolRunnerMoniker)
-    this._mempoolViewer = await this.locator.getInstance<MempoolViewer>(MempoolViewerMoniker)
-    this._stakeTotalsViewer = await this.locator.getInstance<StakeTotalsViewer>(StakeTotalsViewerMoniker)
+    this._accountBalanceViewer = assertEx(
+      await this.locator?.getInstance<AccountBalanceViewer>(AccountBalanceViewerMoniker),
+      () => 'Unable to locate AccountBalanceViewer',
+    )
+    this._blockRunner = assertEx(
+      await this.locator?.getInstance<BlockRunner>(BlockRunnerMoniker),
+      () => 'Unable to locate BlockRunner',
+    )
+    this._blockViewer = assertEx(
+      await this.locator?.getInstance<BlockViewer>(BlockViewerMoniker),
+      () => 'Unable to locate BlockViewer',
+    )
+    this._mempoolRunner = assertEx(
+      await this.locator?.getInstance<MempoolRunner>(MempoolRunnerMoniker),
+      () => 'Unable to locate MempoolRunner',
+    )
+    this._mempoolViewer = assertEx(
+      await this.locator?.getInstance<MempoolViewer>(MempoolViewerMoniker),
+      () => 'Unable to locate MempoolViewer',
+    )
+    this._stakeTotalsViewer = assertEx(
+      await this.locator?.getInstance<StakeTotalsViewer>(StakeTotalsViewerMoniker),
+      () => 'Unable to locate StakeTotalsViewer',
+    )
   }
 
   override async startHandler() {

package/src/runProducer.ts

@@ -1,68 +1,35 @@
-import type { Address, Logger } from '@xylabs/sdk-js'
 import {
-  asAddress, assertEx, exists,
+  asAddress, exists, IdLogger,
 } from '@xylabs/sdk-js'
-import type { AccountInstance } from '@xyo-network/account-model'
-import {
-  type ActorContext, initProducerAccount, type OrchestratorInstance,
-} from '@xyo-network/chain-orchestration'
-import { validateHydratedBlock, validateHydratedBlockState } from '@xyo-network/chain-validation'
-import { SimpleBlockRunner } from '@xyo-network/chain-services'
+import { initProducerAccount, type OrchestratorInstance } from '@xyo-network/chain-orchestration'
 import type {
-  Config, CreatableProviderContext, ProviderFactoryLocatorInstance,
-} from '@xyo-network/xl1-protocol-sdk'
-import { SimpleBlockRewardViewer, SimpleBlockValidationViewer } from '@xyo-network/xl1-protocol-sdk'
-import { buildJsonRpcProviderLocator } from '@xyo-network/xl1-providers'
-import {
-  HttpRpcTransport, type RpcSchemaMap, type TransportFactory,
-} from '@xyo-network/xl1-rpc'
+  BaseContext, Config, ProviderFactoryLocatorInstance,
+} from '@xyo-network/xl1-sdk'
 
-import { ProducerActor, type ProducerActorParams } from './ProducerActor.ts'
+import { ProducerActor } from './ProducerActor.ts'
 
-interface RunProducerContext {
+export interface RunProducerContext extends BaseContext {
   config: Config
   locator?: ProviderFactoryLocatorInstance
-  logger: Logger
   orchestrator: OrchestratorInstance
 }
 
-const getProviderFactoryLocator = async (
-  context: Omit<CreatableProviderContext, 'locator'>,
-  account: AccountInstance,
-  rewardAddress: Address,
-) => {
-  const endpoint = assertEx(context.config.services.apiEndpoint, () => 'API endpoint is required in config.services.apiEndpoint')
-  const transportFactory: TransportFactory = (schemas: RpcSchemaMap) => new HttpRpcTransport(endpoint, schemas)
-  const locator = await buildJsonRpcProviderLocator({ context, transportFactory })
-  locator.register(SimpleBlockRewardViewer.factory())
-  locator.register(SimpleBlockValidationViewer.factory<SimpleBlockValidationViewer>({ state: validateHydratedBlockState, value: validateHydratedBlock }))
-  locator.register(SimpleBlockRunner.factory<SimpleBlockRunner>({ account, rewardAddress }))
-  return locator
-}
-
 export const runProducer = async ({
-  config, logger, orchestrator,
+  config, logger, orchestrator, locator,
 }: RunProducerContext) => {
+  const localLogger = logger ?? new IdLogger(logger ?? console, () => 'ResolveHelper [runProducer]')
   const account = await initProducerAccount({ config })
-  logger.info(`Running producer for account ${account.address}`)
+  localLogger.info(`Running producer for account ${account.address}`)
   const rewardAddress = asAddress(config.producer.rewardAddress, () => 'rewardAddress is required in config.producer')
-  logger.info(`Using reward address ${rewardAddress}`)
-
-  const locator = await getProviderFactoryLocator({
-    config, logger, singletons: {},
-  }, account, rewardAddress)
-
-  const context: ActorContext = {
-    locator, config, singletons: locator.context.singletons,
-  }
+  localLogger.info(`Using reward address ${rewardAddress}`)
 
   // Create actors
-  const params = {
-    id: 'ProducerActor', context, account,
-  } satisfies ProducerActorParams
-  // const apiEndpoint = config.services.apiEndpoint
-  // const balances = isDefined(apiEndpoint) ? undefined : await BalanceActor.create(params)
-  const producer = await ProducerActor.create(params)
+  const producer = await ProducerActor.create({
+    logger,
+    context: {
+      config, locator, singletons: {},
+    },
+  })
   const actors = [producer].filter(exists)
 
   for (const actor of actors) {