fix webhook tests

Author: gregfromstl

packages/thirdweb/src/bridge/Webhook.test.ts

@@ -21,11 +21,11 @@ const generateSignature = async (
 
 describe("parseIncomingWebhook", () => {
   const testTimestamp = Math.floor(Date.now() / 1000).toString();
-  const validPayload: WebhookPayload = {
+  const validWebhook: WebhookPayload = {
     data: {
       action: "TRANSFER",
       clientId: "client123",
-      destinationAmount: "1.0",
+      destinationAmount: 10n,
       destinationToken: {
         address: "0x1234567890123456789012345678901234567890" as const,
         chainId: 1,
@@ -37,7 +37,7 @@ describe("parseIncomingWebhook", () => {
       },
       developerFeeBps: 100,
       developerFeeRecipient: "0x1234567890123456789012345678901234567890",
-      originAmount: "1.0",
+      originAmount: 10n,
       originToken: {
         address: "0x1234567890123456789012345678901234567890" as const,
         chainId: 1,
@@ -64,8 +64,17 @@ describe("parseIncomingWebhook", () => {
       ],
       type: "transfer",
     },
+    topic: "pay.onchain-transaction",
     version: 2,
   };
+  const validPayload = {
+    ...validWebhook,
+    data: {
+      ...validWebhook.data,
+      originAmount: validWebhook.data.originAmount.toString(),
+      destinationAmount: validWebhook.data.destinationAmount.toString(),
+    },
+  }
 
   it("should successfully verify a valid webhook", async () => {
     const signature = await generateSignature(
@@ -78,7 +87,7 @@ describe("parseIncomingWebhook", () => {
     };
 
     const result = await parse(JSON.stringify(validPayload), headers, secret);
-    expect(result).toEqual(validPayload);
+    expect(result).toEqual(validWebhook);
   });
 
   it("should accept alternative header names", async () => {
@@ -92,7 +101,7 @@ describe("parseIncomingWebhook", () => {
     };
 
     const result = await parse(JSON.stringify(validPayload), headers, secret);
-    expect(result).toEqual(validPayload);
+    expect(result).toEqual(validWebhook);
   });
 
   it("should throw error for missing headers", async () => {
@@ -150,6 +159,7 @@ describe("parseIncomingWebhook", () => {
         someField: "value",
       },
       version: 1,
+      topic: "pay.onchain-transaction",
     };
     const v1PayloadString = JSON.stringify(v1Payload);
     const signature = await generateSignature(testTimestamp, v1PayloadString);
@@ -180,7 +190,7 @@ describe("parseIncomingWebhook", () => {
       secret,
       300,
     );
-    expect(result).toEqual(validPayload);
+    expect(result).toEqual(validWebhook);
   });
 
   describe("payload validation", () => {
@@ -576,6 +586,7 @@ describe("parseIncomingWebhook", () => {
     it("should throw error for version 1 payload missing data object", async () => {
       const invalidPayload = {
         version: 1,
+        topic: "pay.onchain-transaction",
         // no data field
       } as unknown as WebhookPayload;
       const payloadString = JSON.stringify(invalidPayload);

packages/thirdweb/src/bridge/Webhook.ts

@@ -80,7 +80,7 @@ const onrampWebhookSchema = z.discriminatedUnion("version", [
   }),
 ]);
 
-const webhookSchema = z.discriminatedUnion("type", [
+const webhookSchema = z.discriminatedUnion("topic", [
   onchainWebhookSchema,
   onrampWebhookSchema,
 ]);