@xyo-network/chain-reward-redemption 1.16.5 → 1.16.7

package/dist/node/index.mjs

@@ -111,15 +111,19 @@ var addDataLakeRoutes = /* @__PURE__ */ __name((app) => {
   }));
 }, "addDataLakeRoutes");
 
+// src/server/routes/rewardRedemption/addRewardRoutes.ts
+import { addRouteDefinitions } from "@xylabs/express";
+
 // src/server/routes/rewardRedemption/routeDefinitions/routes/claimRange.ts
 import { assertEx as assertEx3 } from "@xylabs/assert";
-import { isDefined as isDefined6 } from "@xylabs/typeof";
+import { requestHandlerValidator } from "@xylabs/express";
+import { isDefined as isDefined5 } from "@xylabs/typeof";
 import { blockRangeSteps as blockRangeSteps2 } from "@xyo-network/chain-protocol";
 import { PayloadBuilder as PayloadBuilder2 } from "@xyo-network/payload-builder";
 import { PayloadZodLoose } from "@xyo-network/payload-model";
 import { asSentinelInstance } from "@xyo-network/sentinel-model";
-import { asXL1BlockNumber as asXL1BlockNumber2 } from "@xyo-network/xl1-protocol";
-import { z as z3 } from "zod";
+import { asXL1BlockRange as asXL1BlockRange2 } from "@xyo-network/xl1-protocol";
+import { z as z2 } from "zod";
 
 // src/modules/ChainStepRewardsClaimSentinel/ChainStepRewardsClaimSentinel.ts
 import { assertEx } from "@xylabs/assert";
@@ -128,14 +132,14 @@ import { toAddress } from "@xylabs/hex";
 import { isDefined as isDefined2, isUndefined } from "@xylabs/typeof";
 import { blockRangeSteps, createTransferPayload } from "@xyo-network/chain-protocol";
 import { AbstractSentinel } from "@xyo-network/sentinel-abstract";
-import { asXL1BlockNumber, XYO_STEP_REWARD_ADDRESS } from "@xyo-network/xl1-protocol";
+import { asXL1BlockNumber, asXL1BlockRange, XYO_STEP_REWARD_ADDRESS } from "@xyo-network/xl1-protocol";
 import { completedStepRewardAddress, derivedReceiveAddress, flattenHydratedTransaction, flattenHydratedTransactions, SimpleXyoGatewayRunner } from "@xyo-network/xl1-protocol-sdk";
 import { Mutex } from "async-mutex";
 
 // src/modules/ChainStepRewardsClaimSentinel/StepIdentityPayload.ts
 import { AsObjectFactory } from "@xylabs/object";
 import { isPayloadOfZodType } from "@xyo-network/payload-model";
-import { StepIdentityZod } from "@xyo-network/xl1-rpc";
+import { StepIdentityZod } from "@xyo-network/xl1-protocol";
 var StepIdentitySchema = "network.xyo.chain.step.identity";
 var isStepIdentityPayload = isPayloadOfZodType(StepIdentityZod, StepIdentitySchema);
 var asStepIdentityPayload = AsObjectFactory.create(isStepIdentityPayload);
@@ -213,7 +217,7 @@ var ChainStepRewardsClaimSentinel = class extends AbstractSentinel {
       } else {
         const stepIdentities = payloads.filter(isStepIdentityPayload).map((p) => {
           const { step, block: blockNumber } = p;
-          const block = asXL1BlockNumber(blockNumber);
+          const block = asXL1BlockNumber(blockNumber, true);
           return {
             step,
             block
@@ -250,10 +254,10 @@ var ChainStepRewardsClaimSentinel = class extends AbstractSentinel {
     for (const step of RewardableSteps) {
       const from = 0;
       const to = await this.viewer.currentBlockNumber();
-      const range = [
+      const range = asXL1BlockRange([
         asXL1BlockNumber(from),
         asXL1BlockNumber(to)
-      ];
+      ], true);
       const stepIdentities = blockRangeSteps(range, [
         step
       ]);
@@ -419,85 +423,12 @@ var DerivedAddressWalletTransferSentinel = class extends AbstractSentinel2 {
   }, "submitRewardDistributionTransaction");
 };
 
-// src/server/routes/rewardRedemption/middleware/requestHandlerValidator.ts
-import { isDefined as isDefined4, isPromise } from "@xylabs/typeof";
-import { ReasonPhrases, StatusCodes } from "http-status-codes";
-import { z as z2 } from "zod";
-var EmptyParamsZod = z2.object({}).catchall(z2.string());
-var EmptyQueryParamsZod = z2.object({}).catchall(z2.union([
-  z2.string(),
-  z2.array(z2.string())
-]));
-var ValidateRequestDefaults = {
-  params: EmptyParamsZod,
-  query: EmptyQueryParamsZod,
-  body: z2.json().optional(),
-  response: z2.json().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 (isDefined4(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(result)) {
-          await result;
-        }
-      } catch (err) {
-        res.json = originalJson;
-        next(err);
-      }
-    };
-  };
-}
-__name(requestHandlerValidator, "requestHandlerValidator");
-
 // src/server/routes/rewardRedemption/routeDefinitions/util/getViewerFromConfig.ts
-import { isDefined as isDefined5 } from "@xylabs/typeof";
+import { isDefined as isDefined4 } from "@xylabs/typeof";
 import { HttpRpcTransport, JsonRpcNetworkStakeViewer, JsonRpcXyoViewer, NetworkStakeViewerRpcSchemas, XyoViewerRpcSchemas } from "@xyo-network/xl1-rpc";
 var viewer;
 var getViewerFromConfig = /* @__PURE__ */ __name((config) => {
-  if (isDefined5(viewer)) return viewer;
+  if (isDefined4(viewer)) return viewer;
   const transport = new HttpRpcTransport(config.rewardRedemptionApi.chainRpcApiUrl, {
     ...XyoViewerRpcSchemas,
     ...NetworkStakeViewerRpcSchemas
@@ -520,12 +451,12 @@ var RewardableSteps2 = [
 ];
 
 // src/server/routes/rewardRedemption/routeDefinitions/routes/claimRange.ts
-var query = z3.object({
-  fromBlock: z3.coerce.number().int().nonnegative().optional(),
-  toBlock: z3.coerce.number().int().nonnegative().optional(),
-  step: z3.coerce.number().int().nonnegative().min(Math.min(...RewardableSteps2)).max(Math.max(...RewardableSteps2)).optional().default(3)
+var query = z2.object({
+  fromBlock: z2.coerce.number().int().nonnegative().optional(),
+  toBlock: z2.coerce.number().int().nonnegative().optional(),
+  step: z2.coerce.number().int().nonnegative().min(Math.min(...RewardableSteps2)).max(Math.max(...RewardableSteps2)).optional().default(3)
 });
-var response = z3.array(PayloadZodLoose);
+var response = z2.array(PayloadZodLoose);
 var validateRequest = requestHandlerValidator({
   query,
   response
@@ -540,20 +471,20 @@ var postClaimRange = {
   path: "/rewards/claimRange",
   handlers: validateRequest(async (req, res) => {
     const { config, node } = req.app;
-    const { fromBlock, toBlock, step } = z3.parse(query, req.query);
+    const { fromBlock, toBlock, step } = z2.parse(query, req.query);
     const viewer2 = getViewerFromConfig(config);
-    const from = isDefined6(fromBlock) ? fromBlock : 0;
+    const from = isDefined5(fromBlock) ? fromBlock : 0;
     const currentBlock = await viewer2.currentBlockNumber();
-    const to = isDefined6(toBlock) ? Math.min(toBlock, currentBlock) : currentBlock;
+    const to = isDefined5(toBlock) ? Math.min(toBlock, currentBlock) : currentBlock;
     if (to <= from) {
       res.status(400);
       res.json([]);
       return;
     }
-    const range = [
-      asXL1BlockNumber2(from),
-      asXL1BlockNumber2(to)
-    ];
+    const range = asXL1BlockRange2([
+      from,
+      to
+    ], true);
     const stepIdentities = blockRangeSteps2(range, [
       step
     ]);
@@ -575,16 +506,17 @@ var postClaimRange = {
 
 // src/server/routes/rewardRedemption/routeDefinitions/routes/redeem.ts
 import { assertEx as assertEx4 } from "@xylabs/assert";
+import { requestHandlerValidator as requestHandlerValidator2 } from "@xylabs/express";
 import { PayloadZodLoose as PayloadZodLoose2, PayloadZodStrictOfSchema } from "@xyo-network/payload-model";
 import { asSentinelInstance as asSentinelInstance2 } from "@xyo-network/sentinel-model";
 import { EIP712DataPayloadFieldsZod, EIP712DataPayloadSchema, EIP712SignaturePayloadFieldsZod, EIP712SignaturePayloadSchema } from "@xyo-network/xl1-protocol-sdk";
-import { z as z4 } from "zod";
-var body = z4.tuple([
+import { z as z3 } from "zod";
+var body = z3.tuple([
   PayloadZodStrictOfSchema(EIP712DataPayloadSchema).extend(EIP712DataPayloadFieldsZod.shape),
   PayloadZodStrictOfSchema(EIP712SignaturePayloadSchema).extend(EIP712SignaturePayloadFieldsZod.shape)
 ]);
-var response2 = z4.array(PayloadZodLoose2);
-var validateRequest2 = requestHandlerValidator({
+var response2 = z3.array(PayloadZodLoose2);
+var validateRequest2 = requestHandlerValidator2({
   body,
   response: response2
 });
@@ -617,9 +549,7 @@ var getRouteDefinitions = /* @__PURE__ */ __name(() => {
 // src/server/routes/rewardRedemption/addRewardRoutes.ts
 var addRewardRedemptionRoutes = /* @__PURE__ */ __name((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
@@ -652,12 +582,12 @@ var getApp = /* @__PURE__ */ __name((node, config) => {
 
 // src/server/server.ts
 import { assertEx as assertEx5 } from "@xylabs/assert";
-import { isDefined as isDefined8, isString } from "@xylabs/typeof";
+import { isDefined as isDefined7, isString } from "@xylabs/typeof";
 import { boot } from "@xyo-network/bios";
 import { HDWallet as HDWallet2 } from "@xyo-network/wallet";
 
 // src/manifest/getLocator.ts
-import { isDefined as isDefined7 } from "@xylabs/typeof";
+import { isDefined as isDefined6 } from "@xylabs/typeof";
 import { MemoryArchivist } from "@xyo-network/archivist-memory";
 import { MongoDBArchivistV2 } from "@xyo-network/archivist-mongodb";
 import { ViewArchivist } from "@xyo-network/archivist-view";
@@ -682,7 +612,7 @@ var getLocator = /* @__PURE__ */ __name(async (context) => {
       port: 9465
     }
   });
-  if (isDefined7(logger)) AbstractModule.defaultLogger = logger;
+  if (isDefined6(logger)) AbstractModule.defaultLogger = logger;
   const statusReporter = logger ? new LoggerModuleStatusReporter(logger) : void 0;
   const locator = new ModuleFactoryLocator();
   const mongoConfig = config.storage?.mongo;
@@ -737,7 +667,7 @@ var getLocator = /* @__PURE__ */ __name(async (context) => {
 }, "getLocator");
 var getGateway = /* @__PURE__ */ __name(async (config) => {
   const { mnemonic, chainRpcApiUrl: endpoint } = config.rewardRedemptionApi;
-  const walletPromise = isDefined7(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random();
+  const walletPromise = isDefined6(mnemonic) ? HDWallet.fromPhrase(mnemonic) : HDWallet.random();
   const account = await walletPromise;
   const signer = new SimpleXyoSigner(account);
   const connection = new HttpRpcXyoConnection({
@@ -885,7 +815,7 @@ var getServer = /* @__PURE__ */ __name(async (context) => {
   const { logger, config } = context;
   const { port, mnemonic } = config.rewardRedemptionApi;
   const bios = await boot();
-  const seedPhrase = isDefined8(mnemonic) ? mnemonic : await getSeedPhrase(bios, config, logger);
+  const seedPhrase = isDefined7(mnemonic) ? mnemonic : await getSeedPhrase(bios, config, logger);
   const wallet = await HDWallet2.fromPhrase(seedPhrase);
   const nodeContext = {
     wallet,