refactor: better zod

HathorNetwork · Feb 25, 2025 · 26c92d6 · 26c92d6
1 parent 7b55ca6
commit 26c92d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/packages/hathor-rpc-handler/src/rpcMethods/getAddress.ts b/packages/hathor-rpc-handler/src/rpcMethods/getAddress.ts
@@ -25,15 +25,13 @@ const baseSchema = {
 };
 
 const getAddressSchema = z.discriminatedUnion("type", [
-  z.object({
+  z.object(baseSchema).merge(z.object({
     type: z.literal('first_empty'),
-    ...baseSchema,
-  }),
-  z.object({
+  })),
+  z.object(baseSchema).merge(z.object({
     type: z.literal('full_path'),
     full_path: z.string().min(1),
-    ...baseSchema,
-  }),
+  })),
   z.object({
     type: z.literal('index'),
     index: z.number().int().nonnegative(),

diff --git a/packages/hathor-rpc-handler/src/rpcMethods/getUtxos.ts b/packages/hathor-rpc-handler/src/rpcMethods/getUtxos.ts
@@ -27,10 +27,10 @@ const getUtxosSchema = z.object({
     maxUtxos: z.number().default(255),
     token: z.string().default('HTR'),
     filterAddress: z.string(),
-    authorities: z.number().nullish().optional(),
-    amountSmallerThan: z.number().min(0).nullish().optional(),
-    amountBiggerThan: z.number().min(0).nullish().optional(),
-    maximumAmount: z.number().nullish().optional(),
+    authorities: z.number().default(0),
+    amountSmallerThan: z.number().min(0).default(0),
+    amountBiggerThan: z.number().min(0).default(0),
+    maximumAmount: z.number().default(0),
     onlyAvailableUtxos: z.boolean().default(true),
   }).transform(data => ({
     ...data,