@xyo-network/xl1-cli 1.16.6 → 1.16.7

package/dist/cli-min.mjs

@@ -17230,12 +17230,6 @@ var ObjectHasher = class _ObjectHasher extends ObjectWrapper {
   static allowSubtle = true;
   static createBrowserWorker;
   static createNodeWorker;
-  static initialized = (() => {
-    globalThis.xyo = globalThis.xyo ?? {};
-    if (globalThis.xyo.hashing) {
-      console.warn("Two static instances of PayloadHasher detected");
-    }
-  })();
   static subtleHashWorkerUrl;
   static warnIfUsingJsHash = true;
   static wasmHashWorkerUrl;
@@ -17471,13 +17465,13 @@ function isPayloadOfZodType(zodSchema, schema) {
 }
 var PayloadBundleSchema = "network.xyo.payload.bundle";
 var SchemaRegEx = /^(?:[a-z0-9]+\.)*[a-z0-9]+$/;
-var SchemaZodV1 = string$2().regex(SchemaRegEx);
-var SchemaZodV2 = string$2().regex(SchemaRegEx).transform((x) => x);
-var SchemaZod$1 = union$1([SchemaZodV1, SchemaZodV2]);
+var SchemaZodV1 = z.string().regex(SchemaRegEx);
+var SchemaZodV2 = z.string().regex(SchemaRegEx).transform((x) => x);
+var SchemaZod = z.union([SchemaZodV1, SchemaZodV2]);
 var PayloadSchema = "network.xyo.payload";
-literal$2(PayloadSchema);
+z.literal(PayloadSchema);
 var isSchema = (value) => {
-  return SchemaZod$1.safeParse(value).error === void 0;
+  return SchemaZod.safeParse(value).error === void 0;
 };
 var isDataHashMeta = (value) => {
   return isHash(value?._dataHash);
@@ -17633,36 +17627,42 @@ var local = (a, b) => {
 };
 var SequenceComparer = { local};
 var LocalSequenceRegex$1 = new RegExp(HexRegExMinMax(SequenceConstants.localSequenceBytes, SequenceConstants.localSequenceBytes));
-var LocalSequenceToStringZod$1 = string$2().regex(LocalSequenceRegex$1);
-var LocalSequenceFromStringZod$1 = string$2().regex(LocalSequenceRegex$1).transform((v) => toHex(v));
+var LocalSequenceToStringZod$1 = z.string().regex(LocalSequenceRegex$1);
+var LocalSequenceFromStringZod$1 = z.string().regex(LocalSequenceRegex$1).transform((v) => toHex(v));
 var QualifiedSequenceRegex$1 = new RegExp(HexRegExMinMax(SequenceConstants.qualifiedSequenceBytes, SequenceConstants.qualifiedSequenceBytes));
-var QualifiedSequenceToStringZod$1 = string$2().regex(QualifiedSequenceRegex$1);
-var QualifiedSequenceFromStringZod$1 = string$2().regex(QualifiedSequenceRegex$1).transform((v) => toHex(v));
-union$1([LocalSequenceToStringZod$1, QualifiedSequenceToStringZod$1]);
-var SequenceFromStringZod = union$1([LocalSequenceFromStringZod$1, QualifiedSequenceFromStringZod$1]);
+var QualifiedSequenceToStringZod$1 = z.string().regex(QualifiedSequenceRegex$1);
+var QualifiedSequenceFromStringZod$1 = z.string().regex(QualifiedSequenceRegex$1).transform((v) => toHex(v));
+z.union([LocalSequenceToStringZod$1, QualifiedSequenceToStringZod$1]);
+var SequenceFromStringZod = z.union([LocalSequenceFromStringZod$1, QualifiedSequenceFromStringZod$1]);
 var isStorageMeta = (value) => {
   return isSequenceStorageMeta(value) && isHashMeta(value);
 };
 
 // src/PayloadZod.ts
-object$3({
+var HashMetaZod = z.object({
   _hash: HashZod,
   _dataHash: HashZod
 });
-object$3({ _sequence: SequenceFromStringZod });
-var StorageMetaZod = object$3({
+z.object({ _sequence: SequenceFromStringZod });
+var StorageMetaZod = z.object({
   _hash: HashZod,
   _dataHash: HashZod,
   _sequence: SequenceFromStringZod
 });
-var PayloadZod$1 = object$3({ schema: SchemaZod$1 });
-PayloadZod$1.extend(StorageMetaZod.shape);
-var AnyPayloadZod$1 = PayloadZod$1.catchall(json$3());
-AnyPayloadZod$1.extend(StorageMetaZod.shape);
-var PayloadZodStrict = strictObject({ schema: SchemaZod$1 });
-var PayloadZodLoose = looseObject({ schema: SchemaZod$1 });
-var PayloadZodStrictOfSchema = (schema) => PayloadZodStrict.extend({ schema: literal$2(schema) });
-var PayloadZodLooseOfSchema = (schema) => PayloadZodLoose.extend({ schema: literal$2(schema) });
+var PayloadZod = z.object({ schema: SchemaZod });
+PayloadZod.extend(StorageMetaZod.shape);
+var AnyPayloadZod = PayloadZod.catchall(z.json());
+AnyPayloadZod.extend(StorageMetaZod.shape);
+function WithStorageMetaZod(valueZod) {
+  return valueZod.extend(StorageMetaZod.shape);
+}
+function WithHashMetaZod(valueZod) {
+  return valueZod.extend(HashMetaZod.shape);
+}
+var PayloadZodStrict = z.strictObject({ schema: SchemaZod });
+var PayloadZodLoose = z.looseObject({ schema: SchemaZod });
+var PayloadZodStrictOfSchema = (schema) => PayloadZodStrict.extend({ schema: z.literal(schema) });
+var PayloadZodLooseOfSchema = (schema) => PayloadZodLoose.extend({ schema: z.literal(schema) });
 
 // src/Builder.ts
 var omitSchema = (payload) => {
@@ -42542,6 +42542,50 @@ var asTimePayload = AsObjectFactory.create(isTimePayload);
 var TransferSchema = "network.xyo.transfer";
 var isTransfer = isPayloadOfSchemaType(TransferSchema);
 var asTransfer = AsObjectFactory.create(isTransfer);
+function zodAsFactory(zod) {
+  function asFunc(value, assert) {
+    const result = zod.safeParse(value);
+    if (result.success) {
+      return result.data;
+    }
+    return assertError(value, assert, result.error.message);
+  }
+  return asFunc;
+}
+
+// src/model/zod/zodIsFactory.ts
+function zodIsFactory(zod) {
+  return (value) => zod.safeParse(value).success;
+}
+var NumberishZod = z.union([z.number(), z.string(), z.bigint()]).transform((v) => typeof v === "bigint" ? Number(v) : typeof v === "string" ? Number(v) : v).pipe(z.number());
+
+// src/model/BlockNumber/BlockNumber.ts
+var BlockNumberZod = z.number().transform((v) => v);
+var NumberishBlockNumberZod = NumberishZod.transform((v) => v);
+var asBlockNumber = zodAsFactory(BlockNumberZod);
+asBlockNumber(0);
+var EthBlockNumberZod = z.number().transform((v) => v);
+var NumberishEthBlockNumberZod = NumberishBlockNumberZod.transform((v) => v);
+var asEthBlockNumber = zodAsFactory(EthBlockNumberZod);
+asEthBlockNumber(0);
+var XL1BlockNumberZod = z.number().transform((v) => v);
+var NumberishXL1BlockNumberZod = NumberishBlockNumberZod.transform((v) => v);
+var asXL1BlockNumber = zodAsFactory(XL1BlockNumberZod);
+asXL1BlockNumber(0);
+var BlockRangeZod = z.tuple([BlockNumberZod, BlockNumberZod]);
+z.tuple([NumberishBlockNumberZod, NumberishBlockNumberZod]);
+z.tuple([EthBlockNumberZod, EthBlockNumberZod]);
+z.tuple([NumberishEthBlockNumberZod, NumberishEthBlockNumberZod]);
+var RangeZod = z.tuple([z.number(), z.number()]);
+var isRange = zodIsFactory(RangeZod);
+var asRange = zodAsFactory(RangeZod);
+var XL1BlockRangeZod = z.tuple([XL1BlockNumberZod, XL1BlockNumberZod]);
+z.tuple([NumberishXL1BlockNumberZod, NumberishXL1BlockNumberZod]);
+var asXL1BlockRange = zodAsFactory(XL1BlockRangeZod);
+var StepIdentityZod$1 = object$3({
+  block: number$3().int().nonnegative(),
+  step: number$3().int().nonnegative()
+});
 var isHydratedBoundWitness = (value) => {
   return Array.isArray(value) && value.length === 2 && isBoundWitness(value[0]) && Array.isArray(value[1]) && !value[1].some((item) => !isAnyPayload(item));
 };
@@ -42640,48 +42684,6 @@ var defaultTransactionFees = {
   gasLimit: AttoXL1(1000000n * AttoXL1ConvertFactor.nano),
   priority: minTransactionFees.priority
 };
-function zodAsFactory(zod) {
-  function asFunc(value, assert) {
-    const result = zod.safeParse(value);
-    if (result.success) {
-      return result.data;
-    }
-    return assertError(value, assert, result.error.message);
-  }
-  return asFunc;
-}
-
-// src/model/zod/zodIsFactory.ts
-function zodIsFactory(zod) {
-  return (value) => zod.safeParse(value).success;
-}
-var NumberishZod = z.union([z.number(), z.string(), z.bigint()]).transform((v) => typeof v === "bigint" ? Number(v) : typeof v === "string" ? Number(v) : v).pipe(z.number());
-
-// src/model/BlockNumber/BlockNumber.ts
-var BlockNumberZod = z.number().transform((v) => v);
-var NumberishBlockNumberZod = NumberishZod.transform((v) => v);
-var asBlockNumber = zodAsFactory(BlockNumberZod);
-asBlockNumber(0);
-var EthBlockNumberZod = z.number().transform((v) => v);
-var NumberishEthBlockNumberZod = NumberishBlockNumberZod.transform((v) => v);
-var asEthBlockNumber = zodAsFactory(EthBlockNumberZod);
-asEthBlockNumber(0);
-var XL1BlockNumberZod = z.number().transform((v) => v);
-var NumberishXL1BlockNumberZod = NumberishBlockNumberZod.transform((v) => v);
-var asXL1BlockNumber = zodAsFactory(XL1BlockNumberZod);
-asXL1BlockNumber(0);
-var BlockRangeZod = z.tuple([BlockNumberZod, BlockNumberZod]);
-z.tuple([NumberishBlockNumberZod, NumberishBlockNumberZod]);
-z.tuple([EthBlockNumberZod, EthBlockNumberZod]);
-z.tuple([NumberishEthBlockNumberZod, NumberishEthBlockNumberZod]);
-var RangeZod = z.tuple([z.number(), z.number()]);
-var isRange = zodIsFactory(RangeZod);
-var asRange = zodAsFactory(RangeZod);
-var XL1BlockRangeZod = z.tuple([XL1BlockNumberZod, XL1BlockNumberZod]);
-z.tuple([NumberishXL1BlockNumberZod, NumberishXL1BlockNumberZod]);
-var asXL1BlockRange = zodAsFactory(XL1BlockRangeZod);
-
-// src/constants/StepSizes.ts
 var StepSizes = [
   asXL1BlockNumber(7, true),
   asXL1BlockNumber(31, true),
@@ -81753,8 +81755,9 @@ var SimpleXyoGatewayRunner = class {
       signedTx
     ];
   }
+  /** @deprecated use connectionInstance instead */
   connection() {
-    throw new Error("Method not implemented.");
+    return this.gateway.connection();
   }
   removeDataLake(index) {
     this._dataLakes[index] = null;
@@ -198703,6 +198706,13 @@ var getDefaultLogger = () => {
   return getLogger();
 };
 
+// src/Handler/RouteDefinition/addRouteDefinitions.ts
+var addRouteDefinitions = (app, routeDefinitions) => {
+  for (const definition of routeDefinitions) {
+    app[definition.method](definition.path, definition.handlers);
+  }
+};
+
 // src/middleware/caseInsensitiveRouting/caseInsensitiveRouting.ts
 var setting = "case sensitive routing";
 var disableCaseSensitiveRouting = (app) => {
@@ -198793,12 +198803,69 @@ var transformResponse = (body, _req, res) => {
   return isRawResponseFormatSet(res) ? body : res.statusCode >= 200 && res.statusCode < 300 ? { data: body, meta: getResponseMetadata(res) } : { error: body, meta: getResponseMetadata(res) };
 };
 var standardResponses = mung.json(transformResponse, { mungError: true });
-object$3({}).catchall(string$2());
-object$3({}).catchall(union$1([string$2(), array$1(string$2())]));
-({
+var EmptyParamsZod = object$3({}).catchall(string$2());
+var EmptyQueryParamsZod = object$3({}).catchall(union$1([string$2(), array$1(string$2())]));
+var ValidateRequestDefaults = {
+  params: EmptyParamsZod,
+  query: EmptyQueryParamsZod,
   body: json$3().optional(),
   response: json$3().optional()
-});
+};
+function requestHandlerValidator(schemas) {
+  const validators = { ...ValidateRequestDefaults, ...schemas };
+  return (handler) => {
+    return async (req, res, next) => {
+      const originalJson = res.json.bind(res);
+      try {
+        const errors = [];
+        const keys = ["params", "query", "body"];
+        for (const key of keys) {
+          const validator = validators[key];
+          const result2 = validator.safeParse(req[key]);
+          if (result2.success) {
+            if (isDefined(result2.data)) Object.assign(req[key], result2.data);
+          } else {
+            errors.push(
+              ...result2.error.issues.map(
+                (issue) => issue.path.length === 0 ? `${key}: ${issue.message}` : `${key}.${issue.path.join(".")}: ${issue.message}`
+              )
+            );
+          }
+        }
+        if (errors.length > 0) {
+          const message = errors.join("; ");
+          const err = new Error(message);
+          err.name = ReasonPhrases.BAD_REQUEST;
+          err.statusCode = StatusCodes.BAD_REQUEST;
+          next(err);
+          return false;
+        }
+        res.json = (data) => {
+          const result2 = validators.response.safeParse(data);
+          if (result2.success) {
+            return originalJson(result2.data);
+          } else {
+            const message = result2.error.issues.map(
+              (issue) => issue.path.length === 0 ? `response: ${issue.message}` : `response.${issue.path.join(".")}: ${issue.message}`
+            ).join("; ");
+            const err = new Error(message);
+            err.name = ReasonPhrases.INTERNAL_SERVER_ERROR;
+            err.statusCode = StatusCodes.INTERNAL_SERVER_ERROR;
+            res.json = originalJson;
+            throw err;
+          }
+        };
+        const result = handler(req, res, next);
+        if (result && isPromise$3(result)) {
+          await result;
+        }
+      } catch (err) {
+        res.json = originalJson;
+        next(err);
+      }
+    };
+  };
+}
 
 var compression$2 = {exports: {}};
 
@@ -215269,19 +215336,6 @@ var JsonToArrayBufferZod = string$2().transform((x) => {
   const u8 = base64Decode(x);
   return u8.buffer;
 });
-var SchemaZod = string$2();
-var PayloadZod = object$3({
-  schema: SchemaZod
-}).catchall(any$1());
-var PayloadWithStorageMetaZod = PayloadZod.extend(StorageMetaZod.shape);
-var AnyPayloadZod = PayloadZod.catchall(json$3());
-AnyPayloadZod.extend(StorageMetaZod.shape);
-function WithStorageMetaZod(valueZod) {
-  return StorageMetaZod.extend(valueZod.shape);
-}
-__name$5(WithStorageMetaZod, "WithStorageMetaZod");
-
-// src/types/schema/common/BoundWitness.ts
 var BoundWitnessRequiredFieldsZod = object$3({
   addresses: array$1(AddressZod),
   payload_hashes: array$1(HashZod),
@@ -215310,7 +215364,6 @@ var UnsignedBoundWitnessWithStorageMetaZod = UnsignedBoundWitnessZod.safeExtend(
 var SignedBoundWitnessZod = BoundWitnessZod.refine((data) => !data.$signatures.includes(null), {
   message: "all $signatures must not be null"
 });
-var SignedBoundWitnessWithStorageMetaZod = UnsignedBoundWitnessWithStorageMetaZod;
 UnsignedBoundWitnessZod.catchall(any$1());
 UnsignedBoundWitnessWithStorageMetaZod.catchall(any$1());
 var ChainZod = string$2().toLowerCase().regex(AddressRegEx).transform((v) => toAddress(v));
@@ -215327,16 +215380,14 @@ var BlockBoundWitnessMetaZod = object$3({
   $epoch: number$3()
 });
 var BlockBoundWitnessZod = UnsignedBoundWitnessZod.merge(StorageMetaZod.partial()).merge(BlockBoundWitnessFieldsZod).merge(BlockBoundWitnessMetaZod);
-var BlockBoundWitnessWithStorageMetaZod = UnsignedBoundWitnessWithStorageMetaZod.merge(BlockBoundWitnessFieldsZod).merge(BlockBoundWitnessMetaZod);
 var SignedBlockBoundWitnessZod = SignedBoundWitnessZod.merge(StorageMetaZod.partial()).merge(BlockBoundWitnessFieldsZod).merge(BlockBoundWitnessMetaZod);
-var SignedBlockBoundWitnessWithStorageMetaZod = SignedBoundWitnessWithStorageMetaZod.merge(StorageMetaZod.partial()).merge(BlockBoundWitnessFieldsZod).merge(BlockBoundWitnessMetaZod);
 tuple([
   BlockBoundWitnessZod,
   array$1(PayloadZod)
 ]);
 tuple([
-  BlockBoundWitnessWithStorageMetaZod,
-  array$1(PayloadWithStorageMetaZod)
+  WithStorageMetaZod(BlockBoundWitnessZod),
+  array$1(WithStorageMetaZod(PayloadZod))
 ]);
 var SignedHydratedBlockZod = tuple([
   SignedBlockBoundWitnessZod,
@@ -215347,8 +215398,8 @@ tuple([
   array$1(PayloadZod)
 ]);
 tuple([
-  SignedBlockBoundWitnessWithStorageMetaZod,
-  array$1(PayloadWithStorageMetaZod)
+  WithStorageMetaZod(SignedBlockBoundWitnessZod),
+  array$1(WithStorageMetaZod(PayloadZod))
 ]);
 var AttoZod = bigint$1();
 var JsonToAttoZod = JsonToBigIntZod.transform((v) => asAttoXL1(v));
@@ -215525,7 +215576,6 @@ var TransferFieldsZod = z.object({
   transfers: z.record(AddressZod, HexZod)
 });
 var TransferZod = PayloadZodStrictOfSchema(TransferSchema).extend(TransferFieldsZod.shape);
-var TransferZodWithStorageMeta = TransferZod.extend(StorageMetaZod.shape);
 var TransferPairZod = z.tuple([
   AddressZod,
   AddressZod
@@ -215634,11 +215684,11 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardAddressReward: {
     params: {
       to: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         AddressZod
       ]),
       from: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         AddressZod
       ])
     },
@@ -215664,11 +215714,11 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardAddressShare: {
     params: {
       to: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         AddressZod
       ]),
       from: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         AddressZod
       ])
     },
@@ -215686,11 +215736,11 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardWeightForAddress: {
     params: {
       to: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         AddressZod
       ]),
       from: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         AddressZod
       ])
     },
@@ -215716,10 +215766,10 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardPoolRewards: {
     params: {
       to: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ]),
       from: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ])
     },
     result: {
@@ -215730,11 +215780,11 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardPositionWeight: {
     params: {
       to: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         number$3()
       ]),
       from: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         number$3()
       ])
     },
@@ -215746,11 +215796,11 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardPotentialPositionLoss: {
     params: {
       to: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         number$3()
       ]),
       from: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         number$3()
       ])
     },
@@ -215762,10 +215812,10 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardForStep: {
     params: {
       to: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ]),
       from: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ])
     },
     result: {
@@ -215776,10 +215826,10 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardRandomizer: {
     params: {
       to: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ]),
       from: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ])
     },
     result: {
@@ -215790,10 +215840,10 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardStakerCount: {
     params: {
       to: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ]),
       from: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ])
     },
     result: {
@@ -215804,10 +215854,10 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardPoolShares: {
     params: {
       to: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ]),
       from: tuple([
-        StepIdentityZod
+        StepIdentityZod$1
       ])
     },
     result: {
@@ -215818,11 +215868,11 @@ var XyoViewerRpcSchemas = {
   xyoViewer_networkStakeStepRewardForStepForPosition: {
     params: {
       to: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         number$3()
       ]),
       from: tuple([
-        StepIdentityZod,
+        StepIdentityZod$1,
         number$3()
       ])
     },
@@ -215968,14 +216018,14 @@ var XyoViewerRpcSchemas = {
     },
     result: {
       to: array$1(tuple([
-        BlockBoundWitnessZod,
-        TransactionBoundWitnessZod.nullable(),
-        TransferZodWithStorageMeta
+        WithHashMetaZod(BlockBoundWitnessZod),
+        WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
+        WithHashMetaZod(TransferZod)
       ])),
       from: array$1(tuple([
-        BlockBoundWitnessZod,
-        TransactionBoundWitnessZod.nullable(),
-        TransferZodWithStorageMeta
+        WithHashMetaZod(BlockBoundWitnessZod),
+        WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
+        WithHashMetaZod(TransferZod)
       ]))
     }
   },
@@ -216004,20 +216054,14 @@ var XyoViewerRpcSchemas = {
     },
     result: {
       to: array$1(tuple([
-        BlockBoundWitnessWithStorageMetaZod,
-        union$1([
-          TransactionBoundWitnessZod,
-          _null$1()
-        ]),
-        PayloadZod
+        WithHashMetaZod(BlockBoundWitnessZod),
+        WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
+        WithHashMetaZod(PayloadZod)
       ])),
       from: array$1(tuple([
-        BlockBoundWitnessWithStorageMetaZod,
-        union$1([
-          TransactionBoundWitnessZod,
-          _null$1()
-        ]),
-        PayloadZod
+        WithHashMetaZod(BlockBoundWitnessZod),
+        WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
+        WithHashMetaZod(PayloadZod)
       ]))
     }
   },
@@ -216048,20 +216092,14 @@ var XyoViewerRpcSchemas = {
     },
     result: {
       to: array$1(tuple([
-        BlockBoundWitnessWithStorageMetaZod,
-        union$1([
-          TransactionBoundWitnessZod,
-          _null$1()
-        ]),
-        PayloadZod
+        WithHashMetaZod(BlockBoundWitnessZod),
+        WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
+        WithHashMetaZod(PayloadZod)
       ])),
       from: array$1(tuple([
-        BlockBoundWitnessWithStorageMetaZod,
-        union$1([
-          TransactionBoundWitnessZod,
-          _null$1()
-        ]),
-        PayloadZod
+        WithHashMetaZod(BlockBoundWitnessZod),
+        WithHashMetaZod(TransactionBoundWitnessZod).nullable(),
+        WithHashMetaZod(PayloadZod)
       ]))
     }
   },
@@ -216330,11 +216368,11 @@ var createResponseSchema = /* @__PURE__ */ __name$5((resultSchema = _undefined()
     },
     result: {
       to: union$1([
-        PayloadZod$1,
+        PayloadZod,
         ArrayBufferToJsonZod
       ]).optional(),
       from: union$1([
-        PayloadZod$1,
+        PayloadZod,
         JsonToArrayBufferZod
       ]).optional()
     }
@@ -216350,11 +216388,11 @@ var createResponseSchema = /* @__PURE__ */ __name$5((resultSchema = _undefined()
     },
     result: {
       to: array$1(union$1([
-        PayloadZod$1,
+        PayloadZod,
         ArrayBufferToJsonZod
       ])),
       from: array$1(union$1([
-        PayloadZod$1,
+        PayloadZod,
         JsonToArrayBufferZod
       ]))
     }
@@ -216711,11 +216749,11 @@ var HttpRpcTransport = class {
         body.params = schemas[method].params.to.parse(params);
       }
       const res = await new AxiosJson().post(url, body);
-      const json2 = res.data;
-      if (isUndefinedOrNull(json2) || json2.error) {
-        throw new Error(json2.error.message);
+      const json = res.data;
+      if (isUndefinedOrNull(json) || json.error) {
+        throw new Error(json.error.message);
       }
-      return schemas[method].result.from.parse(json2.result);
+      return schemas[method].result.from.parse(json.result);
     } catch (ex) {
       let message = isError$1(ex) ? ex.message : String(ex);
       if (isAxiosError(ex)) {
@@ -309574,74 +309612,6 @@ var addInstrumentation$2 = /* @__PURE__ */ __name$3(() => {
     instrumentations
   });
 }, "addInstrumentation");
-var EmptyParamsZod$1 = object$3({}).catchall(string$2());
-var EmptyQueryParamsZod$1 = object$3({}).catchall(union$1([
-  string$2(),
-  array$1(string$2())
-]));
-var ValidateRequestDefaults$1 = {
-  params: EmptyParamsZod$1,
-  query: EmptyQueryParamsZod$1,
-  body: json$3(),
-  response: json$3()
-};
-function requestHandlerValidator$1(schemas) {
-  const validators = {
-    ...ValidateRequestDefaults$1,
-    ...schemas
-  };
-  return (handler) => {
-    return async (req, res, next) => {
-      const originalJson = res.json.bind(res);
-      try {
-        const errors = [];
-        const keys = [
-          "params",
-          "query",
-          "body"
-        ];
-        for (const key of keys) {
-          const validator = validators[key];
-          const result2 = validator.safeParse(req[key]);
-          if (result2.success) {
-            Object.assign(req[key], result2.data);
-          } else {
-            errors.push(...result2.error.issues.map((issue) => issue.path.length === 0 ? `${key}: ${issue.message}` : `${key}.${issue.path.join(".")}: ${issue.message}`));
-          }
-        }
-        if (errors.length > 0) {
-          const message = errors.join("; ");
-          const err = new Error(message);
-          err.name = ReasonPhrases.BAD_REQUEST;
-          err.statusCode = StatusCodes.BAD_REQUEST;
-          next(err);
-          return false;
-        }
-        res.json = (data) => {
-          const result2 = validators.response.safeParse(data);
-          if (result2.success) {
-            return originalJson(result2.data);
-          } else {
-            const message = result2.error.issues.map((issue) => issue.path.length === 0 ? `response: ${issue.message}` : `response.${issue.path.join(".")}: ${issue.message}`).join("; ");
-            const err = new Error(message);
-            err.name = ReasonPhrases.INTERNAL_SERVER_ERROR;
-            err.statusCode = StatusCodes.INTERNAL_SERVER_ERROR;
-            res.json = originalJson;
-            throw err;
-          }
-        };
-        const result = handler(req, res, next);
-        if (result && isPromise$3(result)) {
-          await result;
-        }
-      } catch (err) {
-        res.json = originalJson;
-        next(err);
-      }
-    };
-  };
-}
-__name$3(requestHandlerValidator$1, "requestHandlerValidator");
 var remoteChainId = toAddress("0x01");
 var ChainIdPathParam = HexZod.refine((val) => {
   const chainIdHex = hexFromHexString(val, {
@@ -309661,7 +309631,7 @@ var params = object$3({
   nonce: string$2()
 });
 var response$1 = PayloadZodStrictOfSchema(BridgeDestinationObservationSchema).extend(BridgeDestinationObservationFieldsZod.shape);
-var validateRequest$1 = requestHandlerValidator$1({
+var validateRequest$1 = requestHandlerValidator({
   params,
   response: response$1
 });
@@ -309699,7 +309669,7 @@ var body$1 = tuple([
   PayloadZodLooseOfSchema(TransferSchema)
 ]);
 var response2$1 = PayloadZodStrictOfSchema(BridgeSourceObservationSchema).extend(BridgeSourceObservationFieldsZod.shape);
-var validateRequest2$1 = requestHandlerValidator$1({
+var validateRequest2$1 = requestHandlerValidator({
   params: params2,
   body: body$1,
   response: response2$1
@@ -309743,7 +309713,7 @@ var response3 = tuple([
   PayloadZodStrictOfSchema(BridgeIntentSchema).extend(BridgeIntentFieldsZod.shape),
   PayloadZodLooseOfSchema(TransferSchema)
 ]);
-var validateRequest3 = requestHandlerValidator$1({
+var validateRequest3 = requestHandlerValidator({
   params: params3,
   body: body2,
   response: response3
@@ -309790,7 +309760,7 @@ var params4 = object$3({
   nonce: string$2()
 });
 var response4 = PayloadZodStrictOfSchema(BridgeDestinationObservationSchema).extend(BridgeDestinationObservationFieldsZod.shape);
-var validateRequest4 = requestHandlerValidator$1({
+var validateRequest4 = requestHandlerValidator({
   params: params4,
   response: response4
 });
@@ -310508,7 +310478,7 @@ var addDataLakeRoutes = /* @__PURE__ */ __name$1((app) => {
   }));
 }, "addDataLakeRoutes");
 var StepIdentitySchema = "network.xyo.chain.step.identity";
-var isStepIdentityPayload = isPayloadOfZodType(StepIdentityZod, StepIdentitySchema);
+var isStepIdentityPayload = isPayloadOfZodType(StepIdentityZod$1, StepIdentitySchema);
 
 // src/modules/ChainStepRewardsClaimSentinel/ChainStepRewardsClaimSentinel.ts
 var ChainStepRewardsClaimSentinelConfigSchema = "network.xyo.sentinel.chain.step.rewards.claim.config";
@@ -310779,74 +310749,6 @@ var DerivedAddressWalletTransferSentinel = class extends AbstractSentinel {
     if (isDefined(result)) return result[1];
   }, "submitRewardDistributionTransaction");
 };
-var EmptyParamsZod = object$3({}).catchall(string$2());
-var EmptyQueryParamsZod = object$3({}).catchall(union$1([
-  string$2(),
-  array$1(string$2())
-]));
-var ValidateRequestDefaults = {
-  params: EmptyParamsZod,
-  query: EmptyQueryParamsZod,
-  body: json$3().optional(),
-  response: json$3().optional()
-};
-function requestHandlerValidator(schemas) {
-  const validators = {
-    ...ValidateRequestDefaults,
-    ...schemas
-  };
-  return (handler) => {
-    return async (req, res, next) => {
-      const originalJson = res.json.bind(res);
-      try {
-        const errors = [];
-        const keys = [
-          "params",
-          "query",
-          "body"
-        ];
-        for (const key of keys) {
-          const validator = validators[key];
-          const result2 = validator.safeParse(req[key]);
-          if (result2.success) {
-            if (isDefined(result2.data)) Object.assign(req[key], result2.data);
-          } else {
-            errors.push(...result2.error.issues.map((issue) => issue.path.length === 0 ? `${key}: ${issue.message}` : `${key}.${issue.path.join(".")}: ${issue.message}`));
-          }
-        }
-        if (errors.length > 0) {
-          const message = errors.join("; ");
-          const err = new Error(message);
-          err.name = ReasonPhrases.BAD_REQUEST;
-          err.statusCode = StatusCodes.BAD_REQUEST;
-          next(err);
-          return false;
-        }
-        res.json = (data) => {
-          const result2 = validators.response.safeParse(data);
-          if (result2.success) {
-            return originalJson(result2.data);
-          } else {
-            const message = result2.error.issues.map((issue) => issue.path.length === 0 ? `response: ${issue.message}` : `response.${issue.path.join(".")}: ${issue.message}`).join("; ");
-            const err = new Error(message);
-            err.name = ReasonPhrases.INTERNAL_SERVER_ERROR;
-            err.statusCode = StatusCodes.INTERNAL_SERVER_ERROR;
-            res.json = originalJson;
-            throw err;
-          }
-        };
-        const result = handler(req, res, next);
-        if (result && isPromise$3(result)) {
-          await result;
-        }
-      } catch (err) {
-        res.json = originalJson;
-        next(err);
-      }
-    };
-  };
-}
-__name$1(requestHandlerValidator, "requestHandlerValidator");
 var viewer;
 var getViewerFromConfig = /* @__PURE__ */ __name$1((config) => {
   if (isDefined(viewer)) return viewer;
@@ -310962,9 +310864,7 @@ var getRouteDefinitions = /* @__PURE__ */ __name$1(() => {
 // src/server/routes/rewardRedemption/addRewardRoutes.ts
 var addRewardRedemptionRoutes = /* @__PURE__ */ __name$1((app) => {
   const routeDefinitions = getRouteDefinitions();
-  for (const definition of routeDefinitions) {
-    app[definition.method](definition.path, definition.handlers);
-  }
+  addRouteDefinitions(app, routeDefinitions);
 }, "addRewardRedemptionRoutes");
 
 // src/server/routes/addRoutes.ts
@@ -319730,7 +319630,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var configuration;
-var version = isDefined("1.16.5") ? "1.16.5" : "unknown";
+var version = isDefined("1.16.6") ? "1.16.6" : "unknown";
 var getContextFromConfig = /* @__PURE__ */ __name((configuration2) => {
   const logger = initLogger(configuration2);
   const orchestrator = new Orchestrator(logger);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/xl1-cli",
-  "version": "1.16.6",
+  "version": "1.16.7",
   "description": "XYO Layer One CLI",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -78,16 +78,16 @@
     "@xylabs/typeof": "~5.0.24",
     "@xylabs/url": "~5.0.24",
     "@xylabs/vitest-extended": "~5.0.24",
-    "@xyo-network/account-model": "~5.1.19",
-    "@xyo-network/archivist-lmdb": "~5.1.19",
-    "@xyo-network/archivist-memory": "~5.1.19",
-    "@xyo-network/archivist-model": "~5.1.19",
-    "@xyo-network/payload-builder": "~5.1.19",
-    "@xyo-network/payload-model": "~5.1.19",
-    "@xyo-network/wallet": "~5.1.19",
-    "@xyo-network/wallet-model": "~5.1.19",
-    "@xyo-network/xl1-cli-lib": "~1.16.6",
-    "@xyo-network/xl1-protocol": "~1.13.5",
+    "@xyo-network/account-model": "~5.1.21",
+    "@xyo-network/archivist-lmdb": "~5.1.21",
+    "@xyo-network/archivist-memory": "~5.1.21",
+    "@xyo-network/archivist-model": "~5.1.21",
+    "@xyo-network/payload-builder": "~5.1.21",
+    "@xyo-network/payload-model": "~5.1.21",
+    "@xyo-network/wallet": "~5.1.21",
+    "@xyo-network/wallet-model": "~5.1.21",
+    "@xyo-network/xl1-cli-lib": "~1.16.7",
+    "@xyo-network/xl1-protocol": "~1.13.6",
     "async-mutex": "~0.5.0",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.1",