api: pull backendwallet from request body

TreasureProject · Sep 17, 2024 · 56d054b · 56d054b
1 parent d82e0cd
commit 56d054b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/apps/api/src/middleware/auth.ts b/apps/api/src/middleware/auth.ts
@@ -10,21 +10,18 @@ declare module "fastify" {
   interface FastifyRequest {
     userId: string | undefined;
     userAddress: AddressString | undefined;
-    backendWallet: AddressString;
+    backendWallet: AddressString | undefined;
     authError: string | undefined;
   }
 }
 
 export const withAuth = async (
   app: FastifyInstance,
-  { auth, thirdwebAuth, env }: TdkApiContext,
+  { auth, thirdwebAuth }: TdkApiContext,
 ) => {
   app.decorateRequest("userId", undefined);
   app.decorateRequest("userAddress", undefined);
-  app.decorateRequest(
-    "backendWallet",
-    env.DEFAULT_BACKEND_WALLET as AddressString,
-  );
+  app.decorateRequest("backendWallet", undefined);
   app.decorateRequest("authError", undefined);
   app.addHook("onRequest", async (req) => {
     // Check for explicit setting of user address and recover backend wallet address from signature
@@ -53,18 +50,6 @@ export const withAuth = async (
       return;
     }
 
-    // Fall back to backend wallet from params
-    const backendWallet =
-      req.params &&
-      typeof req.params === "object" &&
-      "backendWallet" in req.params
-        ? req.params.backendWallet
-        : undefined;
-    // TODO: Remove default backend wallet when all partners upgrade to their own
-    req.backendWallet = isHex(backendWallet)
-      ? backendWallet
-      : (env.DEFAULT_BACKEND_WALLET as AddressString);
-
     // All other auth methods require an Authorization header
     if (!req.headers.authorization) {
       return;

diff --git a/apps/api/src/routes/magicswap.ts b/apps/api/src/routes/magicswap.ts
@@ -186,6 +186,7 @@ export const magicswapRoutes =
           nftsOut,
           isExactOut,
           slippage,
+          backendWallet = env.DEFAULT_BACKEND_WALLET,
           simulateTransaction = env.ENGINE_TRANSACTION_SIMULATION_ENABLED,
         } = body;
 
@@ -244,7 +245,7 @@ export const magicswapRoutes =
             engine,
             chainId,
             contractAddress: swapArguments.address,
-            backendWallet: req.backendWallet,
+            backendWallet: req.backendWallet ?? backendWallet,
             smartAccountAddress: userAddress,
             abi: magicswapV2RouterAbi,
             functionName: swapArguments.functionName,
@@ -302,6 +303,7 @@ export const magicswapRoutes =
           amount1Min,
           nfts0,
           nfts1,
+          backendWallet = env.DEFAULT_BACKEND_WALLET,
           simulateTransaction = env.ENGINE_TRANSACTION_SIMULATION_ENABLED,
         } = body;
 
@@ -339,7 +341,7 @@ export const magicswapRoutes =
             engine,
             chainId,
             contractAddress: addLiquidityArgs.address,
-            backendWallet: req.backendWallet,
+            backendWallet: req.backendWallet ?? backendWallet,
             smartAccountAddress: userAddress,
             abi: magicswapV2RouterAbi,
             functionName: addLiquidityArgs.functionName,
@@ -397,6 +399,7 @@ export const magicswapRoutes =
           nfts0,
           nfts1,
           swapLeftover = true,
+          backendWallet = env.DEFAULT_BACKEND_WALLET,
           simulateTransaction = env.ENGINE_TRANSACTION_SIMULATION_ENABLED,
         } = body;
 
@@ -434,7 +437,7 @@ export const magicswapRoutes =
             engine,
             chainId,
             contractAddress: removeLiquidityArgs.address,
-            backendWallet: req.backendWallet,
+            backendWallet: req.backendWallet ?? backendWallet,
             smartAccountAddress: userAddress,
             abi: magicswapV2RouterAbi,
             functionName: removeLiquidityArgs.functionName,

diff --git a/apps/api/src/routes/transactions.ts b/apps/api/src/routes/transactions.ts
@@ -71,6 +71,7 @@ export const transactionsRoutes =
             functionName,
             args,
             txOverrides,
+            backendWallet = env.DEFAULT_BACKEND_WALLET,
             simulateTransaction = env.ENGINE_TRANSACTION_SIMULATION_ENABLED,
           },
         } = req;
@@ -108,7 +109,7 @@ export const transactionsRoutes =
           const { result } = await engine.contract.write(
             chainId.toString(),
             address,
-            req.backendWallet,
+            req.backendWallet ?? backendWallet,
             {
               abi: transactionAbi,
               functionName,
@@ -160,6 +161,7 @@ export const transactionsRoutes =
             value = "0x00",
             data,
             txOverrides,
+            backendWallet = env.DEFAULT_BACKEND_WALLET,
             simulateTransaction = env.ENGINE_TRANSACTION_SIMULATION_ENABLED,
           },
         } = req;
@@ -176,7 +178,7 @@ export const transactionsRoutes =
           Sentry.setExtra("transaction", { to, value, data });
           const { result } = await engine.backendWallet.sendTransaction(
             chainId.toString(),
-            req.backendWallet,
+            req.backendWallet ?? backendWallet,
             {
               toAddress: to,
               value: value,