@xyo-network/chain-services 1.18.0 → 1.18.1

package/dist/neutral/model/Params.d.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 {
 }
 export interface BaseAccountableServiceParams extends BaseServiceParams {

package/dist/neutral/model/Params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Params.d.ts","sourceRoot":"","sources":["../../../src/model/Params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAE5E,MAAM,WAAW,iBAAkB,SAAQ,uBAAuB,EAAE,sBAAsB;CAEzF;AAED,MAAM,WAAW,4BAA6B,SAAQ,iBAAiB;IACrE,OAAO,EAAE,eAAe,CAAA;CACzB"}
+{"version":3,"file":"Params.d.ts","sourceRoot":"","sources":["../../../src/model/Params.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAE3F,MAAM,WAAW,iBAAkB,SAAQ,uBAAuB,EAAE,sBAAsB;CAEzF;AAED,MAAM,WAAW,4BAA6B,SAAQ,iBAAiB;IACrE,OAAO,EAAE,eAAe,CAAA;CACzB"}

package/dist/neutral/simple/block/runner/SimpleBlockRunner.d.ts

@@ -1,10 +1,9 @@
-import { Address, Hex, Promisable } from '@xylabs/sdk-js';
+import { Address, Promisable } from '@xylabs/sdk-js';
 import { AccountInstance } from '@xyo-network/account-model';
 import { ArchivistInstance } from '@xyo-network/archivist-model';
 import { BlockRewardDiviner } from '@xyo-network/chain-modules';
 import { WithHashMeta } from '@xyo-network/payload-model';
-import { BlockBoundWitness, ChainStakeIntent, SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta, Transfer } from '@xyo-network/xl1-protocol';
-import { AbstractCreatableProvider, AccountBalanceViewer, BlockRewardViewer, BlockRunner, BlockValidationViewer, CreatableProviderParams, HydratedBlockStateValidationFunction, MempoolRunner, MempoolViewer, TimeSyncViewer } from '@xyo-network/xl1-protocol-sdk';
+import { AbstractCreatableProvider, AccountBalanceViewer, BlockBoundWitness, BlockRewardViewer, BlockRunner, BlockValidationViewer, ChainStakeIntent, CreatableProviderParams, HydratedBlockStateValidationFunction, MempoolRunner, MempoolViewer, SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta, TimeSyncViewer, Transfer } from '@xyo-network/xl1-sdk';
 /**
  * The default block size for a block
  */
@@ -26,6 +25,7 @@ export type SimpleBlockRunnerParams = CreatableProviderParams & {
 };
 export declare class SimpleBlockRunner extends AbstractCreatableProvider<SimpleBlockRunnerParams> implements BlockRunner {
     static readonly defaultMoniker: "BlockRunner";
+    static readonly dependencies: ("AccountBalanceViewer" | "BlockRewardViewer" | "MempoolViewer" | "BlockValidationViewer" | "MempoolRunner" | "TimeSyncViewer")[];
     static readonly monikers: "BlockRunner"[];
     moniker: "BlockRunner";
     protected _blockRewardDiviner?: BlockRewardDiviner;
@@ -56,7 +56,11 @@ export declare class SimpleBlockRunner extends AbstractCreatableProvider<SimpleB
     static get RedeclarationWindow(): number;
     protected get account(): AccountInstance;
     protected get accountBalanceViewer(): AccountBalanceViewer;
-    protected get address(): Address;
+    protected get address(): Lowercase<string> & {
+        readonly __hex: true;
+    } & {
+        readonly __address: true;
+    };
     protected get blockRewardViewer(): BlockRewardViewer;
     protected get blockValidationViewer(): BlockValidationViewer;
     protected get mempoolRunner(): MempoolRunner;
@@ -77,25 +81,33 @@ export declare class SimpleBlockRunner extends AbstractCreatableProvider<SimpleB
     protected getProducerRedeclaration(head: WithHashMeta<BlockBoundWitness>): Promisable<ChainStakeIntent | undefined>;
     protected proposeNextValidBlock(head: WithHashMeta<BlockBoundWitness>, validateBalances?: boolean, force?: boolean): Promise<[{
         schema: "network.xyo.boundwitness";
-        addresses: Address[];
-        payload_hashes: import("@xylabs/sdk-js").Hash[];
+        addresses: (Lowercase<string> & {
+            readonly __hex: true;
+        } & {
+            readonly __address: true;
+        })[];
+        payload_hashes: import("@xylabs/sdk-js").BrandedHash[];
         payload_schemas: string[];
-        previous_hashes: (import("@xylabs/sdk-js").Hash | null)[];
-        $signatures: Hex[];
-        block: import("@xyo-network/xl1-protocol").XL1BlockNumber;
-        chain: Hex;
-        previous: import("@xylabs/sdk-js").Hash | null;
+        previous_hashes: (import("@xylabs/sdk-js").BrandedHash | null)[];
+        $signatures: import("@xylabs/sdk-js").BrandedHex[];
+        block: import("@xyo-network/xl1-sdk").XL1BlockNumber;
+        chain: import("@xylabs/sdk-js").BrandedHex;
+        previous: import("@xylabs/sdk-js").BrandedHash | null;
         $epoch: number;
-        _hash: import("@xylabs/sdk-js").Hash;
-        _dataHash: import("@xylabs/sdk-js").Hash;
-        $destination?: Address | undefined;
-        $sourceQuery?: import("@xylabs/sdk-js").Hash | undefined;
+        _hash: import("@xylabs/sdk-js").BrandedHash;
+        _dataHash: import("@xylabs/sdk-js").BrandedHash;
+        $destination?: (Lowercase<string> & {
+            readonly __hex: true;
+        } & {
+            readonly __address: true;
+        }) | undefined;
+        $sourceQuery?: import("@xylabs/sdk-js").BrandedHash | undefined;
         protocol?: number | undefined;
-        step_hashes?: import("@xylabs/sdk-js").Hash[] | undefined;
+        step_hashes?: import("@xylabs/sdk-js").BrandedHash[] | undefined;
     }, {
         schema: string;
-        _hash: import("@xylabs/sdk-js").Hash;
-        _dataHash: import("@xylabs/sdk-js").Hash;
+        _hash: import("@xylabs/sdk-js").BrandedHash;
+        _dataHash: import("@xylabs/sdk-js").BrandedHash;
     }[]] | undefined>;
     private filterByFunded;
     private generateTimePayload;

package/dist/neutral/simple/block/runner/SimpleBlockRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleBlockRunner.d.ts","sourceRoot":"","sources":["../../../../../src/simple/block/runner/SimpleBlockRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACW,GAAG,EAA0B,UAAU,EAC1D,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EACL,kBAAkB,EACnB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAC8C,iBAAiB,EACpE,gBAAgB,EAAsB,mCAAmC,EACzE,+BAA+B,EAC/B,QAAQ,EACT,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACL,yBAAyB,EACzB,oBAAoB,EAEpB,iBAAiB,EAEjB,WAAW,EAEX,qBAAqB,EAGrB,uBAAuB,EAEvB,oCAAoC,EACpC,aAAa,EAEb,aAAa,EAEb,cAAc,EAEf,MAAM,+BAA+B,CAAA;AAItC;;GAEG;AACH,eAAO,MAAM,kBAAkB,KAAK,CAAA;AAEpC;;GAEG;AACH,eAAO,MAAM,mCAAmC,QAAS,CAAA;AAEzD;;;GAGG;AACH,eAAO,MAAM,iCAAiC,MAAM,CAAA;AAEpD,MAAM,MAAM,uBAAuB,GAAG,uBAAuB,GAAG;IAC9D,OAAO,EAAE,eAAe,CAAA;IACxB,6BAA6B,CAAC,EAAE,iBAAiB,CAAA;IACjD,aAAa,EAAE,OAAO,CAAA;IACtB,0BAA0B,CAAC,EAAE,oCAAoC,CAAA;CAClE,CAAA;AAED,qBACa,iBAAkB,SAAQ,yBAAyB,CAAC,uBAAuB,CAAE,YAAW,WAAW;IAC9G,MAAM,CAAC,QAAQ,CAAC,cAAc,gBAAqB;IACnD,MAAM,CAAC,QAAQ,CAAC,QAAQ,kBAAuB;IAC/C,OAAO,gBAAmC;IAE1C,SAAS,CAAC,mBAAmB,CAAC,EAAE,kBAAkB,CAAA;IAClD,SAAS,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAC1C,SAAS,CAAC,8BAA8B,CAAC,EAAE,iBAAiB,CAAA;IAE5D,OAAO,CAAC,QAAQ,CAAC,CAAiB;IAClC,OAAO,CAAC,qBAAqB,CAAC,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,kBAAkB,CAAC,CAAmB;IAC9C,OAAO,CAAC,sBAAsB,CAAC,CAAuB;IACtD,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAC,CAAe;IACtC,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,eAAe,CAAC,CAAgB;IAExC;;OAEG;IACH,MAAM,KAAK,gBAAgB,IAAI,MAAM,CAEpC;IAED;;;OAGG;IACH,MAAM,KAAK,qBAAqB,IAAI,MAAM,CAEzC;IAED;;;OAGG;IACH,MAAM,KAAK,mBAAmB,IAAI,MAAM,CAEvC;IAED,SAAS,KAAK,OAAO,oBAEpB;IAED,SAAS,KAAK,oBAAoB,yBAEjC;IAED,SAAS,KAAK,OAAO,YAEpB;IAED,SAAS,KAAK,iBAAiB,sBAE9B;IAED,SAAS,KAAK,qBAAqB,0BAElC;IAMD,SAAS,KAAK,aAAa,kBAE1B;IAED,SAAS,KAAK,aAAa,kBAE1B;IAMD,SAAS,KAAK,6BAA6B,0SAE1C;IAED,SAAS,KAAK,aAAa,IAAI,OAAO,CAErC;IAMD,SAAS,KAAK,cAAc,IAAI,cAAc,CAE7C;IAMc,aAAa;IAatB,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;IAgBjG,gBAAgB,CAAC,IAAI,EAAE,mCAAmC,EAAE,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,+BAA+B,CAAC;IAClH,gBAAgB,CAAC,IAAI,EAAE,mCAAmC,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,+BAA+B,GAAG,SAAS,CAAC;cAOtH,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAmB3E;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;cAkBnG,qBAAqB,CAAC,IAAI,EAAE,YAAY,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,UAAQ,EAAE,KAAK,UAAQ;;;;;;;;;;;;;;;;;;;;;;YAmEtG,cAAc;YAyBd,mBAAmB;IAIjC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAU1B"}
+{"version":3,"file":"SimpleBlockRunner.d.ts","sourceRoot":"","sources":["../../../../../src/simple/block/runner/SimpleBlockRunner.ts"],"names":[],"mappings":"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"}

package/dist/neutral/simple/block/runner/generateTransactionFeeTransfers.d.ts

@@ -1,4 +1,4 @@
 import { type Address } from '@xylabs/sdk-js';
-import type { SignedHydratedTransaction, Transfer } from '@xyo-network/xl1-protocol';
+import type { SignedHydratedTransaction, Transfer } from '@xyo-network/xl1-sdk';
 export declare function generateTransactionFeeTransfers(address: Address, transactions: SignedHydratedTransaction[]): Promise<Transfer[]>;
 //# sourceMappingURL=generateTransactionFeeTransfers.d.ts.map

package/dist/neutral/simple/block/runner/generateTransactionFeeTransfers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateTransactionFeeTransfers.d.ts","sourceRoot":"","sources":["../../../../../src/simple/block/runner/generateTransactionFeeTransfers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,gBAAgB,CAAA;AAG5D,OAAO,KAAK,EACV,yBAAyB,EACzB,QAAQ,EAET,MAAM,2BAA2B,CAAA;AAKlC,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CA0CtI"}
+{"version":3,"file":"generateTransactionFeeTransfers.d.ts","sourceRoot":"","sources":["../../../../../src/simple/block/runner/generateTransactionFeeTransfers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,gBAAgB,CAAA;AAG5D,OAAO,KAAK,EACV,yBAAyB,EACzB,QAAQ,EAET,MAAM,sBAAsB,CAAA;AAM7B,wBAAsB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CA0CtI"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/chain-services",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "XYO Layer One SDK Services",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -40,44 +40,41 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@xylabs/sdk-js": "~5.0.51",
-    "@xyo-network/account-model": "~5.2.17",
-    "@xyo-network/archivist-memory": "~5.2.17",
-    "@xyo-network/archivist-model": "~5.2.17",
-    "@xyo-network/boundwitness-model": "~5.2.17",
-    "@xyo-network/boundwitness-validator": "~5.2.17",
-    "@xyo-network/boundwitness-wrapper": "~5.2.17",
-    "@xyo-network/chain-analyze": "~1.18.0",
-    "@xyo-network/chain-modules": "~1.18.0",
-    "@xyo-network/chain-protocol": "~1.18.0",
-    "@xyo-network/chain-utils": "~1.18.0",
-    "@xyo-network/payload-builder": "~5.2.17",
-    "@xyo-network/payload-model": "~5.2.17",
+    "@xylabs/sdk-js": "~5.0.61",
+    "@xyo-network/account-model": "~5.2.22",
+    "@xyo-network/archivist-memory": "~5.2.22",
+    "@xyo-network/archivist-model": "~5.2.22",
+    "@xyo-network/boundwitness-model": "~5.2.22",
+    "@xyo-network/boundwitness-validator": "~5.2.22",
+    "@xyo-network/boundwitness-wrapper": "~5.2.22",
+    "@xyo-network/chain-analyze": "~1.18.1",
+    "@xyo-network/chain-modules": "~1.18.1",
+    "@xyo-network/chain-protocol": "~1.18.1",
+    "@xyo-network/chain-utils": "~1.18.1",
+    "@xyo-network/payload-builder": "~5.2.22",
+    "@xyo-network/payload-model": "~5.2.22",
     "@xyo-network/typechain": "~4.0.11",
-    "@xyo-network/xl1-protocol": "~1.14.17",
-    "@xyo-network/xl1-protocol-sdk": "~1.18.0",
-    "@xyo-network/xl1-validation": "~1.18.0",
-    "@xyo-network/xl1-wrappers": "~1.18.0",
+    "@xyo-network/xl1-sdk": "~1.18.2",
     "async-mutex": "~0.5.0",
     "ethers": "^6.16.0",
     "lru-cache": "^11.2.4"
   },
   "devDependencies": {
-    "@types/node": "~25.0.2",
-    "@xylabs/sdk-js": "~5.0.51",
+    "@types/node": "~25.0.8",
+    "@xylabs/sdk-js": "~5.0.61",
     "@xylabs/ts-scripts-yarn3": "~7.2.32",
     "@xylabs/tsconfig": "~7.2.32",
-    "@xylabs/vitest-extended": "~5.0.51",
-    "@xyo-network/account": "~5.2.17",
-    "@xyo-network/account-model": "~5.2.17",
-    "@xyo-network/chain-validation": "~1.18.0",
-    "@xyo-network/wallet": "~5.2.17",
-    "@xyo-network/wallet-model": "~5.2.17",
+    "@xylabs/vitest-extended": "~5.0.61",
+    "@xyo-network/account": "~5.2.22",
+    "@xyo-network/account-model": "~5.2.22",
+    "@xyo-network/chain-validation": "~1.18.1",
+    "@xyo-network/wallet": "~5.2.22",
+    "@xyo-network/wallet-model": "~5.2.22",
     "cosmiconfig": "^9.0.0",
     "eslint": "^9.39.2",
     "tslib": "~2.8.1",
     "typescript": "~5.9.3",
-    "vitest": "~4.0.15",
+    "vitest": "~4.0.17",
     "vitest-mock-extended": "~3.1.0",
     "web3-types": "~1.10.0"
   },
@@ -88,4 +85,4 @@
   "publishConfig": {
     "access": "restricted"
   }
-}
+}

package/src/AccountBalance/accountBalanceServiceFromArchivist.ts

@@ -2,15 +2,14 @@ import type { Hash } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
 import type { ReadWriteArchivist } from '@xyo-network/archivist-model'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { ChainId } from '@xyo-network/xl1-protocol'
-import { StepSizes } from '@xyo-network/xl1-protocol'
 import type {
-  AccountBalanceViewer, BalancesStepSummary, CreatableProviderContext, SimpleAccountBalanceViewerParams, TransfersStepSummary,
-} from '@xyo-network/xl1-protocol-sdk'
+  AccountBalanceViewer, BalancesStepSummary, ChainId,
+  CreatableProviderContext, SimpleAccountBalanceViewerParams, TransfersStepSummary,
+} from '@xyo-network/xl1-sdk'
 import {
   findMostRecentBlock, LruCacheMap, payloadMapFromStore,
-  SimpleAccountBalanceViewer,
-} from '@xyo-network/xl1-protocol-sdk'
+  SimpleAccountBalanceViewer, StepSizes,
+} from '@xyo-network/xl1-sdk'
 import { Semaphore } from 'async-mutex'
 
 // this is intended to only be used for testing

package/src/BlockReward/EvmBlockRewardViewer.ts

@@ -4,13 +4,11 @@ import {
 } from '@xylabs/sdk-js'
 import { XyoChainRewards__factory as XyoChainRewardsFactory } from '@xyo-network/typechain'
 import {
-  asAttoXL1, AttoXL1, XL1BlockNumber,
-} from '@xyo-network/xl1-protocol'
-import {
-  BlockRewardViewer,
+  asAttoXL1, AttoXL1, BlockRewardViewer,
   BlockRewardViewerMoniker,
   ChainContractViewer,
-} from '@xyo-network/xl1-protocol-sdk'
+  XL1BlockNumber,
+} from '@xyo-network/xl1-sdk'
 import { Provider } from 'ethers/providers'
 
 export interface EvmBlockRewardViewerParams extends CreatableParams {

package/src/ChainService/Evm/Evm.ts

@@ -3,12 +3,13 @@ import type {
 } from '@xylabs/sdk-js'
 import { toAddress, toEthAddress } from '@xylabs/sdk-js'
 import type { StakedXyoChain } from '@xyo-network/typechain'
-import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol'
-import { ChainContractViewerMoniker, type ChainService } from '@xyo-network/xl1-protocol-sdk'
+import type {
+  AttoXL1, ChainService, XL1BlockNumber,
+} from '@xyo-network/xl1-sdk'
+import { AbstractCreatableProvider, ChainContractViewerMoniker } from '@xyo-network/xl1-sdk'
 import { getAddress } from 'ethers/address'
 import type { ContractRunner } from 'ethers/providers'
 
-import { BaseService } from '../../BaseService.ts'
 import type { BaseServiceParams } from '../../model/index.ts'
 
 export interface EvmChainViewerParams extends BaseServiceParams {
@@ -20,10 +21,10 @@ export interface EvmChainViewerParams extends BaseServiceParams {
 /**
  * A class that represents a chain stake as backed by an EVM smart contract
  */
-export class EvmChainViewer extends BaseService<EvmChainViewerParams> implements ChainService {
+export class EvmChainViewer extends AbstractCreatableProvider<EvmChainViewerParams> implements ChainService {
   static readonly defaultMoniker = ChainContractViewerMoniker
   static readonly monikers = [ChainContractViewerMoniker]
-  moniker = EvmChainViewer.defaultMoniker
+  override moniker = EvmChainViewer.defaultMoniker
 
   protected get contract() {
     return this.params.contract

package/src/ChainService/Memory/Memory.ts

@@ -2,13 +2,12 @@ import type {
   Address, Hex, Promisable,
 } from '@xylabs/sdk-js'
 import { toAddress, ZERO_ADDRESS } from '@xylabs/sdk-js'
-import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol'
-import {
-  ChainContractViewerMoniker,
-  type ChainService,
-} from '@xyo-network/xl1-protocol-sdk'
+import type {
+  AttoXL1,
+  ChainService, XL1BlockNumber,
+} from '@xyo-network/xl1-sdk'
+import { AbstractCreatableProvider, ChainContractViewerMoniker } from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../../BaseService.ts'
 import type { BaseServiceParams } from '../../model/index.ts'
 
 export interface MemoryChainViewerParams extends BaseServiceParams {
@@ -18,10 +17,10 @@ export interface MemoryChainViewerParams extends BaseServiceParams {
 /**
  * A class that represents a chain stake as backed in memory
  */
-export class MemoryChainViewer extends BaseService<MemoryChainViewerParams> implements ChainService {
+export class MemoryChainViewer extends AbstractCreatableProvider<MemoryChainViewerParams> implements ChainService {
   static readonly defaultMoniker = ChainContractViewerMoniker
   static readonly monikers = [ChainContractViewerMoniker]
-  moniker = MemoryChainViewer.defaultMoniker
+  override moniker = MemoryChainViewer.defaultMoniker
 
   protected _chainId: Hex | undefined
   protected _simulatedStake: bigint = 1n

package/src/ChainValidator/XyoValidator.ts

@@ -1,18 +1,13 @@
-import {
-  creatable,
-  Promisable,
-} from '@xylabs/sdk-js'
-import {
+import type { Promisable } from '@xylabs/sdk-js'
+import type {
   BlockBoundWitness,
+  BlockViewer, HydratedBlockStateValidationFunction,
   SignedHydratedTransactionWithStorageMeta,
-} from '@xyo-network/xl1-protocol'
-import {
-  BlockViewer, BlockViewerMoniker, HydratedBlockStateValidationFunction,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
+import { AbstractCreatableProvider, BlockViewerMoniker } from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../BaseService.ts'
-import { BaseServiceParams } from '../model/index.ts'
-import { Validator } from './model/index.ts'
+import type { BaseServiceParams } from '../model/index.ts'
+import type { Validator } from './model/index.ts'
 
 export interface XyoValidatorParams extends BaseServiceParams {
   // account: AccountInstance
@@ -25,8 +20,8 @@ export interface XyoValidatorParams extends BaseServiceParams {
   validateHydratedBlockState: HydratedBlockStateValidationFunction
 }
 
-@creatable()
-export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParams> extends BaseService<TParams> implements Validator {
+export class XyoValidator<TParams extends XyoValidatorParams = XyoValidatorParams> extends AbstractCreatableProvider<TParams> implements Validator {
+  moniker = 'Validator'
   private _blockViewer?: BlockViewer
   // get address() {
   //   return this.account.address

package/src/ChainValidator/model/Validator.ts

@@ -1,5 +1,5 @@
 import type { Promisable } from '@xylabs/sdk-js'
-import type { BlockBoundWitness, SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import type { BlockBoundWitness, SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-sdk'
 
 export interface Validator {
   validatePendingBlock(block: BlockBoundWitness): Promisable<Error[]>

package/src/Election/BaseElectionService.ts

@@ -1,15 +1,16 @@
 import {
-  Address, assertEx, creatable, Hash,
+  Address, assertEx, Hash,
 } from '@xylabs/sdk-js'
 import { hexToLast4BytesInt, shuffleWithSeed } from '@xyo-network/chain-utils'
 import { WithHashMeta } from '@xyo-network/payload-model'
-import { BlockBoundWitness } from '@xyo-network/xl1-protocol'
-import type {
-  BlockViewer,
-  ChainStakeViewer, ElectionService, StakeIntentService,
-} from '@xyo-network/xl1-protocol-sdk'
+import {
+  AbstractCreatableProvider,
+  type BlockViewer,
+  type ChainStakeViewer, creatableProvider,
+  type ElectionService, type StakeIntentService,
+} from '@xyo-network/xl1-sdk'
+import { BlockBoundWitness } from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseElectionServicesParams extends BaseServiceParams {
@@ -18,8 +19,12 @@ export interface BaseElectionServicesParams extends BaseServiceParams {
   stakeIntentService?: StakeIntentService
 }
 
-@creatable()
-export class BaseElectionService extends BaseService<BaseElectionServicesParams> implements ElectionService {
+@creatableProvider()
+export class BaseElectionService extends AbstractCreatableProvider<BaseElectionServicesParams> implements ElectionService {
+  static readonly defaultMoniker = 'Election'
+  static readonly dependencies = []
+  static readonly monikers = ['Election']
+  moniker = BaseElectionService.defaultMoniker
   get blockViewer() {
     return assertEx(this.params.blockViewer, () => 'No block viewer')
   }

package/src/NetworkStakeStepReward/BaseNetworkStakeStepRewardService.ts

@@ -1,17 +1,14 @@
-import {
-  Address, creatable, Promisable,
-} from '@xylabs/sdk-js'
+import { Address, Promisable } from '@xylabs/sdk-js'
 import { ReadArchivist } from '@xyo-network/archivist-model'
 import {
+  AbstractCreatableProvider,
+  creatableProvider,
+  EventingChainBlockNumberIteratorService, NetworkStakeStepRewardService, NetworkStakeStepRewardViewerMoniker,
   StepIdentity,
   StepIdentityString,
-} from '@xyo-network/xl1-protocol'
-import {
-  EventingChainBlockNumberIteratorService, NetworkStakeStepRewardService, NetworkStakeStepRewardViewerMoniker,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 import { Provider } from 'ethers'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseNetworkStakeStepRewardServiceParams extends BaseServiceParams {
@@ -20,11 +17,13 @@ export interface BaseNetworkStakeStepRewardServiceParams extends BaseServicePara
   ethProvider?: Provider
 }
 
-@creatable()
-export class BaseNetworkStakeStepRewardService extends BaseService<BaseNetworkStakeStepRewardServiceParams> implements NetworkStakeStepRewardService {
+@creatableProvider()
+export class BaseNetworkStakeStepRewardService extends
+  AbstractCreatableProvider<BaseNetworkStakeStepRewardServiceParams> implements NetworkStakeStepRewardService {
   static readonly defaultMoniker = NetworkStakeStepRewardViewerMoniker
+  static readonly dependencies = []
   static readonly monikers = [NetworkStakeStepRewardViewerMoniker]
-  moniker = BaseNetworkStakeStepRewardService.defaultMoniker
+  override moniker = BaseNetworkStakeStepRewardService.defaultMoniker
 
   networkStakeStepRewardAddressHistory(_address: Address): Promisable<Record<Address, bigint>> {
     throw new Error('Method [networkStakeStepRewardAddressHistory] not implemented.')

package/src/PendingTransactions/BasePendingTransactions.ts

@@ -1,6 +1,6 @@
 import { ValueType } from '@opentelemetry/api'
 import {
-  assertEx, creatable,
+  assertEx,
   exists,
   filterAs, filterAsync, forget, Hash,
   isDefined, isUndefined,
@@ -11,19 +11,18 @@ import {
   Payload, PayloadBundle, Sequence, WithStorageMeta,
 } from '@xyo-network/payload-model'
 import {
-  asBlockBoundWitnessWithHashMeta, asXL1BlockNumber, ChainId, HydratedTransactionValidationFunction, isTransactionBoundWitnessWithStorageMeta,
+  AbstractCreatableProvider,
+  asBlockBoundWitnessWithHashMeta, asXL1BlockNumber, ChainId, creatableProvider,
+  findMostRecentBlock, HydratedTransactionValidationFunction, isTransactionBoundWitnessWithStorageMeta,
+  MempoolViewer, MempoolViewerMoniker, PendingBlocksOptions, PendingTransactionsOptions,
   SignedHydratedBlockWithHashMeta,
   SignedHydratedTransactionWithHashMeta,
   SignedHydratedTransactionWithStorageMeta,
+  TransactionJsonSchemaValidator, validateTransaction,
   XL1BlockNumber,
-} from '@xyo-network/xl1-protocol'
-import {
-  findMostRecentBlock, MempoolViewer, MempoolViewerMoniker, PendingBlocksOptions, PendingTransactionsOptions,
-} from '@xyo-network/xl1-protocol-sdk'
-import { TransactionJsonSchemaValidator, validateTransaction } from '@xyo-network/xl1-validation'
+} from '@xyo-network/xl1-sdk'
 import { Mutex } from 'async-mutex'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 import { bundledPayloadToHydratedTransaction } from './bundledPayloadToHydratedTransaction.ts'
 import { hydratedTransactionToPayloadBundle } from './hydratedTransactionToPayloadBundle.ts'
@@ -36,9 +35,10 @@ export interface BasePendingTransactionsServiceParams extends BaseServiceParams
   rejectedTransactionsArchivist: ArchivistInstance
 }
 
-@creatable()
-export class BasePendingTransactionsService extends BaseService<BasePendingTransactionsServiceParams> implements MempoolViewer {
+@creatableProvider()
+export class BasePendingTransactionsService extends AbstractCreatableProvider<BasePendingTransactionsServiceParams> implements MempoolViewer {
   static readonly defaultMoniker = MempoolViewerMoniker
+  static readonly dependencies = []
   static readonly monikers = [MempoolViewerMoniker]
 
   private static readonly MutexPriority = {
@@ -56,7 +56,7 @@ export class BasePendingTransactionsService extends BaseService<BasePendingTrans
     PurgeTransactions: 1,
   } as const
 
-  moniker = BasePendingTransactionsService.defaultMoniker
+  override moniker = BasePendingTransactionsService.defaultMoniker
 
   /**
    * A mutex to ensure that the counting the number of pending transactions is

package/src/PendingTransactions/bundledPayloadToHydratedTransaction.ts

@@ -1,7 +1,7 @@
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle, WithStorageMeta } from '@xyo-network/payload-model'
-import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
-import { asSignedTransactionBoundWitnessWithHashMeta } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-sdk'
+import { asSignedTransactionBoundWitnessWithHashMeta } from '@xyo-network/xl1-sdk'
 
 export const bundledPayloadToHydratedTransaction = async (
   payload: WithStorageMeta<PayloadBundle>,

package/src/PendingTransactions/hydratedTransactionToPayloadBundle.ts

@@ -2,8 +2,8 @@ import type { Hash } from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle } from '@xyo-network/payload-model'
 import { PayloadBundleSchema } from '@xyo-network/payload-model'
-import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
-import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
+import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-sdk'
+import { flattenHydratedTransaction } from '@xyo-network/xl1-sdk'
 
 export const hydratedTransactionToPayloadBundle = (transaction: SignedHydratedTransactionWithHashMeta): PayloadBundle => {
   const root = transaction[0]._hash

package/src/Schemas/BaseSchemasService.ts

@@ -1,22 +1,25 @@
-import {
-  creatable, Hash, spanRootAsync,
-} from '@xylabs/sdk-js'
+import { Hash, spanRootAsync } from '@xylabs/sdk-js'
 import { Schema } from '@xyo-network/payload-model'
 import {
+  AbstractCreatableProvider,
+  creatableProvider,
   SchemasService,
   SchemasStepSummaryContext,
   schemasSummary,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface BaseSchemasServiceParams extends BaseServiceParams {
   schemasStepSummaryContext: SchemasStepSummaryContext
 }
 
-@creatable()
-export class BaseSchemasService extends BaseService<BaseSchemasServiceParams> implements SchemasService {
+@creatableProvider()
+export class BaseSchemasService extends AbstractCreatableProvider<BaseSchemasServiceParams> implements SchemasService {
+  static readonly defaultMoniker = 'SchemasService'
+  static readonly dependencies = []
+  static readonly monikers = [BaseSchemasService.defaultMoniker]
+  moniker = BaseSchemasService.defaultMoniker
   async schema(head: Hash, schema: Schema): Promise<number> {
     return (await this.schemas(head, [schema]))[schema] ?? 0
   }

package/src/StakeIntent/XyoStakeIntentService.ts

@@ -1,5 +1,5 @@
 import {
-  Address, asAddress, assertEx, creatable, filterAs, Hash,
+  Address, asAddress, assertEx, filterAs, Hash,
   isUndefined,
 } from '@xylabs/sdk-js'
 import { ArchivistInstance, ArchivistNextOptions } from '@xyo-network/archivist-model'
@@ -15,23 +15,24 @@ import {
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import {
-  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent, type Intent,
-} from '@xyo-network/xl1-protocol'
-import {
+  AbstractCreatableProvider,
   asChainIndexingServiceStateWithStorageMeta,
   BlockViewer,
   BlockViewerMoniker,
   ChainIndexingServiceState, ChainIndexingServiceStateSchema, ChainStakeViewer,
   ChainStakeViewerMoniker,
+  creatableProvider,
   isChainIndexingServiceState,
   readPayloadMapFromStore,
   StakeIntentService,
   timeBudget,
-} from '@xyo-network/xl1-protocol-sdk'
+} from '@xyo-network/xl1-sdk'
+import {
+  asBlockBoundWitness, asBlockBoundWitnessWithStorageMeta, asChainStakeIntent, type Intent,
+} from '@xyo-network/xl1-sdk'
 import { Mutex } from 'async-mutex'
 import { LRUCache } from 'lru-cache'
 
-import { BaseService } from '../BaseService.ts'
 import { BaseServiceParams } from '../model/index.ts'
 
 export interface XyoStakeIntentServiceParams extends BaseServiceParams {
@@ -50,8 +51,12 @@ const ACTIVE_STAKE_TTL = 1000 * 60 * 60 * 2 // 2 hours in milliseconds
 const NO_ACTIVE_STAKE_TTL = 1000 * 2 // 2 seconds in milliseconds
 const STAKE_CACHE_MAX_ENTRIES = 10_000
 
-@creatable()
-export class XyoStakeIntentService extends BaseService<XyoStakeIntentServiceParams> implements StakeIntentService {
+@creatableProvider()
+export class XyoStakeIntentService extends AbstractCreatableProvider<XyoStakeIntentServiceParams> implements StakeIntentService {
+  static readonly defaultMoniker = 'StakeIntent'
+  static readonly dependencies = []
+  static readonly monikers = [XyoStakeIntentService.defaultMoniker]
+  moniker = 'StakeIntent'
   // TODO: Use hash instead of block number to handle chain reorgs
   protected _lastIndexedBlockHash: Hash | undefined = undefined
   // TODO: Interval tree per declaration (bank, validator, etc.)

package/src/StakeIntent/lib/getBlockSignedStakeDeclarations.ts

@@ -7,8 +7,8 @@ import { payloadSchemasContains } from '@xyo-network/boundwitness-validator'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import type {
   BlockBoundWitness, ChainStakeIntent, Intent,
-} from '@xyo-network/xl1-protocol'
-import { asChainStakeIntent, ChainStakeIntentSchema } from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-sdk'
+import { asChainStakeIntent, ChainStakeIntentSchema } from '@xyo-network/xl1-sdk'
 
 export const getBlockSignedStakeDeclarations = async (block: BlockBoundWitness, archivist: ArchivistInstance, intent: Intent): Promise<ChainStakeIntent[]> => {
   // Get payloads in block