@xyo-network/xl1-rpc 1.15.28 → 1.16.0

package/src/types/schema/XyoViewerRpcSchemas.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import {
   BigIntToJsonZod, HashToJsonZod, HashZod, JsonToBigIntZod,
   JsonToHashZod,
@@ -8,27 +7,27 @@ import * as z from 'zod'
 import type { XyoViewerRpcMethodName } from '../XyoViewerRpc.ts'
 import {
   AddressZod,
+  BlockBoundWitnessWithStorageMetaZod,
+  BlockBoundWitnessZod,
   BlockNumberZod,
+  BlockRangeZod,
   JsonToStakeZod,
   PayloadZod,
   SignedHydratedBlockZod,
   SignedHydratedTransactionZod,
   StakeToJsonZod,
   StepIdentityZod,
+  TransactionBoundWitnessZod,
   TransferPairZod,
-  TransferZod,
+  TransferZodWithStorageMeta,
 } from './common/index.ts'
 import type { RpcSchemaMap } from './RpcSchemaMap.ts'
 
 export const XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardClaimedByAddress: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod]),
+      from: z.tuple([AddressZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -37,12 +36,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardAddressReward: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod, AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod, AddressZod]),
-      ]),
+      to: z.tuple([StepIdentityZod, AddressZod]),
+      from: z.tuple([StepIdentityZod, AddressZod]),
     },
     result: {
       to: z.record(AddressZod, BigIntToJsonZod),
@@ -51,12 +46,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardAddressHistory: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod]),
+      from: z.tuple([AddressZod]),
     },
     result: {
       to: z.record(AddressZod, BigIntToJsonZod),
@@ -65,12 +56,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardAddressShare: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod, AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod, AddressZod]),
-      ]),
+      to: z.tuple([StepIdentityZod, AddressZod]),
+      from: z.tuple([StepIdentityZod, AddressZod]),
     },
     result: {
       to: z.tuple([BigIntToJsonZod, BigIntToJsonZod]),
@@ -79,12 +66,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardWeightForAddress: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod, AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod, AddressZod]),
-      ]),
+      to: z.tuple([StepIdentityZod, AddressZod]),
+      from: z.tuple([StepIdentityZod, AddressZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -93,12 +76,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardUnclaimedByAddress: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod]),
+      from: z.tuple([AddressZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -107,12 +86,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardPoolRewards: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
+      to: z.tuple([StepIdentityZod]),
+      from: z.tuple([StepIdentityZod]),
     },
     result: {
       to: z.record(AddressZod, BigIntToJsonZod),
@@ -121,12 +96,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardPositionWeight: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod, z.number()]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod, z.number()]),
-      ]),
+      to: z.tuple([StepIdentityZod, z.number()]),
+      from: z.tuple([StepIdentityZod, z.number()]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -135,12 +106,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardPotentialPositionLoss: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod, z.number()]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod, z.number()]),
-      ]),
+      to: z.tuple([StepIdentityZod, z.number()]),
+      from: z.tuple([StepIdentityZod, z.number()]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -149,12 +116,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardForStep: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
+      to: z.tuple([StepIdentityZod]),
+      from: z.tuple([StepIdentityZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -163,12 +126,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardRandomizer: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
+      to: z.tuple([StepIdentityZod]),
+      from: z.tuple([StepIdentityZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -177,12 +136,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardStakerCount: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
+      to: z.tuple([StepIdentityZod]),
+      from: z.tuple([StepIdentityZod]),
     },
     result: {
       to: z.number(),
@@ -191,12 +146,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardPoolShares: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod]),
-      ]),
+      to: z.tuple([StepIdentityZod]),
+      from: z.tuple([StepIdentityZod]),
     },
     result: {
       to: z.record(AddressZod, BigIntToJsonZod),
@@ -205,12 +156,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardForStepForPosition: {
     params: {
-      to: z.union([
-        z.tuple([StepIdentityZod, z.number()]),
-      ]),
-      from: z.union([
-        z.tuple([StepIdentityZod, z.number()]),
-      ]),
+      to: z.tuple([StepIdentityZod, z.number()]),
+      from: z.tuple([StepIdentityZod, z.number()]),
     },
     result: {
       to: z.tuple([BigIntToJsonZod, BigIntToJsonZod]),
@@ -219,12 +166,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardForPosition: {
     params: {
-      to: z.union([
-        z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
-      ]),
-      from: z.union([
-        z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
-      ]),
+      to: z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
+      from: z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
     },
     result: {
       to: z.tuple([BigIntToJsonZod, BigIntToJsonZod]),
@@ -233,12 +176,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardsForRange: {
     params: {
-      to: z.union([
-        z.tuple([z.tuple([z.number(), z.number()])]),
-      ]),
-      from: z.union([
-        z.tuple([z.tuple([z.number(), z.number()])]),
-      ]),
+      to: z.tuple([z.tuple([z.number(), z.number()])]),
+      from: z.tuple([z.tuple([z.number(), z.number()])]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -247,12 +186,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardsForStepLevel: {
     params: {
-      to: z.union([
-        z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
-      ]),
-      from: z.union([
-        z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
-      ]),
+      to: z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
+      from: z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -261,12 +196,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_networkStakeStepRewardsForPosition: {
     params: {
-      to: z.union([
-        z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
-      ]),
-      from: z.union([
-        z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
-      ]),
+      to: z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
+      from: z.tuple([z.number(), z.tuple([z.number(), z.number()])]),
     },
     result: {
       to: z.record(z.string(), z.tuple([BigIntToJsonZod, BigIntToJsonZod])),
@@ -275,12 +206,8 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_accountBalance: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod]),
+      from: z.tuple([AddressZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -289,26 +216,18 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_accountBalanceHistory: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod, BlockRangeZod.optional()]),
+      from: z.tuple([AddressZod, BlockRangeZod.optional()]),
     },
     result: {
-      to: z.array(z.tuple([HashZod, HashZod, TransferZod])),
-      from: z.array(z.tuple([HashZod, HashZod, TransferZod])),
+      to: z.array(z.tuple([BlockBoundWitnessZod, TransactionBoundWitnessZod.nullable(), TransferZodWithStorageMeta])),
+      from: z.array(z.tuple([BlockBoundWitnessZod, TransactionBoundWitnessZod.nullable(), TransferZodWithStorageMeta])),
     },
   },
   xyoViewer_transferPairBalance: {
     params: {
-      to: z.union([
-        z.tuple([TransferPairZod]),
-      ]),
-      from: z.union([
-        z.tuple([TransferPairZod]),
-      ]),
+      to: z.tuple([TransferPairZod]),
+      from: z.tuple([TransferPairZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -317,26 +236,18 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_transferPairBalanceHistory: {
     params: {
-      to: z.union([
-        z.tuple([TransferPairZod]),
-      ]),
-      from: z.union([
-        z.tuple([TransferPairZod]),
-      ]),
+      to: z.tuple([TransferPairZod]),
+      from: z.tuple([TransferPairZod]),
     },
     result: {
-      to: z.array(z.tuple([HashZod, HashZod, PayloadZod])),
-      from: z.array(z.tuple([HashZod, HashZod, PayloadZod])),
+      to: z.array(z.tuple([BlockBoundWitnessWithStorageMetaZod, z.union([TransactionBoundWitnessZod, z.null()]), PayloadZod])),
+      from: z.array(z.tuple([BlockBoundWitnessWithStorageMetaZod, z.union([TransactionBoundWitnessZod, z.null()]), PayloadZod])),
     },
   },
   xyoViewer_transferBalance: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod]),
+      from: z.tuple([AddressZod]),
     },
     result: {
       to: BigIntToJsonZod,
@@ -345,16 +256,12 @@ export const XyoViewerRpcSchemas = {
   },
   xyoViewer_transferBalanceHistory: {
     params: {
-      to: z.union([
-        z.tuple([AddressZod]),
-      ]),
-      from: z.union([
-        z.tuple([AddressZod]),
-      ]),
+      to: z.tuple([AddressZod, BlockRangeZod.optional()]),
+      from: z.tuple([AddressZod, BlockRangeZod.optional()]),
     },
     result: {
-      to: z.array(z.tuple([HashZod, HashZod, PayloadZod])),
-      from: z.array(z.tuple([HashZod, HashZod, PayloadZod])),
+      to: z.array(z.tuple([BlockBoundWitnessWithStorageMetaZod, z.union([TransactionBoundWitnessZod, z.null()]), PayloadZod])),
+      from: z.array(z.tuple([BlockBoundWitnessWithStorageMetaZod, z.union([TransactionBoundWitnessZod, z.null()]), PayloadZod])),
     },
   },
   xyoViewer_blockByHash: {

package/src/types/schema/common/BlockBoundWitness.ts

@@ -1,4 +1,5 @@
-import { HexZod } from '@xylabs/hex'
+import type { Hash } from '@xylabs/hex'
+import { asXL1BlockNumber } from '@xyo-network/xl1-protocol'
 import * as z from 'zod'
 
 import {
@@ -9,13 +10,16 @@ import { ChainZod } from './Chain.ts'
 import { StorageMetaZod } from './Payload.ts'
 
 export const BlockNumberZod = z.number().int().nonnegative()
+export const XL1BlockNumberZod = BlockNumberZod.transform(asXL1BlockNumber)
+export const HexZod = z.string().regex(/^[0-9a-f]+$/)
+export const HashZod = HexZod.transform(v => v as Hash)
 
 const BlockBoundWitnessFieldsZod = z.object({
-  block: BlockNumberZod,
+  block: XL1BlockNumberZod,
   chain: ChainZod,
-  previous: HexZod.nullable(),
-  protocol: z.number().optional(),
-  step_hashes: z.array(HexZod).optional(),
+  previous: HashZod.nullable(),
+  protocol: z.number(),
+  step_hashes: z.array(HashZod).optional(),
 })
 
 const BlockBoundWitnessMetaZod = z.object({ $epoch: z.number() })

package/src/types/schema/common/BoundWitness.ts

@@ -3,7 +3,9 @@ import { BoundWitnessSchema } from '@xyo-network/boundwitness-model'
 import * as z from 'zod'
 
 import { AddressZod } from './Address.ts'
-import { PayloadZod, SchemaZod } from './Payload.ts'
+import {
+  PayloadZod, SchemaZod, StorageMetaZod,
+} from './Payload.ts'
 
 const BoundWitnessRequiredFieldsZod = z.object({
   addresses: z.array(AddressZod),
@@ -43,6 +45,7 @@ export type AnyUnsignedBoundWitness = z.infer<typeof AnyUnsignedBoundWitnessZod>
 export const UnsignedBoundWitnessWithStorageMetaZod = UnsignedBoundWitnessZod
   .safeExtend(BoundWitnessRequiredFieldsZod.shape)
   .safeExtend(BoundWitnessMetaZod.shape)
+  .safeExtend(StorageMetaZod.shape)
 
 export const SignedBoundWitnessZod = BoundWitnessZod.refine(data => !data.$signatures.includes(null), { message: 'all $signatures must not be null' })
 

package/src/types/schema/common/Transfer.ts

@@ -1,14 +1,17 @@
-import { BigIntToJsonZod } from '@xylabs/hex'
-import { PayloadZodStrictOfSchema } from '@xyo-network/payload-model'
+import { HexZod } from '@xylabs/hex'
+import { PayloadZodStrictOfSchema, StorageMetaZod } from '@xyo-network/payload-model'
 import { TransferSchema } from '@xyo-network/xl1-protocol'
 import z from 'zod'
 
 import { AddressZod } from './Address.ts'
 
 export const TransferFieldsZod = z.object({
+  $opCodes: z.array(z.string()).optional(),
+  context: z.object().optional(),
   epoch: z.number(),
   from: AddressZod,
-  transfers: z.record(AddressZod, BigIntToJsonZod),
+  transfers: z.record(AddressZod, HexZod),
 })
 
 export const TransferZod = PayloadZodStrictOfSchema(TransferSchema).extend(TransferFieldsZod.shape)
+export const TransferZodWithStorageMeta = TransferZod.extend(StorageMetaZod.shape)

package/dist/neutral/types/schema/common/spec/UnsignedHydratedTransactionSchema.spec copy.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=UnsignedHydratedTransactionSchema.spec%20copy.d.ts.map

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

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

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=UnsignedHydratedTransactionSchema.spec%20copy.d.ts.map

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

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