@xyo-network/xl1-rpc 1.15.27 → 1.16.0

package/src/provider/permissions/RpcXyoPermissions.ts

@@ -3,7 +3,7 @@ import type {
   PermissionRequest,
   RequestedPermission,
   XyoPermissions,
-} from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-protocol-sdk'
 
 import type { RpcTransport } from '../../transport/index.ts'
 import type { XyoPermissionsRpcSchemas } from '../../types/index.ts'

package/src/provider/permissions/spec/MemoryXyoPermissions.spec.ts

@@ -1,4 +1,4 @@
-import type { PermissionRequest } from '@xyo-network/xl1-protocol'
+import type { PermissionRequest } from '@xyo-network/xl1-protocol-sdk'
 import {
   beforeEach, describe, expect, it,
 } from 'vitest'

package/src/provider/permissions/store/MemoryPermissions.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/assert'
-import type { InvokerPermission } from '@xyo-network/xl1-protocol'
+import type { InvokerPermission } from '@xyo-network/xl1-protocol-sdk'
 
 import type { Invoker, PermissionsStore } from './PermissionsStore.ts'
 

package/src/provider/permissions/store/PermissionsStore.ts

@@ -1,4 +1,4 @@
-import type { InvokerPermission, PermissionsGetHandler } from '@xyo-network/xl1-protocol'
+import type { InvokerPermission, PermissionsGetHandler } from '@xyo-network/xl1-protocol-sdk'
 
 export type Invoker = string
 export type ParentCapability = string

package/src/provider/runner/JsonRpcXyoRunner.ts

@@ -1,5 +1,6 @@
 import { type Hash } from '@xylabs/hex'
-import type { SignedHydratedTransaction, XyoRunner } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { XyoRunner } from '@xyo-network/xl1-protocol-sdk'
 
 import type { RpcTransport } from '../../transport/index.ts'
 import type { XyoRunnerRpcSchemas } from '../../types/index.ts'

package/src/provider/runner/MemoryXyoRunner.ts

@@ -1,7 +1,8 @@
 import type { Hash } from '@xylabs/hex'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { SignedHydratedTransactionWithStorageMeta, XyoRunner } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
+import type { XyoRunner } from '@xyo-network/xl1-protocol-sdk'
 import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
 
 export class MemoryXyoRunner implements XyoRunner {

package/src/provider/runner/NodeXyoRunner.ts

@@ -7,10 +7,8 @@ import type { NodeInstance } from '@xyo-network/node-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle } from '@xyo-network/payload-model'
 import { PayloadBundleSchema } from '@xyo-network/payload-model'
-import type {
-  SignedHydratedTransaction,
-  XyoRunner,
-} from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
+import type { XyoRunner } from '@xyo-network/xl1-protocol-sdk'
 import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
 
 export class NodeXyoRunner implements XyoRunner {

package/src/provider/signer/JsonRpcXyoSigner.ts

@@ -1,15 +1,9 @@
 import type { Address } from '@xylabs/hex'
-import type { Signed } from '@xyo-network/boundwitness-model'
-import type { Payload } from '@xyo-network/payload-model'
 import type {
-  AllowedBlockPayload,
-  ChainId,
   SignedHydratedTransaction,
-  TransactionBoundWitness,
-  TransactionFeesBigInt,
   UnsignedHydratedTransaction,
-  XyoSigner,
 } from '@xyo-network/xl1-protocol'
+import type { XyoSigner } from '@xyo-network/xl1-protocol-sdk'
 
 import type { RpcTransport } from '../../transport/index.ts'
 import type { XyoSignerRpcSchemas } from '../../types/index.ts'
@@ -25,35 +19,8 @@ export class RpcXyoSigner implements XyoSigner {
     return await this.transport.sendRequest('xyoSigner_address')
   }
 
-  /** @deprecated - use signTransaction instead */
-  async createSignedTransaction(
-    chain: ChainId,
-    elevatedPayloads: AllowedBlockPayload[],
-    additionalPayloads: Payload[],
-    nbf: number,
-    exp: number,
-    fees: TransactionFeesBigInt,
-    from?: Address,
-  ): Promise<Signed<TransactionBoundWitness>> {
-    const ret = await this.transport.sendRequest('xyoSigner_createSignedTransaction', [
-      chain,
-      elevatedPayloads,
-      additionalPayloads,
-      nbf,
-      exp,
-      fees,
-      from,
-    ])
-    return ret
-  }
-
   async signTransaction(tx: UnsignedHydratedTransaction): Promise<SignedHydratedTransaction> {
     const ret = await this.transport.sendRequest('xyoSigner_signTransaction', [tx])
     return ret
   }
 }
-
-/**
- * @deprecated Use `RpcXyoSigner` instead.
- */
-export class JsonRpcXyoSigner extends RpcXyoSigner {}

package/src/provider/signer/MemoryXyoSigner.ts

@@ -3,8 +3,9 @@ import type { AccountInstance } from '@xyo-network/account-model'
 import type { Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model'
 import { type Payload } from '@xyo-network/payload-model'
 import type {
-  AllowedBlockPayload, ChainId, TransactionBoundWitness, TransactionFeesBigInt, XyoSigner,
+  AllowedBlockPayload, ChainId, TransactionBoundWitness, TransactionFeesBigInt,
 } from '@xyo-network/xl1-protocol'
+import type { XyoSigner } from '@xyo-network/xl1-protocol-sdk'
 import { buildTransaction, signTransaction } from '@xyo-network/xl1-protocol-sdk'
 
 export class MemoryXyoSigner implements XyoSigner {

package/src/provider/signer/spec/RpcEngineXyoSigner.spec.ts

@@ -1,16 +1,20 @@
+import { createAsyncMiddleware, JsonRpcEngine } from '@metamask/json-rpc-engine'
+import type { Json } from '@metamask/utils'
 import { asAddress, toAddress } from '@xylabs/hex'
 import { Account } from '@xyo-network/account'
-import type { ChainId, XyoSigner } from '@xyo-network/xl1-protocol'
+import type { ChainId } from '@xyo-network/xl1-protocol'
 import { defaultTransactionFees } from '@xyo-network/xl1-protocol'
+import type { XyoSigner } from '@xyo-network/xl1-protocol-sdk'
+import { buildUnsignedTransaction } from '@xyo-network/xl1-protocol-sdk'
 import {
   beforeAll, describe, expect, it,
 } from 'vitest'
 
-// eslint-disable-next-line import-x/no-internal-modules
-import { rpcEngineFromConnection } from '../../../engine/index-node.ts'
-import { XyoSignerRpcSchemas } from '../../../index-node.ts'
+import { requestSchemas, rpcMethodHandlersFromSigner } from '../../../engine/index.ts'
 import { MemoryRpcTransport } from '../../../transport/index.ts'
-import { XyoBaseConnection } from '../../connection/index.ts'
+import {
+  createRequestSchema, JsonRpcErrorCodes, XyoSignerRpcSchemas,
+} from '../../../types/index.ts'
 import { RpcXyoSigner } from '../JsonRpcXyoSigner.ts'
 import { MemoryXyoSigner } from '../MemoryXyoSigner.ts'
 
@@ -20,8 +24,50 @@ describe('RpcEngine - XyoSigner', () => {
   beforeAll(async () => {
     const account = await Account.random()
     const signer = new MemoryXyoSigner(account)
-    const connection = new XyoBaseConnection({ signer })
-    const engine = rpcEngineFromConnection(connection)
+    const handlers = rpcMethodHandlersFromSigner(signer)
+    const engine = new JsonRpcEngine()
+    engine.push(
+      createAsyncMiddleware(async (req, res) => {
+      // Get method name
+        const method = req.method as keyof typeof handlers & keyof typeof requestSchemas
+        // Get schema for method
+        const handler = handlers[method]
+        // Get handler for method
+        const schema = XyoSignerRpcSchemas[method]
+
+        // If no schema or handler exists
+        if (schema === undefined || handler === undefined) {
+        // return method not found error
+          res.error = JsonRpcErrorCodes.MethodNotFound
+          return
+        }
+
+        // Validate request according to schema
+        let requestSchema = requestSchemas[method]
+        if (requestSchema == undefined) {
+          requestSchema = createRequestSchema(method, schema.params.from)
+          requestSchemas[method] = requestSchema
+        }
+
+        const parsed = requestSchema.safeParse(req)
+        // If validation fails
+        if (!parsed.success) {
+          res.error = {
+          // Return invalid params error
+            ...JsonRpcErrorCodes.InvalidParams,
+            // with the specific validation error message
+            message: parsed.error.message,
+          }
+          return
+        }
+
+        // Call handler with validated params
+        const { params } = parsed.data
+        const result = await handler(params as never)
+        // Parse handler result according to schema
+        res.result = schema.result.to.parse(result) as Json
+      }),
+    )
     const transport = new MemoryRpcTransport(engine, XyoSignerRpcSchemas)
     sut = new RpcXyoSigner(transport)
   })
@@ -31,17 +77,11 @@ describe('RpcEngine - XyoSigner', () => {
       expect(asAddress(address)).toBeDefined()
     })
   })
-  describe('createSignedTransaction', () => {
+  describe('signTransaction', () => {
     it('should return signed transaction', async () => {
-      // eslint-disable-next-line sonarjs/deprecation
-      const signedTransaction = await sut.createSignedTransaction(
-        chain,
-        [],
-        [],
-        0,
-        1000,
-        defaultTransactionFees,
-      )
+      const address = await sut.address()
+      const unsignedTransaction = await buildUnsignedTransaction(chain, [], [], 0, 1000, address, defaultTransactionFees)
+      const signedTransaction = await sut.signTransaction(unsignedTransaction)
       expect(signedTransaction).toBeDefined()
     })
   })

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

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

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

@@ -0,0 +1,9 @@
+import type { NetworkStakeViewerMethods } from '@xyo-network/xl1-protocol-sdk'
+
+import type { NetworkStakeViewerRpcSchemas } from '../../../types/index.ts'
+import { JsonRpcViewer } from '../JsonRpcViewer.ts'
+export class JsonRpcNetworkStakeViewerMethods extends JsonRpcViewer<typeof NetworkStakeViewerRpcSchemas> implements NetworkStakeViewerMethods {
+  async active(blockNumber?: number): Promise<[bigint, number]> {
+    return (await this.transport.sendRequest('networkStakeViewer_active', [blockNumber]))
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './JsonRpcNetworkStakeViewer.ts'
+export * from './JsonRpcNetworkStakeViewerMethods.ts'

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

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

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

@@ -0,0 +1,27 @@
+import type { AttoXL1 } from '@xyo-network/xl1-protocol'
+import type { RewardsByPositionViewerMethods, RewardsByPositionViewerOptions } 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>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_bonus', [options]))
+  }
+
+  async claimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_claimed', [options]))
+  }
+
+  async earned(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_earned', [options]))
+  }
+
+  async total(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_total', [options]))
+  }
+
+  async unclaimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByPositionViewer_unclaimed', [options]))
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './JsonRpcNetworkStakingStepRewardsByPositionViewer.ts'
+export * from './JsonRpcNetworkStakingStepRewardsByPositionViewerMethods.ts'

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

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

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

@@ -0,0 +1,27 @@
+import type { AttoXL1 } from '@xyo-network/xl1-protocol'
+import type { RewardsByPositionViewerMethods, RewardsByPositionViewerOptions } 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>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_bonus', [options]))
+  }
+
+  async claimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_claimed', [options]))
+  }
+
+  async earned(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_earned', [options]))
+  }
+
+  async total(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_total', [options]))
+  }
+
+  async unclaimed(options?: RewardsByPositionViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStakerViewer_unclaimed', [options]))
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './JsonRpcNetworkStakingStepRewardsByStakerViewer.ts'
+export * from './JsonRpcNetworkStakingStepRewardsByStakerViewerMethods.ts'

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

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

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

@@ -0,0 +1,27 @@
+import type { AttoXL1 } from '@xyo-network/xl1-protocol'
+import type { RewardsByStepViewerMethods, RewardsByStepViewerOptions } 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>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_bonus', [options]))
+  }
+
+  async claimed(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_claimed', [options]))
+  }
+
+  async earned(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_earned', [options]))
+  }
+
+  async total(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_total', [options]))
+  }
+
+  async unclaimed(options?: RewardsByStepViewerOptions | undefined): Promise<Record<number, AttoXL1>> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsByStepViewer_unclaimed', [options]))
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './JsonRpcNetworkStakingStepRewardsByStepViewer.ts'
+export * from './JsonRpcNetworkStakingStepRewardsByStepViewerMethods.ts'

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

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

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

@@ -0,0 +1,27 @@
+import type { AttoXL1 } from '@xyo-network/xl1-protocol'
+import type { RewardsRangeOptions, RewardsTotalViewerMethods } 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> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_bonus', [options]))
+  }
+
+  async claimed(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_claimed', [options]))
+  }
+
+  async earned(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_earned', [options]))
+  }
+
+  async total(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_total', [options]))
+  }
+
+  async unclaimed(options?: RewardsRangeOptions | undefined): Promise<AttoXL1> {
+    return (await this.transport.sendRequest('networkStakingStepRewardsTotalViewer_unclaimed', [options]))
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from './JsonRpcNetworkStakingStepRewardsTotalViewer.ts'
+export * from './JsonRpcNetworkStakingStepRewardsTotalViewerMethods.ts'

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

@@ -0,0 +1,42 @@
+import type {
+  RewardsByPositionViewer, RewardsByStakerViewer, RewardsByStepViewer, RewardsTotalViewer, StepRewardsViewerMethods,
+} 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
+
+  constructor(transport: RpcTransport<typeof NetworkStakingStepRewardsViewerRpcSchemas>) {
+    super(transport)
+    this._position = new JsonRpcNetworkStakingStepRewardsByPositionViewer(transport)
+    this._staker = new JsonRpcNetworkStakingStepRewardsByStakerViewerMethods(transport)
+    this._step = new JsonRpcNetworkStakingStepRewardsByStepViewer(transport)
+    this._total = new JsonRpcNetworkStakingStepRewardsTotalViewer(transport)
+  }
+
+  get position(): RewardsByPositionViewer {
+    return this._position
+  }
+
+  get staker(): RewardsByStakerViewer {
+    return this._staker
+  }
+
+  get step(): RewardsByStepViewer {
+    return this._step
+  }
+
+  get total(): RewardsTotalViewer {
+    return this._total
+  }
+}

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

@@ -0,0 +1,6 @@
+import type { StepRewardsViewerMethods } 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 {}

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

@@ -0,0 +1,2 @@
+export * from './JsonRpcNetworkStakingStepRewardsViewer.ts'
+export * from './JsonRpcNetworkStakingStepRewardsViewerMethods.ts'

package/src/provider/viewer/JsonRpcViewer.ts

@@ -0,0 +1,10 @@
+import type { RpcTransport } from '../../transport/index.ts'
+import type { RpcSchemaMap } from '../../types/index.ts'
+
+export class JsonRpcViewer<TSchemas extends RpcSchemaMap> {
+  protected readonly transport: RpcTransport<TSchemas>
+
+  constructor(transport: RpcTransport<TSchemas>) {
+    this.transport = transport
+  }
+}

package/src/provider/viewer/JsonRpcXyoViewer.ts

@@ -1,34 +1,42 @@
 import type { Address, Hash } from '@xylabs/hex'
+import { isDefined } from '@xylabs/typeof'
 import type {
   AttoXL1,
+  BlockRange,
   ChainId,
-  ForkHistory,
-  HydratedBlock, Position, SignedHydratedTransaction,
-  Stake,
+  HydratedBlock,
+  SignedHydratedTransaction,
   StepIdentity,
   StepIdentityString,
-  Transfer,
-  TransferBalanceHistoryItem,
-  TransferPair,
-  XyoViewer,
+  XL1BlockRange,
 } from '@xyo-network/xl1-protocol'
 import { asAttoXL1, asHydratedBlock } from '@xyo-network/xl1-protocol'
+import type {
+  AccountBalanceHistoryItem,
+  ForkHistory, NetworkStakeViewer, Position, TransferBalanceHistoryItem, TransferPair, XyoViewer,
+} from '@xyo-network/xl1-protocol-sdk'
 
 import type { RpcTransport } from '../../transport/index.ts'
 import type { XyoViewerRpcSchemas } from '../../types/index.ts'
 export class JsonRpcXyoViewer implements XyoViewer {
+  protected readonly _networkStakeViewer: NetworkStakeViewer
   protected readonly transport: RpcTransport<typeof XyoViewerRpcSchemas>
 
-  constructor(transport: RpcTransport<typeof XyoViewerRpcSchemas>) {
+  constructor(transport: RpcTransport<typeof XyoViewerRpcSchemas>, networkStakeViewer: NetworkStakeViewer) {
     this.transport = transport
+    this._networkStakeViewer = networkStakeViewer
+  }
+
+  get networkStakeViewer(): NetworkStakeViewer {
+    return this._networkStakeViewer
   }
 
   async accountBalance(address: Address): Promise<AttoXL1> {
     return asAttoXL1(await this.transport.sendRequest('xyoViewer_accountBalance', [address]))
   }
 
-  async accountBalanceHistory(address: Address): Promise<[Hash, Hash, Transfer][]> {
-    return (await this.transport.sendRequest('xyoViewer_accountBalanceHistory', [address]))
+  async accountBalanceHistory(address: Address, range?: BlockRange): Promise<AccountBalanceHistoryItem[]> {
+    return (await this.transport.sendRequest('xyoViewer_accountBalanceHistory', isDefined(range) ? [address, range] : [address])) as AccountBalanceHistoryItem[]
   }
 
   async blockByHash(hash: Hash): Promise<HydratedBlock | null> {
@@ -143,7 +151,7 @@ export class JsonRpcXyoViewer implements XyoViewer {
     return (await this.transport.sendRequest('xyoViewer_stakeById', [id]))
   }
 
-  async stakeByStaker(staker: Address, slot: number): Promise<Stake> {
+  async stakeByStaker(staker: Address, slot: number): Promise<Position> {
     return (await this.transport.sendRequest('xyoViewer_stakeByStaker', [staker, slot]))
   }
 
@@ -151,11 +159,11 @@ export class JsonRpcXyoViewer implements XyoViewer {
     return (await this.transport.sendRequest('xyoViewer_stakedByStaker', [staker]))
   }
 
-  async stakesByStaked(staked: Address): Promise<Stake[]> {
+  async stakesByStaked(staked: Address): Promise<Position[]> {
     return (await this.transport.sendRequest('xyoViewer_stakesByStaked', [staked]))
   }
 
-  async stakesByStaker(staker: Address): Promise<Stake[]> {
+  async stakesByStaker(staker: Address): Promise<Position[]> {
     return (await this.transport.sendRequest('xyoViewer_stakesByStaker', [staker]))
   }
 
@@ -175,15 +183,15 @@ export class JsonRpcXyoViewer implements XyoViewer {
     return asAttoXL1(await this.transport.sendRequest('xyoViewer_transferBalance', [address]))
   }
 
-  async transferBalanceHistory(address: Address): Promise<TransferBalanceHistoryItem[]> {
-    return (await this.transport.sendRequest('xyoViewer_transferBalanceHistory', [address])) as TransferBalanceHistoryItem[]
+  transferBalanceHistory(address: Address, range?: XL1BlockRange): Promise<TransferBalanceHistoryItem[]> {
+    throw new Error('Method not implemented.')
   }
 
   async transferPairBalance(pair: TransferPair): Promise<AttoXL1> {
     return asAttoXL1(await this.transport.sendRequest('xyoViewer_transferPairBalance', [pair]))
   }
 
-  async transferPairBalanceHistory(pair: TransferPair): Promise<TransferBalanceHistoryItem[]> {
-    return (await this.transport.sendRequest('xyoViewer_transferPairBalanceHistory', [pair])) as TransferBalanceHistoryItem[]
+  transferPairBalanceHistory(pair: TransferPair): Promise<TransferBalanceHistoryItem[]> {
+    throw new Error('Method not implemented.')
   }
 }

package/src/provider/viewer/index.ts

@@ -1 +1,3 @@
+export * from './JsonRpcNetworkStakeViewer/index.ts'
+export * from './JsonRpcNetworkStakingStepRewardsViewer/index.ts'
 export * from './JsonRpcXyoViewer.ts'

package/src/provider/viewer/spec/JsonRpcXyoViewer.spec.ts

@@ -13,12 +13,13 @@ import {
 } from 'vitest'
 
 import { HttpRpcTransport } from '../../../transport/index.ts'
-import { XyoViewerRpcSchemas } from '../../../types/index.ts'
+import { NetworkStakeViewerRpcSchemas, XyoViewerRpcSchemas } from '../../../types/index.ts'
+import { JsonRpcNetworkStakeViewer } from '../JsonRpcNetworkStakeViewer/index.ts'
 import { JsonRpcXyoViewer } from '../JsonRpcXyoViewer.ts'
 
 describe.skip('RpcXyoViewer - live integration tests', () => {
-  const transport = new HttpRpcTransport('http://localhost:8080/rpc', XyoViewerRpcSchemas)
-  const sut = new JsonRpcXyoViewer(transport)
+  const transport = new HttpRpcTransport('http://localhost:8080/rpc', { ...XyoViewerRpcSchemas, ...NetworkStakeViewerRpcSchemas })
+  const sut = new JsonRpcXyoViewer(transport, new JsonRpcNetworkStakeViewer(transport))
 
   describe('accountBalance', () => {
     const TEST_ADDRESS = '796c74fb1c23dc2dcc4e40b8c4284f05da51210f' as Address

package/src/transport/index.ts

@@ -1,4 +1,3 @@
 export * from './HttpRpcTransport.ts'
 export * from './MemoryRpcTransport.ts'
-export * from './post-message/index.ts'
 export * from './RpcTransport.ts'