@xyo-network/xl1-rpc 1.15.27 → 1.16.0

package/dist/node/types/schema/common/spec/UnsignedHydratedTransactionSchema.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnsignedHydratedTransactionSchema.spec.d.ts","sourceRoot":"","sources":["../../../../../../src/types/schema/common/spec/UnsignedHydratedTransactionSchema.spec.ts"],"names":[],"mappings":""}

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

@@ -3,9 +3,13 @@ export * from './common/index.ts';
 export * from './createRequestSchema.ts';
 export * from './createResponseSchema.ts';
 export * from './NetworkStakeViewerRpcSchemas.ts';
+export * from './RewardsByPositionViewerRpcSchemas.ts';
+export * from './RewardsByStakerViewerRpcSchemas.ts';
+export * from './RewardsByStepViewerRpcSchemas.ts';
+export * from './RewardsTotalViewerRpcSchemas.ts';
 export * from './RpcSchemaMap.ts';
+export * from './StepRewardsViewerRpcSchemas.ts';
 export * from './XyoPermissionsRpcSchemas.ts';
-export * from './XyoProviderRpcSchemas.ts';
 export * from './XyoRunnerRpcSchemas.ts';
 export * from './XyoSignerRpcSchemas.ts';
 export * from './XyoViewerRpcSchemas.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,mBAAmB,CAAA;AACjC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,4BAA4B,CAAA;AAC1C,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,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.15.27",
+  "version": "1.16.0",
   "description": "XYO Layer One API",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -56,45 +56,43 @@
   },
   "dependencies": {
     "@metamask/json-rpc-engine": "~10.1.1",
-    "@metamask/utils": "~11.8.1",
-    "@xylabs/arraybuffer": "~5.0.17",
-    "@xylabs/assert": "~5.0.17",
-    "@xylabs/axios": "~5.0.17",
-    "@xylabs/exists": "~5.0.17",
-    "@xylabs/hex": "~5.0.17",
-    "@xylabs/object": "~5.0.17",
-    "@xylabs/promise": "~5.0.17",
-    "@xylabs/typeof": "~5.0.17",
-    "@xyo-network/account-model": "~5.1.15",
-    "@xyo-network/archivist-memory": "~5.1.15",
-    "@xyo-network/archivist-model": "~5.1.15",
-    "@xyo-network/boundwitness-model": "~5.1.15",
-    "@xyo-network/hash": "~5.1.15",
-    "@xyo-network/module-model": "~5.1.15",
-    "@xyo-network/node-model": "~5.1.15",
-    "@xyo-network/payload-builder": "~5.1.15",
-    "@xyo-network/payload-model": "~5.1.15",
-    "@xyo-network/xl1-protocol": "~1.12.95",
-    "@xyo-network/xl1-protocol-sdk": "~1.15.27",
-    "@xyo-network/xl1-wrappers": "~1.15.27",
-    "axios": "~1.13.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",
+    "@xyo-network/account-model": "~5.1.18",
+    "@xyo-network/archivist-memory": "~5.1.18",
+    "@xyo-network/archivist-model": "~5.1.18",
+    "@xyo-network/boundwitness-model": "~5.1.18",
+    "@xyo-network/hash": "~5.1.18",
+    "@xyo-network/module-model": "~5.1.18",
+    "@xyo-network/node-model": "~5.1.18",
+    "@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",
+    "axios": "~1.13.2",
     "uuid": "~13.0.0",
     "zod": "~4.1.12"
   },
   "devDependencies": {
     "@metamask/utils": "~11.8.1",
-    "@types/node": "~24.9.2",
-    "@xylabs/logger": "~5.0.17",
-    "@xylabs/ts-scripts-yarn3": "~7.1.8",
-    "@xylabs/tsconfig": "~7.1.8",
-    "@xylabs/vitest-extended": "~5.0.17",
-    "@xyo-network/account": "~5.1.15",
-    "@xyo-network/chain-protocol": "~1.15.27",
-    "@xyo-network/wallet": "~5.1.15",
+    "@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",
+    "@xyo-network/account": "~5.1.18",
+    "@xyo-network/chain-protocol": "~1.16.0",
+    "@xyo-network/wallet": "~5.1.18",
     "dotenv": "~17.2.3",
-    "eslint": "^9.39.0",
+    "eslint": "^9.39.1",
     "typescript": "~5.9.3",
-    "vitest": "~3.2.4"
+    "vitest": "~4.0.8"
   },
   "packageManager": "yarn@4.6.0",
   "engines": {

package/src/engine/index.ts

@@ -1,3 +1,8 @@
 export * from './requestSchemas.ts'
 export * from './rpcMethodHandlersFromConnection.ts'
+export * from './rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer.ts'
+export * from './rpcMethodHandlersFromNetworkStakingViewer.ts'
 export * from './rpcMethodHandlersFromPermissions.ts'
+export * from './rpcMethodHandlersFromRunner.ts'
+export * from './rpcMethodHandlersFromSigner.ts'
+export * from './rpcMethodHandlersFromViewer.ts'

package/src/engine/rpcMethodHandlersFromConnection.ts

@@ -1,17 +1,21 @@
-import type { XyoConnection } from '@xyo-network/xl1-protocol'
+import type { NetworkStakeViewer, XyoConnection } from '@xyo-network/xl1-protocol-sdk'
 
 import type { XyoProviderRpcMethodHandlers } from '../types/index.ts'
+import { rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer } from './rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer.ts'
 import { rpcMethodHandlersFromRunner } from './rpcMethodHandlersFromRunner.ts'
-import { rpcMethodHandlersFromSigner } from './rpcMethodHandlersFromSigner.ts'
 import { rpcMethodHandlersFromViewer } from './rpcMethodHandlersFromViewer.ts'
 
-export const rpcMethodHandlersFromConnection = (connection: XyoConnection): XyoProviderRpcMethodHandlers => {
-  const {
-    runner, signer, viewer,
-  } = connection
-  let result: XyoProviderRpcMethodHandlers = { xyoProvider_send: params => (connection as Required<XyoConnection>).send(...(params ?? [])) }
+/* networkStakeViewer is temporary as a param until it goes into root viewer */
+export const rpcMethodHandlersFromConnection = (connection: XyoConnection, networkStakeViewer?: NetworkStakeViewer): XyoProviderRpcMethodHandlers => {
+  const { runner, viewer } = connection
+  let result: XyoProviderRpcMethodHandlers = {}
   if (runner) result = { ...result, ...rpcMethodHandlersFromRunner(runner) }
-  if (signer) result = { ...result, ...rpcMethodHandlersFromSigner(signer) }
   if (viewer) result = { ...result, ...rpcMethodHandlersFromViewer(viewer) }
+  if (networkStakeViewer?.stepRewards?.position) {
+    result = {
+      ...result,
+      ...rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer(networkStakeViewer.stepRewards.position),
+    }
+  }
   return result
 }

package/src/engine/rpcMethodHandlersFromNetworkStakingStepRewardsByPositionViewer.ts

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

package/src/engine/rpcMethodHandlersFromNetworkStakingViewer.ts

@@ -0,0 +1,7 @@
+import type { NetworkStakeViewerMethods } from '@xyo-network/xl1-protocol-sdk'
+
+import type { NetworkStakeViewerRpcMethodHandlers } from '../types/index.ts'
+
+export const rpcMethodHandlersFromNetworkStakingViewer = (viewer: NetworkStakeViewerMethods): NetworkStakeViewerRpcMethodHandlers => {
+  return { networkStakeViewer_active: params => viewer.active(...(params ?? [])) }
+}

package/src/engine/rpcMethodHandlersFromPermissions.ts

@@ -1,4 +1,4 @@
-import type { XyoPermissions } from '@xyo-network/xl1-protocol'
+import type { XyoPermissions } from '@xyo-network/xl1-protocol-sdk'
 
 import type { XyoPermissionsRpcMethodHandlers } from '../types/index.ts'
 

package/src/engine/rpcMethodHandlersFromRunner.ts

@@ -1,4 +1,4 @@
-import type { XyoRunner } from '@xyo-network/xl1-protocol'
+import type { XyoRunner } from '@xyo-network/xl1-protocol-sdk'
 
 import type { XyoRunnerRpcMethodHandlers } from '../types/index.ts'
 

package/src/engine/rpcMethodHandlersFromSigner.ts

@@ -1,11 +1,10 @@
-import type { XyoSigner } from '@xyo-network/xl1-protocol'
+import type { XyoSigner } from '@xyo-network/xl1-protocol-sdk'
 
 import type { XyoSignerRpcMethodHandlers } from '../types/index.ts'
 
 export const rpcMethodHandlersFromSigner = (signer: XyoSigner): XyoSignerRpcMethodHandlers => {
   return {
     xyoSigner_address: params => signer.address(...(params ?? [])),
-    xyoSigner_createSignedTransaction: params => signer.createSignedTransaction(...(params ?? [])),
     xyoSigner_signTransaction: params => signer.signTransaction(...(params ?? [])),
   }
 }

package/src/engine/rpcMethodHandlersFromViewer.ts

@@ -1,4 +1,4 @@
-import type { XyoViewer } from '@xyo-network/xl1-protocol'
+import type { XyoViewer } from '@xyo-network/xl1-protocol-sdk'
 
 import type { XyoViewerRpcMethodHandlers } from '../types/index.ts'
 

package/src/engine-node/index.ts

@@ -0,0 +1 @@
+export * from './rpcEngineFromConnection.ts'

package/src/{engine → engine-node}/rpcEngineFromConnection.ts

@@ -1,16 +1,16 @@
 import { createAsyncMiddleware, JsonRpcEngine } from '@metamask/json-rpc-engine'
 import type { Json } from '@metamask/utils'
-import type { XyoConnection } from '@xyo-network/xl1-protocol'
+import type { NetworkStakeViewer, XyoConnection } from '@xyo-network/xl1-protocol-sdk'
 
+import { requestSchemas, rpcMethodHandlersFromConnection } from '../engine/index.ts'
 import {
   AllRpcSchemas, createRequestSchema, JsonRpcErrorCodes,
 } from '../types/index.ts'
-import { requestSchemas } from './requestSchemas.ts'
-import { rpcMethodHandlersFromConnection } from './rpcMethodHandlersFromConnection.ts'
 
-export const rpcEngineFromConnection = (connection: XyoConnection) => {
+/* networkStakeViewer is temporary as a param until it goes into root viewer */
+export const rpcEngineFromConnection = (connection: XyoConnection, networkStakeViewer?: NetworkStakeViewer) => {
   const engine = new JsonRpcEngine()
-  const handlers = rpcMethodHandlersFromConnection(connection)
+  const handlers = rpcMethodHandlersFromConnection(connection, networkStakeViewer)
   engine.push(
     createAsyncMiddleware(async (req, res) => {
       // Get method name

package/src/index-node.ts

@@ -1,5 +1,5 @@
-// eslint-disable-next-line import-x/no-internal-modules
-export * from './engine/index-node.ts'
+export * from './engine/index.ts'
+export * from './engine-node/index.ts'
 export * from './provider/index.ts'
 export * from './transport/index.ts'
 export * from './types/index.ts'

package/src/provider/client/MemoryXyoClient.ts

@@ -1,7 +1,7 @@
 import type {
   PermissionsProvider, XyoClient, XyoGatewayProvider,
   XyoPermissions,
-} from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-protocol-sdk'
 
 export class MemoryXyoClient implements XyoClient {
   gateways: Readonly<Record<string, XyoGatewayProvider>>

package/src/provider/client/spec/MemoryXyoClient.spec.ts

@@ -1,8 +1,7 @@
 import type { AccountInstance } from '@xyo-network/account-model'
 import { HDWallet } from '@xyo-network/wallet'
-import type {
-  GatewayName, XyoClient, XyoConnection,
-} from '@xyo-network/xl1-protocol'
+import type { GatewayName } from '@xyo-network/xl1-protocol'
+import type { XyoClient, XyoConnection } from '@xyo-network/xl1-protocol-sdk'
 import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from '@xyo-network/xl1-protocol-sdk'
 import {
   beforeEach, describe, expect, it,
@@ -35,7 +34,6 @@ describe('Client', () => {
     permissions = new MemoryXyoPermissions(store)
     connection = new HttpRpcXyoConnection({
       endpoint,
-      account,
       // storage: dataLakeEndpoint,
     })
     gateway = new MemoryXyoGateway(signer, connection)

package/src/provider/connection/HttpRpcXyoConnection.ts

@@ -1,39 +1,32 @@
-import { isDefined, isString } from '@xylabs/typeof'
-import type { AccountInstance } from '@xyo-network/account-model'
-import type { XyoDataLake } from '@xyo-network/xl1-protocol'
-import { isDataLakeProvider } from '@xyo-network/xl1-protocol'
+import { isString } from '@xylabs/typeof'
+import { isDataLakeProvider, type XyoDataLake } from '@xyo-network/xl1-protocol-sdk'
 
 import { HttpRpcTransport } from '../../transport/index.ts'
-import { XyoRunnerRpcSchemas, XyoViewerRpcSchemas } from '../../types/index.ts'
+import {
+  NetworkStakeViewerRpcSchemas, XyoRunnerRpcSchemas, XyoViewerRpcSchemas,
+} from '../../types/index.ts'
 import { HttpXyoDataLake } from '../datalake/index.ts'
 import { JsonRpcXyoRunner } from '../runner/index.ts'
-import { MemoryXyoSigner } from '../signer/index.ts'
-import { JsonRpcXyoViewer } from '../viewer/index.ts'
+import { JsonRpcNetworkStakeViewer, JsonRpcXyoViewer } from '../viewer/index.ts'
 import { XyoBaseConnection } from './XyoBaseConnection.ts'
 
 export interface RpcXyoProviderParams {
-  account?: AccountInstance
   endpoint: string
   storage?: string | XyoDataLake
 }
 
 export class HttpRpcXyoConnection extends XyoBaseConnection {
   constructor(params: RpcXyoProviderParams) {
-    const {
-      account, endpoint, storage: storageParam,
-    } = params
-    const signer = isDefined(account) ? new MemoryXyoSigner(account) : undefined
-    const transport = new HttpRpcTransport(endpoint, { ...XyoRunnerRpcSchemas, ...XyoViewerRpcSchemas })
+    const { endpoint, storage: storageParam } = params
+    const transport = new HttpRpcTransport(endpoint, {
+      ...XyoRunnerRpcSchemas, ...XyoViewerRpcSchemas, ...NetworkStakeViewerRpcSchemas,
+    })
     const runner = new JsonRpcXyoRunner(transport)
-    const viewer = new JsonRpcXyoViewer(transport)
+    const networkStakeViewer = new JsonRpcNetworkStakeViewer(transport)
+    const viewer = new JsonRpcXyoViewer(transport, networkStakeViewer)
     const storage = isDataLakeProvider(storageParam) ? storageParam : isString(storageParam) ? new HttpXyoDataLake(storageParam) : undefined
     super({
-      signer, runner, viewer, storage,
+      runner, viewer, storage,
     })
   }
 }
-
-/**
- * @deprecated Use `HttpRpcXyoConnection` instead.
- */
-export class RpcXyoConnection extends HttpRpcXyoConnection {}

package/src/provider/connection/XyoBaseConnection.ts

@@ -1,34 +1,21 @@
-import { assertEx } from '@xylabs/assert'
-import type { Address, Hex } from '@xylabs/hex'
-import type { Signed } from '@xyo-network/boundwitness-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { isAnyPayload, type Payload } from '@xyo-network/payload-model'
 import type {
-  AllowedBlockPayload,
-  SignedHydratedTransactionWithStorageMeta,
-  TransactionBoundWitness, TransactionFeesBigInt,
-  TransactionOptions, XyoConnection, XyoDataLake, XyoDataLakeViewer, XyoNetwork, XyoRunner, XyoSigner, XyoViewer,
-} from '@xyo-network/xl1-protocol'
-import { defaultTransactionFees, isDataLakeProvider } from '@xyo-network/xl1-protocol'
-import { HydratedTransactionWrapper } from '@xyo-network/xl1-wrappers'
+  XyoConnection, XyoDataLake, XyoDataLakeViewer, XyoNetwork, XyoRunner, XyoViewer,
+} from '@xyo-network/xl1-protocol-sdk'
 
 export class XyoBaseConnection implements XyoConnection {
   private readonly _network?: XyoNetwork
   private readonly _runner?: XyoRunner
-  private readonly _signer?: XyoSigner
   private readonly _storage?: XyoDataLake | XyoDataLakeViewer
   private readonly _viewer?: XyoViewer
 
   constructor(params?: {
     network?: XyoNetwork
     runner?: XyoRunner
-    signer?: XyoSigner
     storage?: XyoDataLake | XyoDataLakeViewer
     viewer?: XyoViewer
   }) {
     this._network = params?.network
     this._runner = params?.runner
-    this._signer = params?.signer
     this._storage = params?.storage
     this._viewer = params?.viewer
   }
@@ -41,11 +28,6 @@ export class XyoBaseConnection implements XyoConnection {
     return this._runner
   }
 
-  /** @deprecated use signer from gateway instead */
-  get signer(): XyoSigner | undefined {
-    return this._signer
-  }
-
   get storage(): XyoDataLake | XyoDataLakeViewer | undefined {
     return this._storage
   }
@@ -53,64 +35,4 @@ export class XyoBaseConnection implements XyoConnection {
   get viewer(): XyoViewer | undefined {
     return this._viewer
   }
-
-  /** @deprecated use submitTransaction instead */
-  async send(
-    elevatedPayloads: AllowedBlockPayload[],
-    additionalPayloads: Payload[],
-    chain?: Hex,
-    nbf?: number,
-    exp?: number,
-    from?: Address,
-    fees?: TransactionFeesBigInt,
-  ): Promise<Signed<TransactionBoundWitness>> {
-    // eslint-disable-next-line sonarjs/deprecation
-    return (await this.submitTransaction(elevatedPayloads, additionalPayloads, {
-      chain, nbf, exp, from, fees,
-    }))[0]
-  }
-
-  /** @deprecated use addPayloadsToChain from gateway instead */
-  async submitTransaction(
-    elevatedPayloads: AllowedBlockPayload[],
-    additionalPayloads: Payload[],
-    {
-      chain, exp, fees, from, nbf,
-    }: TransactionOptions = {},
-  ): Promise<SignedHydratedTransactionWithStorageMeta> {
-    const viewer = assertEx(this.viewer, () => 'No viewer available')
-    // eslint-disable-next-line sonarjs/deprecation
-    const signer = assertEx(this.signer, () => 'No signer available')
-    const runner = assertEx(this.runner, () => 'No runner available')
-    const storage = this.storage
-    const chainResolved = chain ?? await viewer.chainId()
-    if (chainResolved === undefined) throw new Error('Failed to determine chain')
-    const nbfResolved = Math.max(await viewer.currentBlockNumber() ?? 0, nbf ?? 0)
-    const expResolved = exp ?? (nbfResolved + 1000)
-    const feesResolved = fees ?? defaultTransactionFees
-    const fromResolved = from ?? await signer.address()
-    if (fromResolved === undefined) throw new Error('Failed to determine from address')
-    // eslint-disable-next-line sonarjs/deprecation
-    const signedTransaction = assertEx(await signer.createSignedTransaction(
-      chainResolved,
-      elevatedPayloads,
-      additionalPayloads,
-      nbfResolved,
-      expResolved,
-      feesResolved,
-      fromResolved,
-    ), () => 'Failed to create transaction')
-    const hydratedTransaction: SignedHydratedTransactionWithStorageMeta = [await PayloadBuilder.addStorageMeta(signedTransaction),
-      await PayloadBuilder.addStorageMeta(elevatedPayloads)]
-
-    // if storage configured, add the external payloads to it
-    if (isDataLakeProvider(storage)) {
-      const wrapper = await HydratedTransactionWrapper.parse(hydratedTransaction)
-      await storage.add(Object.values(wrapper.externalPayloads).filter(isAnyPayload))
-    }
-
-    assertEx(await runner.broadcastTransaction(hydratedTransaction), () => 'Failed to broadcast transaction')
-
-    return hydratedTransaction
-  }
 }

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

@@ -0,0 +1,30 @@
+import type { XyoConnection } from '@xyo-network/xl1-protocol-sdk'
+import {
+  beforeAll, describe, expect, it,
+} from 'vitest'
+
+import { rpcEngineFromConnection } from '../../../engine-node/index.ts'
+import { MemoryRpcTransport } from '../../../transport/index.ts'
+import { AllRpcSchemas } from '../../../types/index.ts'
+import { MemoryXyoRunner } from '../../runner/index.ts'
+import { JsonRpcNetworkStakeViewer, JsonRpcXyoViewer } from '../../viewer/index.ts'
+import { XyoBaseConnection } from '../XyoBaseConnection.ts'
+
+describe('RpcEngine - XyoProvider', () => {
+  let sut: XyoConnection
+  beforeAll(() => {
+    const runner = new MemoryXyoRunner()
+    const connection = new XyoBaseConnection({ runner })
+    const engine = rpcEngineFromConnection(connection)
+    const transport = new MemoryRpcTransport(engine, AllRpcSchemas)
+    const networkStakeViewer = new JsonRpcNetworkStakeViewer(transport)
+    const viewer = new JsonRpcXyoViewer(transport, networkStakeViewer)
+    sut = new XyoBaseConnection({ runner, viewer })
+  })
+  it('should expose a runner', () => {
+    expect(sut.runner).toBeDefined()
+  })
+  it('should expose a viewer', () => {
+    expect(sut.viewer).toBeDefined()
+  })
+})

package/src/provider/datalake/AbstractXyoDataLake.ts

@@ -3,11 +3,11 @@ import { ObjectHasher } from '@xyo-network/hash'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload } from '@xyo-network/payload-model'
 import { isAnyPayload } from '@xyo-network/payload-model'
+import { isHashPayload } from '@xyo-network/xl1-protocol'
 import {
   type DataLakeData,
-  isHashPayload,
   type XyoDataLake,
-} from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-protocol-sdk'
 
 export abstract class AbstractXyoDataLake implements XyoDataLake {
   async fetch(hashes: Hash[], maxDepth: number = 10): Promise<DataLakeData[]> {

package/src/provider/datalake/ArchivistXyoDataLake.ts

@@ -2,7 +2,7 @@ import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
 import type { ReadWriteArchivist } from '@xyo-network/archivist-model'
 import { isAnyPayload } from '@xyo-network/payload-model'
-import { type DataLakeData } from '@xyo-network/xl1-protocol'
+import { type DataLakeData } from '@xyo-network/xl1-protocol-sdk'
 
 import { AbstractXyoDataLake } from './AbstractXyoDataLake.ts'
 

package/src/provider/datalake/HttpXyoDataLake.ts

@@ -6,7 +6,8 @@ import type { Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
 import { isDefined } from '@xylabs/typeof'
 import { isAnyPayload, type Payload } from '@xyo-network/payload-model'
-import { type DataLakeData, isHashPayload } from '@xyo-network/xl1-protocol'
+import { isHashPayload } from '@xyo-network/xl1-protocol'
+import { type DataLakeData } from '@xyo-network/xl1-protocol-sdk'
 import { Axios } from 'axios'
 
 import { AbstractXyoDataLake } from './AbstractXyoDataLake.ts'

package/src/provider/gateway/Abstract.ts

@@ -7,9 +7,11 @@ import type { Payload } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload,
   SignedHydratedTransaction,
-  TransactionOptions,
-  XyoConnection, XyoGatewayProvider, XyoSigner,
 } from '@xyo-network/xl1-protocol'
+import type {
+  TransactionOptions, XyoConnection, XyoGatewayProvider,
+  XyoSigner,
+} from '@xyo-network/xl1-protocol-sdk'
 import { buildUnsignedTransaction } from '@xyo-network/xl1-protocol-sdk'
 
 export abstract class AbstractXyoGateway implements XyoGatewayProvider {
@@ -31,10 +33,7 @@ export abstract class AbstractXyoGateway implements XyoGatewayProvider {
     const tx = await buildUnsignedTransaction(resolvedChainId, onChain, offChain, resolvedNbf, resolvedExp, await signer.address(), fees)
     const runner = assertEx(connection.runner, () => 'No runner available on connection')
     const signedTx = await signer.signTransaction(tx)
-    const hash = await runner.broadcastTransaction(
-      [await PayloadBuilder.addStorageMeta(signedTx[0]),
-        await PayloadBuilder.addStorageMeta(signedTx[1])],
-    )
+    const hash = await runner.broadcastTransaction(signedTx)
     return [hash, signedTx]
   }
 
@@ -49,16 +48,6 @@ export abstract class AbstractXyoGateway implements XyoGatewayProvider {
     )
   }
 
-  /** @deprecated use addPayloadsToChain instead */
-  async submitTransaction(elevatedPayloads: AllowedBlockPayload[], additionalPayloads: Payload[]): Promise<SignedHydratedTransaction> {
-    const connection = await this.connection()
-    // eslint-disable-next-line sonarjs/deprecation
-    assertEx(connection.submitTransaction, () => 'Active connection does not support transaction submission')
-    // eslint-disable-next-line sonarjs/deprecation
-    const tx = await connection.submitTransaction?.(elevatedPayloads, additionalPayloads)
-    return assertEx(tx, () => 'Transaction submission failed')
-  }
-
   abstract connection(): Promisable<XyoConnection>
   abstract signer(): Promisable<XyoSigner>
 }

package/src/provider/gateway/MemoryXyoGateway.ts

@@ -1,4 +1,4 @@
-import type { XyoConnection, XyoSigner } from '@xyo-network/xl1-protocol'
+import type { XyoConnection, XyoSigner } from '@xyo-network/xl1-protocol-sdk'
 
 import { AbstractXyoGateway } from './Abstract.ts'
 

package/src/provider/gateway/spec/MemoryXyoGateway.spec.ts

@@ -1,11 +1,10 @@
-import { isAddress, isHash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/hex'
+import { isHash } from '@xylabs/hex'
 import { Account } from '@xyo-network/account'
 import type { AccountInstance } from '@xyo-network/account-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { Payload } from '@xyo-network/payload-model'
-import type {
-  AllowedBlockPayload, ChainId, SignedHydratedTransaction,
-} from '@xyo-network/xl1-protocol'
+import type { AnyPayload, Payload } from '@xyo-network/payload-model'
+import type { AllowedBlockPayload, SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 import { buildUnsignedTransaction } from '@xyo-network/xl1-protocol-sdk'
 import {
   beforeEach, describe, expect, it,
@@ -30,7 +29,6 @@ describe('MemoryXyoGateway', () => {
 
     connection = new HttpRpcXyoConnection({
       endpoint,
-      account,
       // storage: dataLakeEndpoint,
     })
     sut = new MemoryXyoGateway(signer, connection)
@@ -69,8 +67,13 @@ describe('MemoryXyoGateway', () => {
       })
       const chainId = (await Account.random()).address
       const mockSigner = vi.spyOn(signer, 'signTransaction')
-      const elevatedPayloads: AllowedBlockPayload[] = []
-      const additionalPayloads: Payload[] = []
+      const elevatedPayloads: AllowedBlockPayload[] = [
+        { schema: 'network.xyo.hash', hash: '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef' as Hash },
+      ]
+      const additionalPayloads: AnyPayload[] = [{
+        schema: 'network.xyo.data',
+        data: 'foo',
+      }]
       const result = await sut.addPayloadsToChain(elevatedPayloads, additionalPayloads, {
         nbf: 0,
         exp: 1000,
@@ -82,6 +85,7 @@ describe('MemoryXyoGateway', () => {
       expect(mockSigner).toHaveBeenCalled()
 
       // Verify result
+      expect(result[0]).toEqual(await PayloadBuilder.hash(result[1][0]))
       expect(result).toBeDefined()
       expect(result.length).toBe(2)
       expect(isHash(result[0])).toBe(true)

package/src/provider/network/MemoryXyoNetwork.ts

@@ -1,9 +1,10 @@
 import { isUndefined } from '@xylabs/typeof'
 import type {
   GatewayName,
-  NetworkStatus, XyoNetwork,
+  NetworkStatus,
 } from '@xyo-network/xl1-protocol'
 import { isNetworkStatus } from '@xyo-network/xl1-protocol'
+import type { XyoNetwork } from '@xyo-network/xl1-protocol-sdk'
 import axios from 'axios'
 
 import {

package/src/provider/permissions/MemoryXyoPermissions.ts

@@ -2,7 +2,7 @@ import { assertEx } from '@xylabs/assert'
 import type {
   CaveatTypes, InvokerPermission, PermissionRequest, RequestedPermission,
   XyoPermissions,
-} from '@xyo-network/xl1-protocol'
+} from '@xyo-network/xl1-protocol-sdk'
 
 import type { Invoker, PermissionsStore } from './store/index.ts'