Merge remote-tracking branch 'origin/main' into ph/acceptCert

Author: arcoraven

src/db/configuration/getConfiguration.ts

@@ -166,6 +166,12 @@ const toParsedConfig = async (config: Configuration): Promise<ParsedConfig> => {
       gcp: gcpWalletConfiguration,
       legacyWalletType_removeInNextBreakingChange,
     },
+    mtlsCertificate: config.mtlsCertificateEncrypted
+      ? decrypt(config.mtlsCertificateEncrypted)
+      : null,
+    mtlsPrivateKey: config.mtlsPrivateKeyEncrypted
+      ? decrypt(config.mtlsPrivateKeyEncrypted)
+      : null,
   };
 };
 

src/db/configuration/updateConfiguration.ts

@@ -3,7 +3,7 @@ import { encrypt } from "../../utils/crypto";
 import { prisma } from "../client";
 
 export const updateConfiguration = async (
-  data: Prisma.ConfigurationUpdateArgs["data"],
+  data: Prisma.ConfigurationUpdateInput,
 ) => {
   return prisma.configuration.update({
     where: {

src/prisma/migrations/20241024194728_add_mtls_webhooks/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "configuration" ADD COLUMN     "mtlsCertificateEncrypted" TEXT,
+ADD COLUMN     "mtlsPrivateKeyEncrypted" TEXT;

src/prisma/migrations/20241031010103_add_mtls_configuration/migration.sql

@@ -50,6 +50,9 @@ model Configuration {
   accessControlAllowOrigin           String   @default("https://thirdweb.com,https://embed.ipfscdn.io") @map("accessControlAllowOrigin")
   ipAllowlist                        String[] @default([]) @map("ipAllowlist")
   clearCacheCronSchedule             String   @default("*/30 * * * * *") @map("clearCacheCronSchedule")
+  // mTLS support
+  mtlsCertificateEncrypted           String?
+  mtlsPrivateKeyEncrypted            String?
 
   @@map("configuration")
 }
@@ -178,10 +181,6 @@ model Webhooks {
   secret    String  @map("secret")
   eventType String  @map("evenType")
 
-  mtlsClientCert String?
-  mtlsClientKey  String?
-  mtlsCaCert     String?
-
   createdAt DateTime  @default(now()) @map("createdAt")
   updatedAt DateTime  @updatedAt @map("updatedAt")
   revokedAt DateTime? @map("revokedAt")

src/prisma/schema.prisma

@@ -33,6 +33,8 @@ export interface ParsedConfig
     | "gcpApplicationCredentialEmail"
     | "gcpApplicationCredentialPrivateKey"
     | "contractSubscriptionsRetryDelaySeconds"
+    | "mtlsCertificateEncrypted"
+    | "mtlsPrivateKeyEncrypted"
   > {
   walletConfiguration: {
     aws: AwsWalletConfiguration | null;
@@ -41,4 +43,6 @@ export interface ParsedConfig
   };
   contractSubscriptionsRequeryDelaySeconds: string;
   chainOverridesParsed: Chain[];
+  mtlsCertificate: string | null;
+  mtlsPrivateKey: string | null;
 }

src/schema/config.ts

@@ -10,10 +10,10 @@ export enum WebhooksEventTypes {
   CONTRACT_SUBSCRIPTION = "contract_subscription",
 }
 
-export interface WalletBalanceWebhookSchema {
+export type BackendWalletBalanceWebhookParams = {
   walletAddress: string;
   minimumBalance: string;
   currentBalance: string;
   chainId: number;
   message: string;
-}
+};

src/schema/webhooks.ts

@@ -27,7 +27,7 @@ export const responseBodySchema = Type.Object({
         ...AddressSchema,
         description: "Backend wallet address",
       },
-      chainId: Type.Number({
+      chainId: Type.Integer({
         description: "Chain ID",
         examples: [80002],
       }),

src/server/routes/admin/nonces.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getAllWallets } from "../../../db/wallets/getAllWallets";
 import {
@@ -8,15 +8,17 @@ import {
 } from "../../schemas/sharedApiSchemas";
 
 const QuerySchema = Type.Object({
-  page: Type.Number({
+  page: Type.Integer({
     description: "The page of wallets to get.",
     examples: ["1"],
     default: "1",
+    minimum: 1,
   }),
-  limit: Type.Number({
+  limit: Type.Integer({
     description: "The number of wallets to get per page.",
     examples: ["10"],
     default: "10",
+    minimum: 1,
   }),
 });
 

src/server/routes/backend-wallet/getAll.ts

@@ -1,7 +1,7 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { Address } from "thirdweb";
+import type { Address } from "thirdweb";
 import { inspectNonce } from "../../../db/wallets/walletNonce";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { walletWithAddressParamSchema } from "../../schemas/wallet";
@@ -11,7 +11,7 @@ const requestSchema = walletWithAddressParamSchema;
 
 const responseSchema = Type.Object({
   result: Type.Object({
-    nonce: Type.Number(),
+    nonce: Type.Integer(),
   }),
 });