Move ./server to ./src/server (#272)

* Move /server to /src/server

* update bugs

Author: adam-maj

package.json

@@ -3,28 +3,28 @@
   "version": "0.1.0",
   "license": "Apache-2.0",
   "description": "thirdweb's web3-api server",
-  "main": "server/index.ts",
+  "main": "src/server/index.ts",
   "author": "thirdweb engineering <eng@thirdweb.com>",
   "type": "module",
   "scripts": {
     "docker": "docker compose --env-file ./.env up --remove-orphans",
     "docker:build": "docker compose build --no-cache",
     "dev": "yarn dev:infra && yarn prisma:setup:dev && (yarn dev:server & yarn dev:worker)",
-    "dev:server": "nodemon --watch 'server/**/*.ts' --watch 'core/**/*.ts' --watch 'src/**/*.ts' --exec 'npx tsx ./server/index.ts' --files server/index.ts",
-    "dev:worker": "nodemon --watch 'src/worker/**/*.ts' --watch 'core/**/*.ts' --watch 'src/**/*.ts' --exec 'npx tsx ./src/worker/index.ts' --files src/worker/index.ts",
+    "dev:server": "nodemon --watch 'src/server/**/*.ts' --watch 'src/**/*.ts' --exec 'npx tsx ./src/server/index.ts' --files src/server/index.ts",
+    "dev:worker": "nodemon --watch 'src/worker/**/*.ts' --watch 'src/**/*.ts' --exec 'npx tsx ./src/worker/index.ts' --files src/worker/index.ts",
     "dev:infra": "docker compose -f ./docker-compose-infra.yml up -d",
     "build": "yarn && rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
     "generate:sdk": "npx tsx ./src/scripts/generate-sdk",
     "prisma:setup:dev": "npx tsx ./src/db/scripts/setup.ts",
-    "prisma:setup:prod": "npx tsx ./dist/src/db/scripts/setup.js",
+    "prisma:setup:prod": "npx tsx ./dist/db/scripts/setup.js",
     "start": "yarn prisma:setup:prod && (yarn start:server & yarn start:worker)",
     "start:server": "node --experimental-specifier-resolution=node ./dist/server/index.js",
-    "start:worker": "node --experimental-specifier-resolution=node ./dist/src/worker/index.js",
+    "start:worker": "node --experimental-specifier-resolution=node ./dist/worker/index.js",
     "start:docker": "docker compose build && docker compose --env-file ./.env up --remove-orphans",
     "docker-build-run": "docker compose build --no-cache && docker compose --env-file ./.env up --remove-orphans",
     "copy-files": "copyfiles ./src/prisma/schema.prisma ./dist/ && copyfiles ./src/prisma/migrations/**/*.sql ./dist/",
-    "lint": "eslint 'server/**/*.ts'",
-    "lint:fix": "eslint --fix 'server/**/*.ts'",
+    "lint": "eslint 'src/**/*.ts'",
+    "lint:fix": "eslint --fix 'src/**/*.ts'",
     "test:load": "npx tsx ./test/load/index.ts",
     "test:load:benchmark": "npx tsx ./test/load/scripts/account.ts"
   },

src/db/permissions/getPermissions.ts

@@ -1,4 +1,4 @@
-import { Permission } from "../../../server/schemas/auth";
+import { Permission } from "../../server/schemas/auth";
 import { env } from "../../utils/env";
 import { prisma } from "../client";
 

src/db/transactions/cleanTxs.ts

@@ -1,6 +1,6 @@
 import { Transactions } from "@prisma/client";
 import { Static } from "@sinclair/typebox";
-import { transactionResponseSchema } from "../../../server/schemas/transaction";
+import { transactionResponseSchema } from "../../server/schemas/transaction";
 
 // TODO: This shouldn't need to exist with zod
 export const cleanTxs = (

src/db/transactions/getAllTxs.ts

@@ -1,11 +1,11 @@
 import { Transactions } from "@prisma/client";
 import { Static } from "@sinclair/typebox";
+import { ContractExtension } from "../../schema/extension";
+import { PrismaTransaction } from "../../schema/prisma";
 import {
   TransactionStatusEnum,
   transactionResponseSchema,
-} from "../../../server/schemas/transaction";
-import { ContractExtension } from "../../schema/extension";
-import { PrismaTransaction } from "../../schema/prisma";
+} from "../../server/schemas/transaction";
 import { getPrismaWithPostgresTx } from "../client";
 import { cleanTxs } from "./cleanTxs";
 

src/db/transactions/getQueuedTxs.ts

@@ -1,6 +1,6 @@
 import { Static } from "@sinclair/typebox";
-import { transactionResponseSchema } from "../../../server/schemas/transaction";
 import { PrismaTransaction } from "../../schema/prisma";
+import { transactionResponseSchema } from "../../server/schemas/transaction";
 import { getPrismaWithPostgresTx } from "../client";
 import { getConfiguration } from "../configuration/getConfiguration";
 import { cleanTxs } from "./cleanTxs";

src/db/transactions/updateTx.ts

@@ -1,6 +1,6 @@
 import { ethers } from "ethers";
-import { TransactionStatusEnum } from "../../../server/schemas/transaction";
 import { PrismaTransaction } from "../../schema/prisma";
+import { TransactionStatusEnum } from "../../server/schemas/transaction";
 import { getPrismaWithPostgresTx } from "../client";
 
 interface UpdateTxParams {

src/db/wallets/createWalletNonce.ts

@@ -1,7 +1,7 @@
 import { ERC4337EthersSigner } from "@thirdweb-dev/wallets/dist/declarations/src/evm/connectors/smart-wallet/lib/erc4337-signer";
 import { BigNumber } from "ethers";
-import { getSdk } from "../../../server/utils/cache/getSdk";
 import { PrismaTransaction } from "../../schema/prisma";
+import { getSdk } from "../../utils/cache/getSdk";
 import { getPrismaWithPostgresTx } from "../client";
 
 interface CreateWalletNonceParams {

src/db/webhooks/createWebhook.ts

@@ -1,6 +1,6 @@
 import { createHash, randomBytes } from "crypto";
-import { webhookCache } from "../../../server/utils/cache/getWebhook";
 import { WebhooksEventTypes } from "../../schema/webhooks";
+import { webhookCache } from "../../utils/cache/getWebhook";
 import { prisma } from "../client";
 
 interface CreateWebhooksParams {

src/db/webhooks/revokeWebhook.ts

@@ -1,6 +1,6 @@
 import { StatusCodes } from "http-status-codes";
-import { createCustomError } from "../../../server/middleware/error";
-import { webhookCache } from "../../../server/utils/cache/getWebhook";
+import { createCustomError } from "../../server/middleware/error";
+import { webhookCache } from "../../utils/cache/getWebhook";
 import { prisma } from "../client";
 
 interface RevokeWebhooksParams {

server/api/auth/access-tokens/create.ts renamed to src/server/api/auth/access-tokens/create.ts

@@ -3,9 +3,9 @@ import { buildJWT } from "@thirdweb-dev/auth";
 import { LocalWallet } from "@thirdweb-dev/wallets";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
-import { createToken } from "../../../../src/db/tokens/createToken";
-import { env } from "../../../../src/utils/env";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
+import { createToken } from "../../../../db/tokens/createToken";
+import { env } from "../../../../utils/env";
 import { AccessTokenSchema } from "./getAll";
 
 const BodySchema = Type.Object({

server/api/auth/access-tokens/getAll.ts renamed to src/server/api/auth/access-tokens/getAll.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getAccessTokens } from "../../../../src/db/tokens/getAccessTokens";
+import { getAccessTokens } from "../../../../db/tokens/getAccessTokens";
 
 export const AccessTokenSchema = Type.Object({
   id: Type.String(),

server/api/auth/access-tokens/revoke.ts renamed to src/server/api/auth/access-tokens/revoke.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { revokeToken } from "../../../../src/db/tokens/revokeToken";
+import { revokeToken } from "../../../../db/tokens/revokeToken";
 
 const BodySchema = Type.Object({
   id: Type.String(),

server/api/auth/permissions/getAll.ts renamed to src/server/api/auth/permissions/getAll.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { prisma } from "../../../../src/db/client";
+import { prisma } from "../../../../db/client";
 
 const ReplySchema = Type.Object({
   result: Type.Array(

server/api/auth/permissions/grant.ts renamed to src/server/api/auth/permissions/grant.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { updatePermissions } from "../../../../src/db/permissions/updatePermissions";
+import { updatePermissions } from "../../../../db/permissions/updatePermissions";
 import { PermissionsSchema } from "../../../schemas/auth";
 
 const BodySchema = Type.Object({

server/api/auth/permissions/revoke.ts renamed to src/server/api/auth/permissions/revoke.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { deletePermissions } from "../../../../src/db/permissions/deletePermissions";
+import { deletePermissions } from "../../../../db/permissions/deletePermissions";
 
 const BodySchema = Type.Object({
   walletAddress: Type.String(),

server/api/backend-wallet/create.ts renamed to src/server/api/backend-wallet/create.ts

@@ -1,8 +1,8 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../src/db/configuration/getConfiguration";
-import { WalletType } from "../../../src/schema/wallet";
+import { getConfiguration } from "../../../db/configuration/getConfiguration";
+import { WalletType } from "../../../schema/wallet";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { createAwsKmsWallet } from "../../utils/wallets/createAwsKmsWallet";
 import { createGcpKmsWallet } from "../../utils/wallets/createGcpKmsWallet";

server/api/backend-wallet/getAll.ts renamed to src/server/api/backend-wallet/getAll.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getAllWallets } from "../../../src/db/wallets/getAllWallets";
+import { getAllWallets } from "../../../db/wallets/getAllWallets";
 import {
   standardResponseSchema,
   walletDetailsSchema,

server/api/backend-wallet/getBalance.ts renamed to src/server/api/backend-wallet/getBalance.ts

@@ -1,12 +1,12 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getSdk } from "../../../utils/cache/getSdk";
 import {
   currencyValueSchema,
   standardResponseSchema,
 } from "../../schemas/sharedApiSchemas";
 import { walletParamSchema } from "../../schemas/wallet";
-import { getSdk } from "../../utils/cache/getSdk";
 import { getChainIdFromChain } from "../../utils/chain";
 
 // INPUTS

server/api/backend-wallet/import.ts renamed to src/server/api/backend-wallet/import.ts

@@ -1,8 +1,8 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../src/db/configuration/getConfiguration";
-import { WalletType } from "../../../src/schema/wallet";
+import { getConfiguration } from "../../../db/configuration/getConfiguration";
+import { WalletType } from "../../../schema/wallet";
 import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
 import { importAwsKmsWallet } from "../../utils/wallets/importAwsKmsWallet";
 import { importGcpKmsWallet } from "../../utils/wallets/importGcpKmsWallet";

server/api/backend-wallet/send.ts renamed to src/server/api/backend-wallet/send.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { prisma } from "../../../src/db/client";
+import { prisma } from "../../../db/client";
 import {
   standardResponseSchema,
   transactionWritesResponseSchema,

server/api/backend-wallet/transfer.ts renamed to src/server/api/backend-wallet/transfer.ts

@@ -7,15 +7,15 @@ import {
 import { constants } from "ethers";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { queueNativeTokenTransferTx } from "../../../src/db/transactions/queueNativeTokenTransferTx";
-import { queueTx } from "../../../src/db/transactions/queueTx";
+import { queueNativeTokenTransferTx } from "../../../db/transactions/queueNativeTokenTransferTx";
+import { queueTx } from "../../../db/transactions/queueTx";
+import { getContract } from "../../../utils/cache/getContract";
+import { getSdk } from "../../../utils/cache/getSdk";
 import {
   standardResponseSchema,
   transactionWritesResponseSchema,
 } from "../../schemas/sharedApiSchemas";
 import { walletAuthSchema, walletParamSchema } from "../../schemas/wallet";
-import { getContract } from "../../utils/cache/getContract";
-import { getSdk } from "../../utils/cache/getSdk";
 import { getChainIdFromChain } from "../../utils/chain";
 
 // INPUTS

server/api/chain/get.ts renamed to src/server/api/chain/get.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
 
 export const ReplySchema = Type.Object({
   result: Type.Object({

server/api/chain/getAll.ts renamed to src/server/api/chain/getAll.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { updateConfiguration } from "../../../../src/db/configuration/updateConfiguration";
+import { updateConfiguration } from "../../../../db/configuration/updateConfiguration";
 import { ReplySchema } from "./get";
 
 export const BodySchema = Type.Object({

server/api/configuration/auth/get.ts renamed to src/server/api/configuration/auth/get.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 
 export const ReplySchema = Type.Object({

server/api/configuration/auth/update.ts renamed to src/server/api/configuration/auth/update.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { updateConfiguration } from "../../../../src/db/configuration/updateConfiguration";
+import { updateConfiguration } from "../../../../db/configuration/updateConfiguration";
 import { standardResponseSchema } from "../../../schemas/sharedApiSchemas";
 import { ReplySchema } from "./get";
 

server/api/configuration/backend-wallet-balance/get.ts renamed to src/server/api/configuration/backend-wallet-balance/get.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
 
 export const ReplySchema = Type.Object({
   result: Type.Union([Type.String(), Type.Null()]),

server/api/configuration/backend-wallet-balance/update.ts renamed to src/server/api/configuration/backend-wallet-balance/update.ts

@@ -1,8 +1,8 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
-import { updateConfiguration } from "../../../../src/db/configuration/updateConfiguration";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
+import { updateConfiguration } from "../../../../db/configuration/updateConfiguration";
 import { ReplySchema } from "./get";
 
 const BodySchema = Type.Object({

server/api/configuration/chains/get.ts renamed to src/server/api/configuration/chains/get.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
 
 export const ReplySchema = Type.Object({
   result: Type.Object({

server/api/configuration/chains/update.ts renamed to src/server/api/configuration/chains/update.ts

@@ -1,7 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { updateConfiguration } from "../../../../src/db/configuration/updateConfiguration";
+import { updateConfiguration } from "../../../../db/configuration/updateConfiguration";
 import { ReplySchema } from "./get";
 
 const BodySchema = Type.Partial(

server/api/configuration/transactions/get.ts renamed to src/server/api/configuration/transactions/get.ts

@@ -1,8 +1,8 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
-import { WalletType } from "../../../../src/schema/wallet";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
+import { WalletType } from "../../../../schema/wallet";
 
 export const ReplySchema = Type.Object({
   result: Type.Union([

server/api/configuration/transactions/update.ts renamed to src/server/api/configuration/transactions/update.ts

@@ -1,9 +1,9 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import { getConfiguration } from "../../../../src/db/configuration/getConfiguration";
-import { updateConfiguration } from "../../../../src/db/configuration/updateConfiguration";
-import { WalletType } from "../../../../src/schema/wallet";
+import { getConfiguration } from "../../../../db/configuration/getConfiguration";
+import { updateConfiguration } from "../../../../db/configuration/updateConfiguration";
+import { WalletType } from "../../../../schema/wallet";
 import { ReplySchema } from "./get";
 
 const BodySchema = Type.Union([

server/api/configuration/wallets/get.ts renamed to src/server/api/configuration/wallets/get.ts

@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getContract } from "../../../../utils/cache/getContract";
 import {
   contractEventSchema,
   eventsQuerystringSchema,
@@ -9,7 +10,6 @@ import {
   contractParamSchema,
   standardResponseSchema,
 } from "../../../schemas/sharedApiSchemas";
-import { getContract } from "../../../utils/cache/getContract";
 import { getChainIdFromChain } from "../../../utils/chain";
 
 const requestSchema = contractParamSchema;

server/api/configuration/wallets/update.ts renamed to src/server/api/configuration/wallets/update.ts

@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getContract } from "../../../../utils/cache/getContract";
 import {
   contractEventSchema,
   eventsQuerystringSchema,
@@ -9,7 +10,6 @@ import {
   contractParamSchema,
   standardResponseSchema,
 } from "../../../schemas/sharedApiSchemas";
-import { getContract } from "../../../utils/cache/getContract";
 import { getChainIdFromChain } from "../../../utils/chain";
 
 const requestSchema = contractParamSchema;

server/api/contract/events/getAllEvents.ts renamed to src/server/api/contract/events/getAllEvents.ts

@@ -1,11 +1,11 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getContract } from "../../../../../../utils/cache/getContract";
 import {
   contractParamSchema,
   standardResponseSchema,
 } from "../../../../../schemas/sharedApiSchemas";
-import { getContract } from "../../../../../utils/cache/getContract";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 const ReplySchema = Type.Object({

server/api/contract/events/getEvents.ts renamed to src/server/api/contract/events/getEvents.ts

@@ -1,12 +1,12 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getContract } from "../../../../../../utils/cache/getContract";
 import { SessionSchema } from "../../../../../schemas/account";
 import {
   contractParamSchema,
   standardResponseSchema,
 } from "../../../../../schemas/sharedApiSchemas";
-import { getContract } from "../../../../../utils/cache/getContract";
 import { getChainIdFromChain } from "../../../../../utils/chain";
 
 const ReplySchema = Type.Object({