@xyo-network/xl1-rpc 1.11.0 → 1.12.1

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

@@ -1 +1 @@
-{"version":3,"file":"createRequestSchema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/createRequestSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,eAAO,MAAM,mBAAmB,GAAI,OAAO,SAAS,CAAC,CAAC,UAAU,EAAE,WAAW,SAAS,MAAM,GAAG,MAAM,EACnG,YAAY,WAAW,EACvB,eAAc,OAAO,GAAG,YAA4B;;;;;;;;;;;;;;;;;;;;;;;;;mBAOlD,CAAA"}
+{"version":3,"file":"createRequestSchema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/createRequestSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,eAAO,MAAM,mBAAmB,GAAI,OAAO,SAAS,CAAC,CAAC,UAAU,EAAE,WAAW,SAAS,MAAM,GAAG,MAAM,EACnG,YAAY,WAAW,EACvB,eAAc,OAAO,GAAG,YAA4B;;;;;iBAOlD,CAAA"}

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

@@ -1,24 +1,8 @@
 import type { ZodUndefined } from 'zod';
 import { z } from 'zod';
 export declare const createResponseSchema: <TParams extends z.ZodTypeAny>(resultSchema?: TParams | ZodUndefined) => z.ZodObject<{
-    id: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
+    id: z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>;
     jsonrpc: z.ZodLiteral<"2.0">;
     result: ZodUndefined | TParams;
-}, "strip", z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
-    id: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
-    jsonrpc: z.ZodLiteral<"2.0">;
-    result: ZodUndefined | TParams;
-}>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<{
-    id: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
-    jsonrpc: z.ZodLiteral<"2.0">;
-    result: ZodUndefined | TParams;
-}>, any>[k]; } : never, z.baseObjectInputType<{
-    id: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
-    jsonrpc: z.ZodLiteral<"2.0">;
-    result: ZodUndefined | TParams;
-}> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<{
-    id: z.ZodUnion<[z.ZodString, z.ZodNumber]>;
-    jsonrpc: z.ZodLiteral<"2.0">;
-    result: ZodUndefined | TParams;
-}>[k_1]; } : never>;
+}, z.core.$strip>;
 //# sourceMappingURL=createResponseSchema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createResponseSchema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/createResponseSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,CAAC,CAAC,UAAU,EAC/D,eAAc,OAAO,GAAG,YAA4B;;;;;;;;;;;;;;;;;;;;mBAMlD,CAAA"}
+{"version":3,"file":"createResponseSchema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema/createResponseSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,CAAC,CAAC,UAAU,EAC/D,eAAc,OAAO,GAAG,YAA4B;;;;iBAMlD,CAAA"}

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

@@ -1,4 +1,5 @@
 export * from './AllRpcSchemas.ts';
+export * from './common/index.ts';
 export * from './createRequestSchema.ts';
 export * from './createResponseSchema.ts';
 export * from './RpcSchemaMap.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,0BAA0B,CAAA;AACxC,cAAc,2BAA2B,CAAA;AACzC,cAAc,mBAAmB,CAAA;AACjC,cAAc,2BAA2B,CAAA;AACzC,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,mBAAmB,CAAA;AACjC,cAAc,2BAA2B,CAAA;AACzC,cAAc,4BAA4B,CAAA;AAC1C,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.11.0",
+  "version": "1.12.1",
   "description": "XYO Layer One API",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -40,8 +40,6 @@
     },
     "./package.json": "./package.json"
   },
-  "module": "./dist/neutral/index.mjs",
-  "types": "./dist/neutral/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -59,39 +57,40 @@
   "dependencies": {
     "@metamask/json-rpc-engine": "~10.0.3",
     "@metamask/utils": "~11.4.2",
-    "@xylabs/assert": "~5.0.3",
-    "@xylabs/axios": "~5.0.3",
-    "@xylabs/exists": "~5.0.3",
-    "@xylabs/hex": "~5.0.3",
-    "@xylabs/object": "~5.0.3",
-    "@xylabs/promise": "~5.0.3",
-    "@xylabs/typeof": "~5.0.3",
-    "@xyo-network/account-model": "~5.0.2",
-    "@xyo-network/archivist-memory": "~5.0.2",
-    "@xyo-network/archivist-model": "~5.0.2",
-    "@xyo-network/boundwitness-model": "~5.0.2",
-    "@xyo-network/hash": "~5.0.2",
-    "@xyo-network/module-model": "~5.0.2",
-    "@xyo-network/node-model": "~5.0.2",
-    "@xyo-network/payload-builder": "~5.0.2",
-    "@xyo-network/payload-model": "~5.0.2",
-    "@xyo-network/payload-wrapper": "~5.0.2",
-    "@xyo-network/xl1-protocol": "~1.10.3",
-    "@xyo-network/xl1-protocol-sdk": "~1.11.0",
-    "@xyo-network/xl1-wrappers": "~1.11.0",
+    "@xylabs/assert": "~5.0.8",
+    "@xylabs/axios": "~5.0.8",
+    "@xylabs/exists": "~5.0.8",
+    "@xylabs/hex": "~5.0.8",
+    "@xylabs/object": "~5.0.8",
+    "@xylabs/promise": "~5.0.8",
+    "@xylabs/typeof": "~5.0.8",
+    "@xyo-network/account-model": "~5.0.5",
+    "@xyo-network/archivist-memory": "~5.0.5",
+    "@xyo-network/archivist-model": "~5.0.5",
+    "@xyo-network/boundwitness-model": "~5.0.5",
+    "@xyo-network/core-payload-plugins": "~5.0.5",
+    "@xyo-network/hash": "~5.0.5",
+    "@xyo-network/module-model": "~5.0.5",
+    "@xyo-network/node-model": "~5.0.5",
+    "@xyo-network/payload-builder": "~5.0.5",
+    "@xyo-network/payload-model": "~5.0.5",
+    "@xyo-network/xl1-protocol": "~1.10.13",
+    "@xyo-network/xl1-protocol-sdk": "~1.12.1",
+    "@xyo-network/xl1-wrappers": "~1.12.1",
     "axios": "~1.11.0",
     "uuid": "~11.1.0",
-    "zod": "~3.25.76"
+    "zod": "~4.0.17"
   },
   "devDependencies": {
     "@metamask/utils": "~11.4.2",
-    "@types/node": "~24.2.0",
-    "@xylabs/logger": "~5.0.3",
-    "@xylabs/ts-scripts-yarn3": "~7.1.0",
-    "@xylabs/tsconfig": "~7.1.0",
-    "@xylabs/vitest-extended": "~5.0.3",
-    "@xyo-network/account": "~5.0.2",
-    "@xyo-network/wallet": "~5.0.2",
+    "@types/node": "~24.2.1",
+    "@xylabs/logger": "~5.0.8",
+    "@xylabs/ts-scripts-yarn3": "~7.1.2",
+    "@xylabs/tsconfig": "~7.1.2",
+    "@xylabs/vitest-extended": "~5.0.8",
+    "@xyo-network/account": "~5.0.5",
+    "@xyo-network/chain-protocol": "~1.12.1",
+    "@xyo-network/wallet": "~5.0.5",
     "dotenv": "~17.2.1",
     "typescript": "~5.9.2",
     "vitest": "~3.2.4"

package/src/engine/requestSchemas.ts

@@ -1,3 +1,3 @@
-import type { AnyZodObject } from 'zod'
+import type { ZodObject, ZodRawShape } from 'zod'
 
-export const requestSchemas: Record<string, AnyZodObject | undefined> = {}
+export const requestSchemas: Record<string, ZodObject<ZodRawShape> | undefined> = {}

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

@@ -24,7 +24,7 @@ type TestPayload = Payload<{
   schema: 'network.xyo.test'
 }>
 
-describe('Client', () => {
+describe.skip('Client', () => {
   const endpoint = 'http://localhost:8080/rpc'
   // const dataLakeEndpoint = 'http://localhost:8080/chain/archivist'
   let account: AccountInstance
@@ -70,7 +70,7 @@ describe('Client', () => {
       })
       it.only('should allow for submitting transactions', async () => {
         const [hash, tx] = await client.gateways['localhost' as GatewayName]?.addPayloadsToChain?.(onChainPayloads, offChainPayloads) ?? []
-        expect(isHash(hash)).toBeTrue()
+        expect(isHash(hash)).toBeTruthy()
         expect(tx).toBeDefined()
       })
     })

package/src/provider/connection/XyoConnection.ts

@@ -5,7 +5,7 @@ import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { isAnyPayload, type Payload } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload,
-  HydratedTransaction,
+  SignedHydratedTransactionWithStorageMeta,
   TransactionBoundWitness, TransactionFeesBigInt,
   TransactionOptions, XyoConnectionProvider, XyoDataLakeProvider, XyoDataLakeViewer, XyoNetwork, XyoRunner, XyoSigner, XyoViewer,
 } from '@xyo-network/xl1-protocol'
@@ -77,7 +77,7 @@ export class XyoConnection implements XyoConnectionProvider {
     {
       chain, exp, fees, from, nbf,
     }: TransactionOptions = {},
-  ): Promise<HydratedTransaction> {
+  ): Promise<SignedHydratedTransactionWithStorageMeta> {
     const viewer = assertEx(this.viewer, () => 'No viewer available')
     // eslint-disable-next-line sonarjs/deprecation
     const signer = assertEx(this.signer, () => 'No signer available')
@@ -100,7 +100,7 @@ export class XyoConnection implements XyoConnectionProvider {
       feesResolved,
       fromResolved,
     ), () => 'Failed to create transaction')
-    const hydratedTransaction: HydratedTransaction = [await PayloadBuilder.addStorageMeta(signedTransaction),
+    const hydratedTransaction: SignedHydratedTransactionWithStorageMeta = [await PayloadBuilder.addStorageMeta(signedTransaction),
       await PayloadBuilder.addStorageMeta(elevatedPayloads)]
 
     // if storage configured, add the external payloads to it

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

@@ -1,4 +1,4 @@
-import { type Hex, toAddress } from '@xylabs/hex'
+import { toAddress } from '@xylabs/hex'
 import { Account } from '@xyo-network/account'
 import type { XyoConnectionProvider } from '@xyo-network/xl1-protocol'
 import {
@@ -10,7 +10,7 @@ import { MemoryXyoSigner } from '../../signer/index.ts'
 import { XyoConnection } from '../XyoConnection.ts'
 
 describe('RpcEngine - XyoProvider', () => {
-  const chain: Hex = toAddress('2AAE728aFd1777b79c34D79c4523797F9D9965b0')
+  const chain = toAddress('2AAE728aFd1777b79c34D79c4523797F9D9965b0')
   let sut: XyoConnectionProvider
   beforeAll(async () => {
     const account = await Account.random()

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

@@ -10,7 +10,7 @@ import { HttpRpcXyoConnection } from '../../connection/index.ts'
 import { MemoryXyoSigner } from '../../signer/index.ts'
 import { MemoryXyoGateway } from '../MemoryXyoGateway.ts'
 
-describe('MemoryXyoGateway', () => {
+describe.skip('MemoryXyoGateway', () => {
   const endpoint = 'http://localhost:8080/rpc'
   // const dataLakeEndpoint = 'http://localhost:8080/chain/archivist'
   let account: AccountInstance
@@ -40,7 +40,7 @@ describe('MemoryXyoGateway', () => {
       expect(sut.signer()).toBeDefined()
     })
   })
-  describe.skip('submitTransaction', () => {
+  describe('submitTransaction', () => {
     it('should submit the transaction', async () => {
       const elevatedPayloads: AllowedBlockPayload[] = []
       const additionalPayloads: Payload[] = []

package/src/provider/runner/JsonRpcXyoRunner.ts

@@ -1,5 +1,5 @@
 import { type Hash } from '@xylabs/hex'
-import type { HydratedTransaction, XyoRunner } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransaction, XyoRunner } from '@xyo-network/xl1-protocol'
 
 import type { RpcTransport } from '../../transport/index.ts'
 import type { XyoRunnerRpcSchemas } from '../../types/index.ts'
@@ -10,7 +10,7 @@ export class JsonRpcXyoRunner implements XyoRunner {
     this.transport = transport
   }
 
-  async broadcastTransaction(transaction: HydratedTransaction): Promise<Hash> {
+  async broadcastTransaction(transaction: SignedHydratedTransaction): Promise<Hash> {
     return await this.transport.sendRequest('xyoRunner_broadcastTransaction', [transaction])
   }
 }

package/src/provider/runner/MemoryXyoRunner.ts

@@ -1,13 +1,13 @@
 import type { Hash } from '@xylabs/hex'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { HydratedTransaction, XyoRunner } from '@xyo-network/xl1-protocol'
+import type { SignedHydratedTransactionWithStorageMeta, XyoRunner } from '@xyo-network/xl1-protocol'
 import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
 
 export class MemoryXyoRunner implements XyoRunner {
   protected _archivist: MemoryArchivist | undefined
 
-  async broadcastTransaction(transaction: HydratedTransaction): Promise<Hash> {
+  async broadcastTransaction(transaction: SignedHydratedTransactionWithStorageMeta): Promise<Hash> {
     const archivist = await this.getArchivist()
     await archivist.insert(flattenHydratedTransaction(transaction))
     return await PayloadBuilder.hash(transaction[0])

package/src/provider/runner/NodeXyoRunner.ts

@@ -8,7 +8,7 @@ import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle } from '@xyo-network/payload-model'
 import { PayloadBundleSchema } from '@xyo-network/payload-model'
 import type {
-  HydratedTransaction,
+  SignedHydratedTransaction,
   XyoRunner,
 } from '@xyo-network/xl1-protocol'
 import { flattenHydratedTransaction } from '@xyo-network/xl1-protocol-sdk'
@@ -24,7 +24,7 @@ export class NodeXyoRunner implements XyoRunner {
     this.node = node
   }
 
-  async broadcastTransaction(transaction: HydratedTransaction): Promise<Hash> {
+  async broadcastTransaction(transaction: SignedHydratedTransaction): Promise<Hash> {
     const flattened = flattenHydratedTransaction(transaction)
 
     const pendingArchivist = await this.getPendingArchivist()

package/src/provider/signer/JsonRpcXyoSigner.ts

@@ -1,10 +1,13 @@
-import { type Address } from '@xylabs/hex'
-import type { Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model'
+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,
+  Chain,
+  SignedHydratedTransaction,
   TransactionBoundWitness,
   TransactionFeesBigInt,
+  UnsignedHydratedTransaction,
   XyoSigner,
 } from '@xyo-network/xl1-protocol'
 
@@ -23,7 +26,7 @@ export class RpcXyoSigner implements XyoSigner {
   }
 
   async createSignedTransaction(
-    chain: Address,
+    chain: Chain,
     elevatedPayloads: AllowedBlockPayload[],
     additionalPayloads: Payload[],
     nbf: number,
@@ -31,7 +34,7 @@ export class RpcXyoSigner implements XyoSigner {
     fees: TransactionFeesBigInt,
     from?: Address,
   ): Promise<Signed<TransactionBoundWitness>> {
-    return await this.transport.sendRequest('xyoSigner_createSignedTransaction', [
+    const ret = await this.transport.sendRequest('xyoSigner_createSignedTransaction', [
       chain,
       elevatedPayloads,
       additionalPayloads,
@@ -40,12 +43,12 @@ export class RpcXyoSigner implements XyoSigner {
       fees,
       from,
     ])
+    return ret
   }
 
-  async signTransaction(tx: [UnsignedBoundWitness<TransactionBoundWitness>, Payload[]]): Promise<[Signed<TransactionBoundWitness>, Payload[]]> {
-    return await this.transport.sendRequest('xyoSigner_signTransaction', [
-      tx,
-    ])
+  async signTransaction(tx: UnsignedHydratedTransaction): Promise<SignedHydratedTransaction> {
+    const ret = await this.transport.sendRequest('xyoSigner_signTransaction', [tx])
+    return ret
   }
 }
 

package/src/provider/signer/MemoryXyoSigner.ts

@@ -3,7 +3,7 @@ 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, TransactionBoundWitness, TransactionFeesBigInt, XyoSigner,
+  AllowedBlockPayload, Chain, TransactionBoundWitness, TransactionFeesBigInt, XyoSigner,
 } from '@xyo-network/xl1-protocol'
 import { buildTransaction, signTransaction } from '@xyo-network/xl1-protocol-sdk'
 
@@ -19,7 +19,7 @@ export class MemoryXyoSigner implements XyoSigner {
   }
 
   async createSignedTransaction(
-    chain: Address,
+    chain: Chain,
     elevatedPayloads: AllowedBlockPayload[],
     additionalPayloads: Payload[],
     nbf: number,

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

@@ -1,13 +1,14 @@
-import type { Hex } from '@xylabs/hex'
 import { asAddress, toAddress } from '@xylabs/hex'
 import { Account } from '@xyo-network/account'
-import { defaultTransactionFees, type XyoSigner } from '@xyo-network/xl1-protocol'
+import type { Chain, XyoSigner } from '@xyo-network/xl1-protocol'
+import { defaultTransactionFees } from '@xyo-network/xl1-protocol'
 import {
   beforeAll, describe, expect, it,
 } from 'vitest'
 
 // eslint-disable-next-line import-x/no-internal-modules
 import { rpcEngineFromProvider } from '../../../engine/index-node.ts'
+import { XyoSignerRpcSchemas } from '../../../index-node.ts'
 import { MemoryRpcTransport } from '../../../transport/index.ts'
 import { XyoConnection } from '../../connection/index.ts'
 import { RpcXyoSigner } from '../JsonRpcXyoSigner.ts'
@@ -15,13 +16,13 @@ import { MemoryXyoSigner } from '../MemoryXyoSigner.ts'
 
 describe('RpcEngine - XyoSigner', () => {
   let sut: XyoSigner
-  const chain: Hex = toAddress('2AAE728aFd1777b79c34D79c4523797F9D9965b0')
+  const chain = toAddress('2AAE728aFd1777b79c34D79c4523797F9D9965b0') as Chain
   beforeAll(async () => {
     const account = await Account.random()
     const signer = new MemoryXyoSigner(account)
     const provider = new XyoConnection({ signer })
     const engine = rpcEngineFromProvider(provider)
-    const transport = new MemoryRpcTransport(engine)
+    const transport = new MemoryRpcTransport(engine, XyoSignerRpcSchemas)
     sut = new RpcXyoSigner(transport)
   })
   describe('address', () => {

package/src/provider/viewer/JsonRpcXyoViewer.ts

@@ -1,7 +1,6 @@
 import { type Address, type Hash } from '@xylabs/hex'
 import type {
-  HydratedBlock, HydratedTransaction,
-  TransactionBoundWitness,
+  HydratedBlock, SignedHydratedTransaction,
   Transfer,
   XyoViewer,
 } from '@xyo-network/xl1-protocol'
@@ -19,20 +18,20 @@ export class JsonRpcXyoViewer implements XyoViewer {
     return await this.transport.sendRequest('xyoViewer_accountBalance', [address])
   }
 
-  async accountHistory(address: Address): Promise<[TransactionBoundWitness[], Transfer[]]> {
-    return await this.transport.sendRequest('xyoViewer_accountBalance', [address])
+  async accountHistory(address: Address): Promise<[Hash, Hash, Transfer][]> {
+    return (await this.transport.sendRequest('xyoViewer_accountHistory', [address])) as [Hash, Hash, Transfer][]
   }
 
   async blockByHash(hash: Hash): Promise<HydratedBlock | null> {
-    return await this.transport.sendRequest('xyoViewer_blockByHash', [hash])
+    return (await this.transport.sendRequest('xyoViewer_blockByHash', [hash])) as HydratedBlock | null
   }
 
   async blockByNumber(blockNumber: number): Promise<HydratedBlock | null> {
-    return await this.transport.sendRequest('xyoViewer_blockByNumber', [blockNumber])
+    return (await this.transport.sendRequest('xyoViewer_blockByNumber', [blockNumber])) as HydratedBlock | null
   }
 
   async blocksByHash(hash: Hash, limit?: number): Promise<HydratedBlock[]> {
-    return await this.transport.sendRequest('xyoViewer_blocksByHash', [hash, limit])
+    return (await this.transport.sendRequest('xyoViewer_blocksByHash', [hash, limit])) as HydratedBlock[]
   }
 
   async chainId(): Promise<Address> {
@@ -40,26 +39,26 @@ export class JsonRpcXyoViewer implements XyoViewer {
   }
 
   async currentBlock(): Promise<HydratedBlock> {
-    return await this.transport.sendRequest('xyoViewer_currentBlock')
+    return (await this.transport.sendRequest('xyoViewer_currentBlock')) as HydratedBlock
   }
 
   async currentBlockHash(): Promise<Hash> {
-    return await this.transport.sendRequest('xyoViewer_currentBlockHash')
+    return (await this.transport.sendRequest('xyoViewer_currentBlockHash')) as Hash
   }
 
   async currentBlockNumber(): Promise<number> {
-    return await this.transport.sendRequest('xyoViewer_currentBlockNumber')
+    return (await this.transport.sendRequest('xyoViewer_currentBlockNumber')) as number
   }
 
-  async transactionByBlockHashAndIndex(blockHash: Hash, transactionIndex: number): Promise<HydratedTransaction | null> {
-    return await this.transport.sendRequest('xyoViewer_transactionByBlockHashAndIndex', [blockHash, transactionIndex])
+  async transactionByBlockHashAndIndex(blockHash: Hash, transactionIndex: number): Promise<SignedHydratedTransaction | null> {
+    return (await this.transport.sendRequest('xyoViewer_transactionByBlockHashAndIndex', [blockHash, transactionIndex])) as SignedHydratedTransaction | null
   }
 
-  async transactionByBlockNumberAndIndex(blockNumber: number, transactionIndex: number): Promise<HydratedTransaction | null> {
-    return await this.transport.sendRequest('xyoViewer_transactionByBlockNumberAndIndex', [blockNumber, transactionIndex])
+  async transactionByBlockNumberAndIndex(blockNumber: number, transactionIndex: number): Promise<SignedHydratedTransaction | null> {
+    return (await this.transport.sendRequest('xyoViewer_transactionByBlockNumberAndIndex', [blockNumber, transactionIndex])) as SignedHydratedTransaction | null
   }
 
-  async transactionByHash(transactionHash: Hash): Promise<HydratedTransaction | null> {
-    return await this.transport.sendRequest('xyoViewer_transactionByHash', [transactionHash])
+  async transactionByHash(transactionHash: Hash): Promise<SignedHydratedTransaction | null> {
+    return (await this.transport.sendRequest('xyoViewer_transactionByHash', [transactionHash])) as SignedHydratedTransaction | null
   }
 }

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

@@ -2,9 +2,10 @@ import '@xylabs/vitest-extended'
 
 import { assertEx } from '@xylabs/assert'
 import type { Address, Hash } from '@xylabs/hex'
-import { asAddress, asHash } from '@xylabs/hex'
+import {
+  AddressRegEx, asAddress, asHash,
+} from '@xylabs/hex'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { AddressRegEx } from '@xyo-network/payload-wrapper'
 import type { HydratedBlock } from '@xyo-network/xl1-protocol'
 import {
   beforeAll,

package/src/transport/HttpRpcTransport.ts

@@ -21,11 +21,11 @@ export class HttpRpcTransport<T extends RpcSchemaMap = RpcSchemaMap> implements
   }
 
   async sendRequest<
-    TMethod extends keyof T & string,
+    TMethod extends keyof T,
   >(
     method: TMethod,
-    params?: z.infer<T[TMethod]['params']['to']>,
-  ): Promise<z.infer<T[TMethod]['result']['from']>> {
+    params?: z.input<T[TMethod]['params']['to']>,
+  ): Promise<z.output<T[TMethod]['result']['from']>> {
     return await this.callRpc(this._rpcUrl, this._schemas, method, params)
   }
 
@@ -36,8 +36,8 @@ export class HttpRpcTransport<T extends RpcSchemaMap = RpcSchemaMap> implements
     url: string,
     schemas: TSchemas,
     method: TMethod,
-    params?: z.infer<TSchemas[TMethod]['params']['to']>,
-  ): Promise<z.infer<TSchemas[TMethod]['result']['from']>> {
+    params?: z.input<TSchemas[TMethod]['params']['to']>,
+  ): Promise<z.output<TSchemas[TMethod]['result']['from']>> {
     try {
       const id = v4()
       const body: JsonRpcRequest = {
@@ -47,7 +47,7 @@ export class HttpRpcTransport<T extends RpcSchemaMap = RpcSchemaMap> implements
       }
 
       if (params) {
-        body.params = schemas[method].params.to.parse(params)
+        body.params = schemas[method].params.to.parse(params) as JsonRpcRequest
       }
 
       const res = await new AxiosJson().post(url, body)
@@ -57,7 +57,7 @@ export class HttpRpcTransport<T extends RpcSchemaMap = RpcSchemaMap> implements
         throw new Error((json as JsonRpcFailure).error.message)
       }
 
-      return schemas[method].result.from.parse((json as JsonRpcSuccess).result)
+      return schemas[method].result.from.parse((json as JsonRpcSuccess).result) as z.output<TSchemas[TMethod]['result']['from']>
     } catch (ex) {
       let message = isError(ex) ? ex.message : String(ex)
       if (isAxiosError(ex)) {

package/src/transport/MemoryRpcTransport.ts

@@ -1,43 +1,45 @@
 import type { JsonRpcEngine } from '@metamask/json-rpc-engine'
-import type { JsonRpcRequest } from '@metamask/utils'
-import { isObject } from '@xylabs/typeof'
+import type { JsonRpcParams, JsonRpcRequest } from '@metamask/utils'
+import { assertEx } from '@xylabs/assert'
+import { isObject, isString } from '@xylabs/typeof'
 import { v4 } from 'uuid'
-import type { z } from 'zod'
+import type { z, ZodRawShape } from 'zod'
 
 import type { RpcSchemaMap } from '../types/index.ts'
 import {
-  AllRpcSchemas, createRequestSchema, createResponseSchema, jsonrpc,
+  createRequestSchema, createResponseSchema, jsonrpc,
 } from '../types/index.ts'
 import type { RpcTransport } from './RpcTransport.ts'
 
-export class MemoryRpcTransport<T extends RpcSchemaMap = typeof AllRpcSchemas> implements RpcTransport<T> {
+export class MemoryRpcTransport<T extends RpcSchemaMap> implements RpcTransport<T> {
   protected readonly _rpcEngine: JsonRpcEngine
   protected readonly _schemas: T
-  protected readonly requestSchemas: Record<string, z.AnyZodObject> = {}
-  protected readonly responseSchemas: Record<string, z.AnyZodObject> = {}
+  protected readonly requestSchemas = {} as Record<keyof T, z.ZodObject<ZodRawShape>>
+  protected readonly responseSchemas = {} as Record<keyof T, z.ZodObject<ZodRawShape>>
 
-  constructor(rpcEngine: JsonRpcEngine, schemas: T = AllRpcSchemas as T) {
+  constructor(rpcEngine: JsonRpcEngine, schemas: T) {
     this._rpcEngine = rpcEngine
     this._schemas = schemas
   }
 
   async sendRequest<
-    TMethod extends keyof T & string,
+    TMethod extends keyof T,
   >(
     method: TMethod,
-    params?: z.infer<T[TMethod]['params']['to']>,
-  ): Promise<z.infer<T[TMethod]['result']['from']>> {
+    params?: z.input<T[TMethod]['params']['to']>,
+  ): Promise<z.output<T[TMethod]['result']['from']>> {
     // Get schema for method
     // Get handler for method
     const schema = this._schemas[method]
     let requestSchema = this.requestSchemas[method]
     if (!isObject(requestSchema)) {
-      requestSchema = createRequestSchema(method, schema.params.to)
+      const stringMethod = assertEx(isString(method) ? method : null, () => 'Method must be a string')
+      requestSchema = createRequestSchema(stringMethod, schema.params.to)
       this.requestSchemas[method] = requestSchema
     }
-    const req: JsonRpcRequest = {
-      jsonrpc, id: v4(), method: method as string, params,
-    }
+    const req = {
+      jsonrpc, id: v4(), method: method as string, params: params as JsonRpcParams,
+    } satisfies JsonRpcRequest
     const request = requestSchema.parse(req) as JsonRpcRequest
     const response = await this._rpcEngine.handle(request)
     let responseSchema = this.responseSchemas[method]
@@ -45,6 +47,6 @@ export class MemoryRpcTransport<T extends RpcSchemaMap = typeof AllRpcSchemas> i
       responseSchema = createResponseSchema(schema.result.from)
       this.responseSchemas[method] = responseSchema
     }
-    return responseSchema.parse(response)?.result
+    return responseSchema.parse(response)?.result as z.infer<T[TMethod]['result']['from']>
   }
 }

package/src/transport/RpcTransport.ts

@@ -4,9 +4,9 @@ import type { RpcSchemaMap } from '../types/index.ts'
 
 export interface RpcTransport<TSchemas extends RpcSchemaMap> {
   sendRequest<
-    TMethod extends keyof TSchemas & string,
+    TMethod extends keyof TSchemas,
   >(
     method: TMethod,
-    params?: z.infer<TSchemas[TMethod]['params']['to']>
-  ): Promise<z.infer<TSchemas[TMethod]['result']['from']>>
+    params?: z.input<TSchemas[TMethod]['params']['to']>
+  ): Promise<z.output<TSchemas[TMethod]['result']['from']>>
 }