use fn for public key zod

coral-xyz · Jun 29, 2023 · 130a1f1 · 130a1f1 · vercel · Jun 29, 2023
1 parent 5f8f988
commit 130a1f1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 41 deletions.
diff --git a/backend/native/backpack-api/src/blockchains/index.ts b/backend/native/backpack-api/src/blockchains/index.ts
@@ -14,7 +14,7 @@ type BlockchainsNative = Record<
   Blockchain,
   {
     validateSignature: (msg: Buffer, sig: string, pubkey: string) => boolean;
-    ZodPublicKey: any; // TODO: type.
+    ZodPublicKey: () => any; // TODO: type.
     ZodCreatePublicKey: () => any; // TODO: type.
   }
 >;
@@ -30,20 +30,21 @@ export const BLOCKCHAINS_NATIVE: BlockchainsNative = {
     validateSignature: (msg: Buffer, signature: string, publicKey: string) => {
       return ethers.utils.verifyMessage(msg, signature) === publicKey;
     },
-    ZodPublicKey: z.object({
-      publicKey: z.string().refine((str) => {
-        try {
-          ethers.utils.getAddress(str);
-          return true;
-        } catch {
-          // Pass
-        }
-        return false;
-      }, "must be a valid Ethereum public key"),
-      blockchain: z.literal("ethereum"),
-    }),
+    ZodPublicKey: () =>
+      z.object({
+        publicKey: z.string().refine((str) => {
+          try {
+            ethers.utils.getAddress(str);
+            return true;
+          } catch {
+            // Pass
+          }
+          return false;
+        }, "must be a valid Ethereum public key"),
+        blockchain: z.literal("ethereum"),
+      }),
     ZodCreatePublicKey: () =>
-      BLOCKCHAINS_NATIVE[Blockchain.ETHEREUM].ZodPublicKey.extend({
+      BLOCKCHAINS_NATIVE[Blockchain.ETHEREUM].ZodPublicKey().extend({
         signature: z.string(),
       }),
   },
@@ -88,20 +89,21 @@ export const BLOCKCHAINS_NATIVE: BlockchainsNative = {
         return false;
       }
     },
-    ZodPublicKey: z.object({
-      publicKey: z.string().refine((str) => {
-        try {
-          new PublicKey(str);
-          return true;
-        } catch {
-          // Pass
-        }
-        return false;
-      }, "must be a valid Solana public key"),
-      blockchain: z.literal("solana"),
-    }),
+    ZodPublicKey: () =>
+      z.object({
+        publicKey: z.string().refine((str) => {
+          try {
+            new PublicKey(str);
+            return true;
+          } catch {
+            // Pass
+          }
+          return false;
+        }, "must be a valid Solana public key"),
+        blockchain: z.literal("solana"),
+      }),
     ZodCreatePublicKey: () =>
-      BLOCKCHAINS_NATIVE[Blockchain.SOLANA].ZodPublicKey.extend({
+      BLOCKCHAINS_NATIVE[Blockchain.SOLANA].ZodPublicKey().extend({
         signature: z.string(),
       }),
   },
@@ -117,20 +119,21 @@ export const BLOCKCHAINS_NATIVE: BlockchainsNative = {
         encodedPublicKey
       );
     },
-    ZodPublicKey: z.object({
-      publicKey: z.string().refine((str) => {
-        try {
-          new PublicKey(str);
-          return true;
-        } catch {
-          // Pass
-        }
-        return false;
-      }, "must be a valid Eclipse public key"),
-      blockchain: z.literal("eclipse"),
-    }),
+    ZodPublicKey: () =>
+      z.object({
+        publicKey: z.string().refine((str) => {
+          try {
+            new PublicKey(str);
+            return true;
+          } catch {
+            // Pass
+          }
+          return false;
+        }, "must be a valid Eclipse public key"),
+        blockchain: z.literal("eclipse"),
+      }),
     ZodCreatePublicKey: () =>
-      BLOCKCHAINS_NATIVE[Blockchain.ECLIPSE].ZodPublicKey.extend({
+      BLOCKCHAINS_NATIVE[Blockchain.ECLIPSE].ZodPublicKey().extend({
         signature: z.string(),
       }),
   },

diff --git a/backend/native/backpack-api/src/validation/user.ts b/backend/native/backpack-api/src/validation/user.ts
@@ -23,7 +23,7 @@ export const BaseCreateUser = z.object({
 //
 export const BlockchainPublicKey = z.discriminatedUnion(
   "blockchain",
-  Object.values(BLOCKCHAINS_NATIVE).map((native) => native.ZodPublicKey)
+  Object.values(BLOCKCHAINS_NATIVE).map((native) => native.ZodPublicKey())
 );
 
 //