fix: Enforce Address schema wherever an address is expected (#657)

* fix: Enforce Address schema wherever an address is expected

* More instances of string types

* fix indentation

* format

Author: arcoraven

src/server/routes/admin/nonces.ts

@@ -16,16 +16,17 @@ import {
 import { getChain } from "../../../utils/chain";
 import { redis } from "../../../utils/redis/redis";
 import { thirdwebClient } from "../../../utils/sdk";
+import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { walletWithAddressParamSchema } from "../../schemas/wallet";
 
 export const responseBodySchema = Type.Object({
   result: Type.Array(
     Type.Object({
-      walletAddress: Type.String({
-        description: "Backend Wallet Address",
-        examples: ["0xcedf3b4d8f7f1f7e0f7f0f7f0f7f0f7f0f7f0f7f"],
-      }),
+      walletAddress: {
+        ...AddressSchema,
+        description: "Backend wallet address",
+      },
       chainId: Type.Number({
         description: "Chain ID",
         examples: [80002],

src/server/routes/auth/access-tokens/getAll.ts

@@ -2,12 +2,13 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getAccessTokens } from "../../../../db/tokens/getAccessTokens";
+import { AddressSchema } from "../../../schemas/address";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 export const AccessTokenSchema = Type.Object({
   id: Type.String(),
   tokenMask: Type.String(),
-  walletAddress: Type.String(),
+  walletAddress: AddressSchema,
   createdAt: Type.String(),
   expiresAt: Type.String(),
   label: Type.Union([Type.String(), Type.Null()]),

src/server/routes/auth/permissions/getAll.ts

@@ -2,12 +2,13 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { prisma } from "../../../../db/client";
+import { AddressSchema } from "../../../schemas/address";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 const responseBodySchema = Type.Object({
   result: Type.Array(
     Type.Object({
-      walletAddress: Type.String(),
+      walletAddress: AddressSchema,
       permissions: Type.String(),
       label: Type.Union([Type.String(), Type.Null()]),
     }),

src/server/routes/auth/permissions/grant.ts

@@ -2,11 +2,12 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { updatePermissions } from "../../../../db/permissions/updatePermissions";
+import { AddressSchema } from "../../../schemas/address";
 import { permissionsSchema } from "../../../schemas/auth";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 const requestBodySchema = Type.Object({
-  walletAddress: Type.String(),
+  walletAddress: AddressSchema,
   permissions: permissionsSchema,
   label: Type.Optional(Type.String()),
 });

src/server/routes/auth/permissions/revoke.ts

@@ -2,10 +2,11 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { deletePermissions } from "../../../../db/permissions/deletePermissions";
+import { AddressSchema } from "../../../schemas/address";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 const requestBodySchema = Type.Object({
-  walletAddress: Type.String(),
+  walletAddress: AddressSchema,
 });
 
 const responseBodySchema = Type.Object({

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

@@ -3,6 +3,7 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { WalletType } from "../../../schema/wallet";
 import { getConfig } from "../../../utils/cache/getConfig";
+import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { createAwsKmsWallet } from "../../utils/wallets/createAwsKmsWallet";
 import { createGcpKmsWallet } from "../../utils/wallets/createGcpKmsWallet";
@@ -14,7 +15,7 @@ const requestBodySchema = Type.Object({
 
 const responseSchema = Type.Object({
   result: Type.Object({
-    walletAddress: Type.String(),
+    walletAddress: AddressSchema,
     status: Type.String(),
   }),
 });

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

@@ -2,6 +2,7 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getSdk } from "../../../utils/cache/getSdk";
+import { AddressSchema } from "../../schemas/address";
 import {
   currencyValueSchema,
   standardResponseSchema,
@@ -11,7 +12,7 @@ import { getChainIdFromChain } from "../../utils/chain";
 
 const responseSchema = Type.Object({
   result: Type.Object({
-    walletAddress: Type.String(),
+    walletAddress: AddressSchema,
     ...currencyValueSchema.properties,
   }),
 });

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

@@ -4,6 +4,7 @@ import { StatusCodes } from "http-status-codes";
 import { WalletType } from "../../../schema/wallet";
 import { getConfig } from "../../../utils/cache/getConfig";
 import { createCustomError } from "../../middleware/error";
+import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { importAwsKmsWallet } from "../../utils/wallets/importAwsKmsWallet";
 import { importGcpKmsWallet } from "../../utils/wallets/importGcpKmsWallet";
@@ -80,7 +81,7 @@ RequestBodySchema.examples = [
 
 const ResponseSchema = Type.Object({
   result: Type.Object({
-    walletAddress: Type.String(),
+    walletAddress: AddressSchema,
     status: Type.String(),
   }),
 });

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

@@ -3,10 +3,11 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { Address } from "thirdweb";
 import { deleteWalletDetails } from "../../../db/wallets/deleteWalletDetails";
+import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 
 const requestParamSchema = Type.Object({
-  walletAddress: Type.String(),
+  walletAddress: AddressSchema,
 });
 
 const responseSchema = Type.Object({

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

@@ -4,6 +4,7 @@ import { StatusCodes } from "http-status-codes";
 import { Address, Hex } from "thirdweb";
 import { maybeBigInt } from "../../../utils/primitiveTypes";
 import { insertTransaction } from "../../../utils/transaction/insertTransaction";
+import { AddressSchema } from "../../schemas/address";
 import {
   requestQuerystringSchema,
   standardResponseSchema,
@@ -18,11 +19,7 @@ import {
 import { getChainIdFromChain } from "../../utils/chain";
 
 const requestBodySchema = Type.Object({
-  toAddress: Type.Optional(
-    Type.String({
-      examples: ["0x..."],
-    }),
-  ),
+  toAddress: Type.Optional(AddressSchema),
   data: Type.String({
     examples: ["0x..."],
   }),

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

@@ -4,6 +4,7 @@ import { StatusCodes } from "http-status-codes";
 import { Address, Hex } from "thirdweb";
 import { maybeBigInt } from "../../../utils/primitiveTypes";
 import { insertTransaction } from "../../../utils/transaction/insertTransaction";
+import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { txOverridesWithValueSchema } from "../../schemas/txOverrides";
 import {
@@ -14,11 +15,7 @@ import { getChainIdFromChain } from "../../utils/chain";
 
 const requestBodySchema = Type.Array(
   Type.Object({
-    toAddress: Type.Optional(
-      Type.String({
-        examples: ["0x..."],
-      }),
-    ),
+    toAddress: Type.Optional(AddressSchema),
     data: Type.String({
       examples: ["0x..."],
     }),

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

@@ -2,16 +2,17 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { updateWalletDetails } from "../../../db/wallets/updateWalletDetails";
+import { AddressSchema } from "../../schemas/address";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 
 const requestBodySchema = Type.Object({
-  walletAddress: Type.String(),
+  walletAddress: AddressSchema,
   label: Type.Optional(Type.String()),
 });
 
 const responseSchema = Type.Object({
   result: Type.Object({
-    walletAddress: Type.String(),
+    walletAddress: AddressSchema,
     status: Type.String(),
   }),
 });

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

@@ -11,6 +11,7 @@ import { getWalletBalance } from "thirdweb/wallets";
 import { getAccount } from "../../../utils/account";
 import { getChain } from "../../../utils/chain";
 import { thirdwebClient } from "../../../utils/sdk";
+import { AddressSchema } from "../../schemas/address";
 import {
   requestQuerystringSchema,
   standardResponseSchema,
@@ -24,9 +25,10 @@ import { getChainIdFromChain } from "../../utils/chain";
 const ParamsSchema = Type.Omit(walletWithAddressParamSchema, ["walletAddress"]);
 
 const requestBodySchema = Type.Object({
-  toAddress: Type.String({
+  toAddress: {
+    ...AddressSchema,
     description: "Address to withdraw all funds to",
-  }),
+  },
 });
 
 const responseBodySchema = Type.Object({

src/server/routes/contract/events/getContractEventLogs.ts

@@ -4,6 +4,7 @@ import { StatusCodes } from "http-status-codes";
 import { getContractEventLogsByBlockAndTopics } from "../../../../db/contractEventLogs/getContractEventLogs";
 import { isContractSubscribed } from "../../../../db/contractSubscriptions/getContractSubscriptions";
 import { createCustomError } from "../../../middleware/error";
+import { AddressSchema } from "../../../schemas/address";
 import {
   contractParamSchema,
   standardResponseSchema,
@@ -21,7 +22,7 @@ const responseSchema = Type.Object({
     logs: Type.Array(
       Type.Object({
         chainId: Type.Number(),
-        contractAddress: Type.String(),
+        contractAddress: AddressSchema,
         blockNumber: Type.Number(),
         transactionHash: Type.String(),
         topics: Type.Array(Type.String()),

src/server/routes/contract/events/getEventLogsByTimestamp.ts

@@ -1,12 +1,13 @@
-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 { getEventLogsByBlockTimestamp } from "../../../../db/contractEventLogs/getContractEventLogs";
+import { AddressSchema } from "../../../schemas/address";
 import { eventLogSchema } from "../../../schemas/eventLog";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 const requestQuerySchema = Type.Object({
-  contractAddresses: Type.Optional(Type.Array(Type.String())),
+  contractAddresses: Type.Optional(Type.Array(AddressSchema)),
   topics: Type.Optional(Type.Array(Type.String())),
   fromBlockTimestamp: Type.Number(),
   toBlockTimestamp: Type.Optional(Type.Number()),

src/server/routes/contract/events/paginateEventLogs.ts

@@ -1,16 +1,17 @@
-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 { getConfiguration } from "../../../../db/configuration/getConfiguration";
 import { getEventLogsByCursor } from "../../../../db/contractEventLogs/getContractEventLogs";
+import { AddressSchema } from "../../../schemas/address";
 import { eventLogSchema, toEventLogSchema } from "../../../schemas/eventLog";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 const requestQuerySchema = Type.Object({
   cursor: Type.Optional(Type.String()),
   pageSize: Type.Optional(Type.Number()),
   topics: Type.Optional(Type.Array(Type.String())),
-  contractAddresses: Type.Optional(Type.Array(Type.String())),
+  contractAddresses: Type.Optional(Type.Array(AddressSchema)),
 });
 
 const responseSchema = Type.Object({

src/server/routes/contract/extensions/account/write/grantAdmin.ts

@@ -3,6 +3,7 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { queueTx } from "../../../../../../db/transactions/queueTx";
 import { getContract } from "../../../../../../utils/cache/getContract";
+import { AddressSchema } from "../../../../../schemas/address";
 import {
   contractParamSchema,
   requestQuerystringSchema,
@@ -14,9 +15,10 @@ import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 const requestBodySchema = Type.Object({
-  signerAddress: Type.String({
+  signerAddress: {
+    ...AddressSchema,
     description: "Address to grant admin permissions to",
-  }),
+  },
   ...txOverridesWithValueSchema.properties,
 });
 

src/server/routes/contract/extensions/account/write/revokeAdmin.ts

@@ -3,6 +3,7 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { queueTx } from "../../../../../../db/transactions/queueTx";
 import { getContract } from "../../../../../../utils/cache/getContract";
+import { AddressSchema } from "../../../../../schemas/address";
 import {
   contractParamSchema,
   requestQuerystringSchema,
@@ -14,9 +15,10 @@ import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 const requestBodySchema = Type.Object({
-  walletAddress: Type.String({
+  walletAddress: {
+    ...AddressSchema,
     description: "Address to revoke admin permissions from",
-  }),
+  },
   ...txOverridesWithValueSchema.properties,
 });
 

src/server/routes/contract/extensions/account/write/revokeSession.ts

@@ -3,6 +3,7 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { queueTx } from "../../../../../../db/transactions/queueTx";
 import { getContract } from "../../../../../../utils/cache/getContract";
+import { AddressSchema } from "../../../../../schemas/address";
 import {
   contractParamSchema,
   requestQuerystringSchema,
@@ -14,9 +15,10 @@ import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 const requestBodySchema = Type.Object({
-  walletAddress: Type.String({
+  walletAddress: {
+    ...AddressSchema,
     description: "Address to revoke session from",
-  }),
+  },
   ...txOverridesWithValueSchema.properties,
 });
 

src/server/routes/contract/extensions/account/write/updateSession.ts

@@ -3,6 +3,7 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { queueTx } from "../../../../../../db/transactions/queueTx";
 import { getContract } from "../../../../../../utils/cache/getContract";
+import { AddressSchema } from "../../../../../schemas/address";
 import {
   contractParamSchema,
   requestQuerystringSchema,
@@ -14,8 +15,8 @@ import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 const requestBodySchema = Type.Object({
-  signerAddress: Type.String(),
-  approvedCallTargets: Type.Array(Type.String()),
+  signerAddress: AddressSchema,
+  approvedCallTargets: Type.Array(AddressSchema),
   startDate: Type.Optional(Type.String()),
   expirationDate: Type.Optional(Type.String()),
   nativeTokenLimitPerTransaction: Type.Optional(Type.String()),

src/server/routes/contract/extensions/accountFactory/read/getAssociatedAccounts.ts

@@ -2,6 +2,7 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getContract } from "../../../../../../utils/cache/getContract";
+import { AddressSchema } from "../../../../../schemas/address";
 import {
   contractParamSchema,
   standardResponseSchema,
@@ -16,9 +17,10 @@ const responseBodySchema = Type.Object({
 });
 
 const QuerySchema = Type.Object({
-  signerAddress: Type.String({
+  signerAddress: {
+    ...AddressSchema,
     description: "The address of the signer to get associated accounts from",
-  }),
+  },
 });
 
 export const getAssociatedAccounts = async (fastify: FastifyInstance) => {