@xyo-network/xl1-rpc 1.16.0 → 1.16.1

package/dist/node/types/schema/DataLakeViewerRpcSchema.d.ts

@@ -0,0 +1,74 @@
+import * as z from 'zod';
+export declare const DataLakeViewerRpcSchemas: {
+    dataLakeViewer_get: {
+        params: {
+            to: z.ZodTuple<[z.ZodPipe<z.ZodString, z.ZodTransform<import("@xylabs/typeof").Brand<import("@xylabs/typeof").Brand<Lowercase<string>, {
+                readonly __hex: true;
+            }>, {
+                readonly __hash: true;
+            }>, string>>], null>;
+            from: z.ZodTuple<[z.ZodPipe<z.ZodString, z.ZodTransform<import("@xylabs/typeof").Brand<import("@xylabs/typeof").Brand<Lowercase<string>, {
+                readonly __hex: true;
+            }>, {
+                readonly __hash: true;
+            }>, string>>], null>;
+        };
+        result: {
+            to: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+                schema: z.ZodUnion<readonly [z.ZodString, z.ZodPipe<z.ZodString, z.ZodTransform<string & {
+                    __schema: true;
+                }, string>>]>;
+            }, z.core.$strip>, z.ZodPipe<z.ZodCustom<ArrayBuffer, ArrayBuffer>, z.ZodTransform<string, ArrayBuffer>>]>>;
+            from: z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+                schema: z.ZodUnion<readonly [z.ZodString, z.ZodPipe<z.ZodString, z.ZodTransform<string & {
+                    __schema: true;
+                }, string>>]>;
+            }, z.core.$strip>, z.ZodPipe<z.ZodString, z.ZodTransform<ArrayBuffer | SharedArrayBuffer, string>>]>>;
+        };
+    };
+    dataLakeViewer_getMany: {
+        params: {
+            to: z.ZodTuple<[z.ZodArray<z.ZodPipe<z.ZodString, z.ZodTransform<import("@xylabs/typeof").Brand<import("@xylabs/typeof").Brand<Lowercase<string>, {
+                readonly __hex: true;
+            }>, {
+                readonly __hash: true;
+            }>, string>>>], null>;
+            from: z.ZodTuple<[z.ZodArray<z.ZodPipe<z.ZodString, z.ZodTransform<import("@xylabs/typeof").Brand<import("@xylabs/typeof").Brand<Lowercase<string>, {
+                readonly __hex: true;
+            }>, {
+                readonly __hash: true;
+            }>, string>>>], null>;
+        };
+        result: {
+            to: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+                schema: z.ZodUnion<readonly [z.ZodString, z.ZodPipe<z.ZodString, z.ZodTransform<string & {
+                    __schema: true;
+                }, string>>]>;
+            }, z.core.$strip>, z.ZodPipe<z.ZodCustom<ArrayBuffer, ArrayBuffer>, z.ZodTransform<string, ArrayBuffer>>]>>;
+            from: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
+                schema: z.ZodUnion<readonly [z.ZodString, z.ZodPipe<z.ZodString, z.ZodTransform<string & {
+                    __schema: true;
+                }, string>>]>;
+            }, z.core.$strip>, z.ZodPipe<z.ZodString, z.ZodTransform<ArrayBuffer | SharedArrayBuffer, string>>]>>;
+        };
+    };
+    dataLakeViewer_has: {
+        params: {
+            to: z.ZodTuple<[z.ZodPipe<z.ZodString, z.ZodTransform<import("@xylabs/typeof").Brand<import("@xylabs/typeof").Brand<Lowercase<string>, {
+                readonly __hex: true;
+            }>, {
+                readonly __hash: true;
+            }>, string>>], null>;
+            from: z.ZodTuple<[z.ZodPipe<z.ZodString, z.ZodTransform<import("@xylabs/typeof").Brand<import("@xylabs/typeof").Brand<Lowercase<string>, {
+                readonly __hex: true;
+            }>, {
+                readonly __hash: true;
+            }>, string>>], null>;
+        };
+        result: {
+            to: z.ZodBoolean;
+            from: z.ZodBoolean;
+        };
+    };
+};
+//# sourceMappingURL=DataLakeViewerRpcSchema.d.ts.map

package/dist/node/types/schema/DataLakeViewerRpcSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataLakeViewerRpcSchema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/DataLakeViewerRpcSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAQxB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BgB,CAAA"}

package/dist/node/types/schema/common/ArrayBuffer.d.ts

@@ -0,0 +1,4 @@
+import * as z from 'zod';
+export declare const ArrayBufferToJsonZod: z.ZodPipe<z.ZodCustom<ArrayBuffer, ArrayBuffer>, z.ZodTransform<string, ArrayBuffer>>;
+export declare const JsonToArrayBufferZod: z.ZodPipe<z.ZodString, z.ZodTransform<ArrayBuffer | SharedArrayBuffer, string>>;
+//# sourceMappingURL=ArrayBuffer.d.ts.map

package/dist/node/types/schema/common/ArrayBuffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArrayBuffer.d.ts","sourceRoot":"","sources":["../../../../../src/types/schema/common/ArrayBuffer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAiCxB,eAAO,MAAM,oBAAoB,uFAG/B,CAAA;AAEF,eAAO,MAAM,oBAAoB,iFAG/B,CAAA"}

package/dist/node/types/schema/common/index.d.ts

@@ -1,4 +1,5 @@
 export * from './Address.ts';
+export * from './ArrayBuffer.ts';
 export * from './BlockBoundWitness.ts';
 export * from './BlockRange.ts';
 export * from './BoundWitness.ts';

package/dist/node/types/schema/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/types/schema/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AACpC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/types/schema/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,YAAY,CAAA;AAC1B,cAAc,oBAAoB,CAAA;AAClC,cAAc,0BAA0B,CAAA;AACxC,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,0BAA0B,CAAA;AACxC,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,mBAAmB,CAAA;AACjC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,sBAAsB,CAAA;AACpC,cAAc,eAAe,CAAA;AAC7B,cAAc,mBAAmB,CAAA"}

package/dist/node/types/schema/index.d.ts

@@ -2,6 +2,7 @@ export * from './AllRpcSchemas.ts';
 export * from './common/index.ts';
 export * from './createRequestSchema.ts';
 export * from './createResponseSchema.ts';
+export * from './DataLakeViewerRpcSchema.ts';
 export * from './NetworkStakeViewerRpcSchemas.ts';
 export * from './RewardsByPositionViewerRpcSchemas.ts';
 export * from './RewardsByStakerViewerRpcSchemas.ts';

package/dist/node/types/schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,mCAAmC,CAAA;AACjD,cAAc,wCAAwC,CAAA;AACtD,cAAc,sCAAsC,CAAA;AACpD,cAAc,oCAAoC,CAAA;AAClD,cAAc,mCAAmC,CAAA;AACjD,cAAc,mBAAmB,CAAA;AACjC,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,mCAAmC,CAAA;AACjD,cAAc,wCAAwC,CAAA;AACtD,cAAc,sCAAsC,CAAA;AACpD,cAAc,oCAAoC,CAAA;AAClD,cAAc,mCAAmC,CAAA;AACjD,cAAc,mBAAmB,CAAA;AACjC,cAAc,kCAAkC,CAAA;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA;AACxC,cAAc,0BAA0B,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-rpc",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "description": "XYO Layer One API",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -56,13 +56,13 @@
   },
   "dependencies": {
     "@metamask/json-rpc-engine": "~10.1.1",
-    "@xylabs/arraybuffer": "~5.0.19",
-    "@xylabs/assert": "~5.0.19",
-    "@xylabs/axios": "~5.0.19",
-    "@xylabs/exists": "~5.0.19",
-    "@xylabs/hex": "~5.0.19",
-    "@xylabs/promise": "~5.0.19",
-    "@xylabs/typeof": "~5.0.19",
+    "@xylabs/arraybuffer": "~5.0.21",
+    "@xylabs/assert": "~5.0.21",
+    "@xylabs/axios": "~5.0.21",
+    "@xylabs/exists": "~5.0.21",
+    "@xylabs/hex": "~5.0.21",
+    "@xylabs/promise": "~5.0.21",
+    "@xylabs/typeof": "~5.0.21",
     "@xyo-network/account-model": "~5.1.18",
     "@xyo-network/archivist-memory": "~5.1.18",
     "@xyo-network/archivist-model": "~5.1.18",
@@ -73,7 +73,7 @@
     "@xyo-network/payload-builder": "~5.1.18",
     "@xyo-network/payload-model": "~5.1.18",
     "@xyo-network/xl1-protocol": "~1.13.0",
-    "@xyo-network/xl1-protocol-sdk": "~1.16.0",
+    "@xyo-network/xl1-protocol-sdk": "~1.16.1",
     "axios": "~1.13.2",
     "uuid": "~13.0.0",
     "zod": "~4.1.12"
@@ -81,13 +81,13 @@
   "devDependencies": {
     "@metamask/utils": "~11.8.1",
     "@types/node": "~24.10.0",
-    "@xylabs/logger": "~5.0.19",
-    "@xylabs/object": "~5.0.19",
-    "@xylabs/ts-scripts-yarn3": "~7.2.4",
-    "@xylabs/tsconfig": "~7.2.4",
-    "@xylabs/vitest-extended": "~5.0.19",
+    "@xylabs/logger": "~5.0.21",
+    "@xylabs/object": "~5.0.21",
+    "@xylabs/ts-scripts-yarn3": "~7.2.8",
+    "@xylabs/tsconfig": "~7.2.8",
+    "@xylabs/vitest-extended": "~5.0.21",
     "@xyo-network/account": "~5.1.18",
-    "@xyo-network/chain-protocol": "~1.16.0",
+    "@xyo-network/chain-protocol": "~1.16.1",
     "@xyo-network/wallet": "~5.1.18",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.1",

package/src/engine/rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer.ts

@@ -1,9 +1,9 @@
-import type { RewardsByPositionViewerMethods } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByPositionViewerMethods } from '@xyo-network/xl1-protocol-sdk'
 
 import type { NetworkStakingStepRewardsByPositionViewerRpcMethodHandlers } from '../types/index.ts'
 
 export const rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer
-  = (viewer: RewardsByPositionViewerMethods): NetworkStakingStepRewardsByPositionViewerRpcMethodHandlers => {
+  = (viewer: NetworkStakeStepRewardsByPositionViewerMethods): NetworkStakingStepRewardsByPositionViewerRpcMethodHandlers => {
     return {
       networkStakingStepRewardsByPositionViewer_bonus: params => viewer.bonus(...(params ?? [])),
       networkStakingStepRewardsByPositionViewer_claimed: params => viewer.claimed(...(params ?? [])),

package/src/provider/connection/HttpRpcXyoConnection.ts

@@ -1,18 +1,16 @@
-import { isString } from '@xylabs/typeof'
-import { isDataLakeProvider, type XyoDataLake } from '@xyo-network/xl1-protocol-sdk'
+import type { DataLakeRunner, DataLakeViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import { HttpRpcTransport } from '../../transport/index.ts'
 import {
   NetworkStakeViewerRpcSchemas, XyoRunnerRpcSchemas, XyoViewerRpcSchemas,
 } from '../../types/index.ts'
-import { HttpXyoDataLake } from '../datalake/index.ts'
 import { JsonRpcXyoRunner } from '../runner/index.ts'
 import { JsonRpcNetworkStakeViewer, JsonRpcXyoViewer } from '../viewer/index.ts'
 import { XyoBaseConnection } from './XyoBaseConnection.ts'
 
 export interface RpcXyoProviderParams {
   endpoint: string
-  storage?: string | XyoDataLake
+  storage?: DataLakeViewer | DataLakeRunner | (DataLakeViewer & DataLakeRunner)
 }
 
 export class HttpRpcXyoConnection extends XyoBaseConnection {
@@ -23,8 +21,8 @@ export class HttpRpcXyoConnection extends XyoBaseConnection {
     })
     const runner = new JsonRpcXyoRunner(transport)
     const networkStakeViewer = new JsonRpcNetworkStakeViewer(transport)
-    const viewer = new JsonRpcXyoViewer(transport, networkStakeViewer)
-    const storage = isDataLakeProvider(storageParam) ? storageParam : isString(storageParam) ? new HttpXyoDataLake(storageParam) : undefined
+    const viewer = new JsonRpcXyoViewer(transport, { networkStakeViewer })
+    const storage = storageParam
     super({
       runner, viewer, storage,
     })

package/src/provider/connection/XyoBaseConnection.ts

@@ -1,17 +1,17 @@
 import type {
-  XyoConnection, XyoDataLake, XyoDataLakeViewer, XyoNetwork, XyoRunner, XyoViewer,
+  DataLakeRunner, DataLakeViewer, XyoConnection, XyoNetwork, XyoRunner, XyoViewer,
 } from '@xyo-network/xl1-protocol-sdk'
 
 export class XyoBaseConnection implements XyoConnection {
   private readonly _network?: XyoNetwork
   private readonly _runner?: XyoRunner
-  private readonly _storage?: XyoDataLake | XyoDataLakeViewer
+  private readonly _storage?: DataLakeRunner | DataLakeViewer | (DataLakeRunner & DataLakeViewer)
   private readonly _viewer?: XyoViewer
 
   constructor(params?: {
     network?: XyoNetwork
     runner?: XyoRunner
-    storage?: XyoDataLake | XyoDataLakeViewer
+    storage?: DataLakeRunner | DataLakeViewer | (DataLakeRunner & DataLakeViewer)
     viewer?: XyoViewer
   }) {
     this._network = params?.network
@@ -28,7 +28,7 @@ export class XyoBaseConnection implements XyoConnection {
     return this._runner
   }
 
-  get storage(): XyoDataLake | XyoDataLakeViewer | undefined {
+  get storage(): DataLakeRunner | DataLakeViewer | (DataLakeRunner & DataLakeViewer) | undefined {
     return this._storage
   }
 

package/src/provider/connection/spec/XyoConnection.spec.ts

@@ -18,7 +18,7 @@ describe('RpcEngine - XyoProvider', () => {
     const engine = rpcEngineFromConnection(connection)
     const transport = new MemoryRpcTransport(engine, AllRpcSchemas)
     const networkStakeViewer = new JsonRpcNetworkStakeViewer(transport)
-    const viewer = new JsonRpcXyoViewer(transport, networkStakeViewer)
+    const viewer = new JsonRpcXyoViewer(transport, { networkStakeViewer })
     sut = new XyoBaseConnection({ runner, viewer })
   })
   it('should expose a runner', () => {

package/src/provider/datalake/JsonRpcDataLakeViewer.ts

@@ -0,0 +1,10 @@
+import type { DataLakeViewer } from '@xyo-network/xl1-protocol-sdk'
+
+import type { DataLakeViewerRpcSchemas, RpcTransport } from '../../index-node.ts'
+import { JsonRpcDataLakeViewerMethods } from './JsonRpcDataLakeViewerMethods.ts'
+
+export class JsonRpcDataLakeViewer extends JsonRpcDataLakeViewerMethods implements DataLakeViewer {
+  constructor(transport: RpcTransport<typeof DataLakeViewerRpcSchemas>) {
+    super(transport)
+  }
+}

package/src/provider/datalake/JsonRpcDataLakeViewerMethods.ts

@@ -0,0 +1,19 @@
+import type { Payload } from '@xyo-network/payload-model'
+import type { DataLakeViewerMethods } from '@xyo-network/xl1-protocol-sdk'
+
+import type { DataLakeViewerRpcSchemas } from '../../types/index.ts'
+import { JsonRpcViewer } from '../viewer/index.ts'
+
+export class JsonRpcDataLakeViewerMethods extends JsonRpcViewer<typeof DataLakeViewerRpcSchemas> implements DataLakeViewerMethods {
+  get(id: unknown): Promise<Payload | ArrayBuffer | undefined> {
+    throw new Error('Method not implemented.')
+  }
+
+  getMany(id: unknown): Promise<(Payload | ArrayBuffer)[]> {
+    throw new Error('Method not implemented.')
+  }
+
+  has(id: unknown): Promise<boolean> {
+    throw new Error('Method not implemented.')
+  }
+}

package/src/provider/datalake/index.ts

@@ -1,3 +1,2 @@
-export * from './AbstractXyoDataLake.ts'
-export * from './ArchivistXyoDataLake.ts'
-export * from './HttpXyoDataLake.ts'
+export * from './JsonRpcDataLakeViewer.ts'
+export * from './JsonRpcDataLakeViewerMethods.ts'

package/src/provider/viewer/JsonRpcNetworkStakeViewer/JsonRpcNetworkStakeViewer.ts

@@ -1,4 +1,4 @@
-import type { NetworkStakeViewer, StepRewardsViewer } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsViewer, NetworkStakeViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import type { RpcTransport } from '../../../transport/index.ts'
 import type { NetworkStakeViewerRpcSchemas } from '../../../types/index.ts'
@@ -6,14 +6,14 @@ import { JsonRpcNetworkStakingStepRewardsViewer } from '../JsonRpcNetworkStaking
 import { JsonRpcNetworkStakeViewerMethods } from './JsonRpcNetworkStakeViewerMethods.ts'
 
 export class JsonRpcNetworkStakeViewer extends JsonRpcNetworkStakeViewerMethods implements NetworkStakeViewer {
-  protected _stepRewards: StepRewardsViewer
+  protected _stepRewards: NetworkStakeStepRewardsViewer
 
   constructor(transport: RpcTransport<typeof NetworkStakeViewerRpcSchemas>) {
     super(transport)
     this._stepRewards = new JsonRpcNetworkStakingStepRewardsViewer(transport)
   }
 
-  get stepRewards(): StepRewardsViewer {
+  get stepRewards(): NetworkStakeStepRewardsViewer {
     return this._stepRewards
   }
 }

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsByPositionViewer/JsonRpcNetworkStakingStepRewardsByPositionViewer.ts

@@ -1,6 +1,6 @@
-import type { RewardsByPositionViewer } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByPositionViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import { JsonRpcNetworkStakingStepRewardsByPositionViewerMethods } from './JsonRpcNetworkStakingStepRewardsByPositionViewerMethods.ts'
 
 export class JsonRpcNetworkStakingStepRewardsByPositionViewer extends JsonRpcNetworkStakingStepRewardsByPositionViewerMethods
-  implements RewardsByPositionViewer {}
+  implements NetworkStakeStepRewardsByPositionViewer {}

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsByPositionViewer/JsonRpcNetworkStakingStepRewardsByPositionViewerMethods.ts

@@ -1,27 +1,27 @@
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
-import type { RewardsByPositionViewerMethods, RewardsByPositionViewerOptions } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByPositionViewerMethods, NetworkStakeStepRewardsByPositionViewerOptions } from '@xyo-network/xl1-protocol-sdk'
 
 import type { NetworkStakingStepRewardsByPositionViewerRpcSchemas } from '../../../types/index.ts'
 import { JsonRpcViewer } from '../JsonRpcViewer.ts'
 export class JsonRpcNetworkStakingStepRewardsByPositionViewerMethods extends
-  JsonRpcViewer<typeof NetworkStakingStepRewardsByPositionViewerRpcSchemas> implements RewardsByPositionViewerMethods {
-  async bonus(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  JsonRpcViewer<typeof NetworkStakingStepRewardsByPositionViewerRpcSchemas> implements NetworkStakeStepRewardsByPositionViewerMethods {
+  async bonus(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_bonus', [options]))
   }
 
-  async claimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async claimed(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_claimed', [options]))
   }
 
-  async earned(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async earned(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_earned', [options]))
   }
 
-  async total(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async total(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_total', [options]))
   }
 
-  async unclaimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async unclaimed(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_unclaimed', [options]))
   }
 }

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsByStakerViewer/JsonRpcNetworkStakingStepRewardsByStakerViewer.ts

@@ -1,5 +1,6 @@
-import type { RewardsByStakerViewer } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByStakerViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import { JsonRpcNetworkStakingStepRewardsByStakerViewerMethods } from './JsonRpcNetworkStakingStepRewardsByStakerViewerMethods.ts'
 
-export class JsonRpcNetworkStakingStepRewardsViewer extends JsonRpcNetworkStakingStepRewardsByStakerViewerMethods implements RewardsByStakerViewer {}
+export class JsonRpcNetworkStakingStepRewardsByStakerViewer extends
+  JsonRpcNetworkStakingStepRewardsByStakerViewerMethods implements NetworkStakeStepRewardsByStakerViewer {}

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsByStakerViewer/JsonRpcNetworkStakingStepRewardsByStakerViewerMethods.ts

@@ -1,27 +1,27 @@
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
-import type { RewardsByPositionViewerMethods, RewardsByPositionViewerOptions } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByPositionViewerMethods, NetworkStakeStepRewardsByPositionViewerOptions } from '@xyo-network/xl1-protocol-sdk'
 
 import type { NetworkStakingStepRewardsByStakerViewerRpcSchemas } from '../../../types/index.ts'
 import { JsonRpcViewer } from '../JsonRpcViewer.ts'
 export class JsonRpcNetworkStakingStepRewardsByStakerViewerMethods extends
-  JsonRpcViewer<typeof NetworkStakingStepRewardsByStakerViewerRpcSchemas> implements RewardsByPositionViewerMethods {
-  async bonus(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  JsonRpcViewer<typeof NetworkStakingStepRewardsByStakerViewerRpcSchemas> implements NetworkStakeStepRewardsByPositionViewerMethods {
+  async bonus(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_bonus', [options]))
   }
 
-  async claimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async claimed(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_claimed', [options]))
   }
 
-  async earned(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async earned(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_earned', [options]))
   }
 
-  async total(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async total(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_total', [options]))
   }
 
-  async unclaimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async unclaimed(options?: NetworkStakeStepRewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_unclaimed', [options]))
   }
 }

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsByStepViewer/JsonRpcNetworkStakingStepRewardsByStepViewer.ts

@@ -1,5 +1,6 @@
-import type { RewardsByStepViewer } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByStepViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import { JsonRpcNetworkStakingStepRewardsByStepViewerMethods } from './JsonRpcNetworkStakingStepRewardsByStepViewerMethods.ts'
 
-export class JsonRpcNetworkStakingStepRewardsByStepViewer extends JsonRpcNetworkStakingStepRewardsByStepViewerMethods implements RewardsByStepViewer {}
+export class JsonRpcNetworkStakingStepRewardsByStepViewer extends
+  JsonRpcNetworkStakingStepRewardsByStepViewerMethods implements NetworkStakeStepRewardsByStepViewer {}

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsByStepViewer/JsonRpcNetworkStakingStepRewardsByStepViewerMethods.ts

@@ -1,27 +1,27 @@
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
-import type { RewardsByStepViewerMethods, RewardsByStepViewerOptions } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsByStepViewerMethods, NetworkStakeStepRewardsByStepViewerOptions } from '@xyo-network/xl1-protocol-sdk'
 
 import type { NetworkStakingStepRewardsByStepViewerRpcSchemas } from '../../../types/index.ts'
 import { JsonRpcViewer } from '../JsonRpcViewer.ts'
 export class JsonRpcNetworkStakingStepRewardsByStepViewerMethods extends
-  JsonRpcViewer<typeof NetworkStakingStepRewardsByStepViewerRpcSchemas> implements RewardsByStepViewerMethods {
-  async bonus(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  JsonRpcViewer<typeof NetworkStakingStepRewardsByStepViewerRpcSchemas> implements NetworkStakeStepRewardsByStepViewerMethods {
+  async bonus(options?: NetworkStakeStepRewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_bonus', [options]))
   }
 
-  async claimed(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async claimed(options?: NetworkStakeStepRewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_claimed', [options]))
   }
 
-  async earned(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async earned(options?: NetworkStakeStepRewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_earned', [options]))
   }
 
-  async total(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async total(options?: NetworkStakeStepRewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_total', [options]))
   }
 
-  async unclaimed(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+  async unclaimed(options?: NetworkStakeStepRewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
     return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_unclaimed', [options]))
   }
 }

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsTotalViewer/JsonRpcNetworkStakingStepRewardsTotalViewer.ts

@@ -1,5 +1,6 @@
-import type { RewardsTotalViewer } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsTotalViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import { JsonRpcNetworkStakingStepRewardsTotalViewerMethods } from './JsonRpcNetworkStakingStepRewardsTotalViewerMethods.ts'
 
-export class JsonRpcNetworkStakingStepRewardsTotalViewer extends JsonRpcNetworkStakingStepRewardsTotalViewerMethods implements RewardsTotalViewer {}
+export class JsonRpcNetworkStakingStepRewardsTotalViewer extends
+  JsonRpcNetworkStakingStepRewardsTotalViewerMethods implements NetworkStakeStepRewardsTotalViewer {}

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsTotalViewer/JsonRpcNetworkStakingStepRewardsTotalViewerMethods.ts

@@ -1,27 +1,27 @@
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
-import type { RewardsRangeOptions, RewardsTotalViewerMethods } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsRangeOptions, NetworkStakeStepRewardsTotalViewerMethods } from '@xyo-network/xl1-protocol-sdk'
 
 import type { NetworkStakingStepRewardsTotalViewerRpcSchemas } from '../../../types/index.ts'
 import { JsonRpcViewer } from '../JsonRpcViewer.ts'
 export class JsonRpcNetworkStakingStepRewardsTotalViewerMethods extends
-  JsonRpcViewer<typeof NetworkStakingStepRewardsTotalViewerRpcSchemas> implements RewardsTotalViewerMethods {
-  async bonus(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+  JsonRpcViewer<typeof NetworkStakingStepRewardsTotalViewerRpcSchemas> implements NetworkStakeStepRewardsTotalViewerMethods {
+  async bonus(options?: NetworkStakeStepRewardsRangeOptions | undefined): Promise<AttoXL1> {
     return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_bonus', [options]))
   }
 
-  async claimed(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+  async claimed(options?: NetworkStakeStepRewardsRangeOptions | undefined): Promise<AttoXL1> {
     return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_claimed', [options]))
   }
 
-  async earned(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+  async earned(options?: NetworkStakeStepRewardsRangeOptions | undefined): Promise<AttoXL1> {
     return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_earned', [options]))
   }
 
-  async total(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+  async total(options?: NetworkStakeStepRewardsRangeOptions | undefined): Promise<AttoXL1> {
     return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_total', [options]))
   }
 
-  async unclaimed(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+  async unclaimed(options?: NetworkStakeStepRewardsRangeOptions | undefined): Promise<AttoXL1> {
     return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_unclaimed', [options]))
   }
 }

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsViewer/JsonRpcNetworkStakingStepRewardsViewer.ts

@@ -1,42 +1,40 @@
 import type {
-  RewardsByPositionViewer, RewardsByStakerViewer, RewardsByStepViewer, RewardsTotalViewer, StepRewardsViewerMethods,
+  NetworkStakeStepRewardsByPositionViewer, NetworkStakeStepRewardsByStakerViewer, NetworkStakeStepRewardsByStepViewer,
+  NetworkStakeStepRewardsTotalViewer, NetworkStakeStepRewardsViewerMethods,
 } from '@xyo-network/xl1-protocol-sdk'
 
 import type { RpcTransport } from '../../../transport/index.ts'
 import type { NetworkStakingStepRewardsViewerRpcSchemas } from '../../../types/index.ts'
-import { JsonRpcNetworkStakingStepRewardsByPositionViewer } from '../JsonRpcNetworkStakingStepRewardsByPositionViewer/index.ts'
-import { JsonRpcNetworkStakingStepRewardsByStakerViewerMethods } from '../JsonRpcNetworkStakingStepRewardsByStakerViewer/index.ts'
-import { JsonRpcNetworkStakingStepRewardsByStepViewer } from '../JsonRpcNetworkStakingStepRewardsByStepViewer/index.ts'
-import { JsonRpcNetworkStakingStepRewardsTotalViewer } from '../JsonRpcNetworkStakingStepRewardsTotalViewer/index.ts'
 import { JsonRpcNetworkStakingStepRewardsViewerMethods } from './JsonRpcNetworkStakingStepRewardsViewerMethods.ts'
 
-export class JsonRpcNetworkStakingStepRewardsViewer extends JsonRpcNetworkStakingStepRewardsViewerMethods implements StepRewardsViewerMethods {
-  protected _position: RewardsByPositionViewer
-  protected _staker: RewardsByStakerViewer
-  protected _step: RewardsByStepViewer
-  protected _total: RewardsTotalViewer
+export interface JsonRpcNetworkStakingStepRewardsViewerProviders {
+  position?: NetworkStakeStepRewardsByPositionViewer
+  staker?: NetworkStakeStepRewardsByStakerViewer
+  step?: NetworkStakeStepRewardsByStepViewer
+  total?: NetworkStakeStepRewardsTotalViewer
+}
+
+export class JsonRpcNetworkStakingStepRewardsViewer extends JsonRpcNetworkStakingStepRewardsViewerMethods implements NetworkStakeStepRewardsViewerMethods {
+  protected providers: JsonRpcNetworkStakingStepRewardsViewerProviders
 
-  constructor(transport: RpcTransport<typeof NetworkStakingStepRewardsViewerRpcSchemas>) {
+  constructor(transport: RpcTransport<typeof NetworkStakingStepRewardsViewerRpcSchemas>, providers?: JsonRpcNetworkStakingStepRewardsViewerProviders) {
     super(transport)
-    this._position = new JsonRpcNetworkStakingStepRewardsByPositionViewer(transport)
-    this._staker = new JsonRpcNetworkStakingStepRewardsByStakerViewerMethods(transport)
-    this._step = new JsonRpcNetworkStakingStepRewardsByStepViewer(transport)
-    this._total = new JsonRpcNetworkStakingStepRewardsTotalViewer(transport)
+    this.providers = providers ?? {}
   }
 
-  get position(): RewardsByPositionViewer {
-    return this._position
+  get position(): NetworkStakeStepRewardsByPositionViewer | undefined {
+    return this.providers.position
   }
 
-  get staker(): RewardsByStakerViewer {
-    return this._staker
+  get staker(): NetworkStakeStepRewardsByStakerViewer | undefined {
+    return this.providers.staker
   }
 
-  get step(): RewardsByStepViewer {
-    return this._step
+  get step(): NetworkStakeStepRewardsByStepViewer | undefined {
+    return this.providers.step
   }
 
-  get total(): RewardsTotalViewer {
-    return this._total
+  get total(): NetworkStakeStepRewardsTotalViewer | undefined {
+    return this.providers.total
   }
 }

package/src/provider/viewer/JsonRpcNetworkStakingStepRewardsViewer/JsonRpcNetworkStakingStepRewardsViewerMethods.ts

@@ -1,6 +1,6 @@
-import type { StepRewardsViewerMethods } from '@xyo-network/xl1-protocol-sdk'
+import type { NetworkStakeStepRewardsViewerMethods } from '@xyo-network/xl1-protocol-sdk'
 
 import type { NetworkStakingStepRewardsViewerRpcSchemas } from '../../../types/index.ts'
 import { JsonRpcViewer } from '../JsonRpcViewer.ts'
 export class JsonRpcNetworkStakingStepRewardsViewerMethods extends
-  JsonRpcViewer<typeof NetworkStakingStepRewardsViewerRpcSchemas> implements StepRewardsViewerMethods {}
+  JsonRpcViewer<typeof NetworkStakingStepRewardsViewerRpcSchemas> implements NetworkStakeStepRewardsViewerMethods {}

package/src/provider/viewer/JsonRpcXyoViewer.ts

@@ -18,17 +18,22 @@ import type {
 
 import type { RpcTransport } from '../../transport/index.ts'
 import type { XyoViewerRpcSchemas } from '../../types/index.ts'
+
+export interface JsonRpcXyoViewerProviders {
+  networkStakeViewer?: NetworkStakeViewer
+}
+
 export class JsonRpcXyoViewer implements XyoViewer {
-  protected readonly _networkStakeViewer: NetworkStakeViewer
+  protected readonly providers?: JsonRpcXyoViewerProviders
   protected readonly transport: RpcTransport<typeof XyoViewerRpcSchemas>
 
-  constructor(transport: RpcTransport<typeof XyoViewerRpcSchemas>, networkStakeViewer: NetworkStakeViewer) {
+  constructor(transport: RpcTransport<typeof XyoViewerRpcSchemas>, providers?: JsonRpcXyoViewerProviders) {
     this.transport = transport
-    this._networkStakeViewer = networkStakeViewer
+    this.providers = providers
   }
 
-  get networkStakeViewer(): NetworkStakeViewer {
-    return this._networkStakeViewer
+  get networkStakeViewer() {
+    return this.providers?.networkStakeViewer
   }
 
   async accountBalance(address: Address): Promise<AttoXL1> {