resolve comments

Author: moeodeh3

.changeset/rude-signs-like.md

@@ -0,0 +1,5 @@
+---
+"@turnkey/sdk-types": minor
+---
+
+Added `WALLET_CONNECT_INITIALIZATION_ERROR` error code

.changeset/six-laws-see.md

@@ -2,6 +2,7 @@
 "@turnkey/core": minor
 ---
 
+- Fixed `stamp*` methods for query endpoints in `httpClient` incorrectly formatting request body
 - Parallelized stamper and session initialization
 - Separated WalletConnect initialization from client init
 - Optimized `fetchWallet` by reducing redundant queries and running wallet/user fetches in parallel

packages/core/scripts/codegen.js

@@ -369,7 +369,7 @@ const generateSDKClientFromSwagger = async (
     const inputType = `T${operationNameWithoutNamespace}Body`;
     const responseType = `T${operationNameWithoutNamespace}Response`;
 
-    // For query methods
+    // for query methods, we use flat body structure
     if (methodType === "query") {
       codeBuffer.push(
         `\n\t${methodName} = async (input: SdkTypes.${inputType}${
@@ -434,8 +434,38 @@ const generateSDKClientFromSwagger = async (
       VERSIONED_ACTIVITY_TYPES[unversionedActivityType];
 
     // generate a stamping method for each method
-    codeBuffer.push(
-      `\n\tstamp${operationNameWithoutNamespace} = async (input: SdkTypes.${inputType}, stampWith?: StamperType): Promise<TSignedRequest | undefined> => {
+
+    if (methodType === "noop") {
+      // we skip stamp method generation for noop methods
+      continue;
+    } else if (methodType === "query") {
+      // for query methods, we use flat body structure
+      codeBuffer.push(
+        `\n\tstamp${operationNameWithoutNamespace} = async (input: SdkTypes.${inputType}, stampWith?: StamperType): Promise<TSignedRequest | undefined> => {
+    const activeStamper = this.getStamper(stampWith);
+    if (!activeStamper) {
+      return undefined;
+    }
+
+    const fullUrl = this.config.apiBaseUrl + "${endpointPath}";
+    const body = {
+      ...input,
+      organizationId: input.organizationId
+    };
+
+    const stringifiedBody = JSON.stringify(body);
+    const stamp = await activeStamper.stamp(stringifiedBody);
+    return {
+      body: stringifiedBody,
+      stamp: stamp,
+      url: fullUrl,
+    };
+  }`,
+      );
+    } else {
+      // for activity and activityDecision methods, use parameters wrapper and type field
+      codeBuffer.push(
+        `\n\tstamp${operationNameWithoutNamespace} = async (input: SdkTypes.${inputType}, stampWith?: StamperType): Promise<TSignedRequest | undefined> => {
     const activeStamper = this.getStamper(stampWith);
     if (!activeStamper) {
       return undefined;
@@ -454,7 +484,6 @@ const generateSDKClientFromSwagger = async (
       type: "${versionedActivityType ?? unversionedActivityType}"
     };
 
-
     const stringifiedBody = JSON.stringify(bodyWithType);
     const stamp = await activeStamper.stamp(stringifiedBody);
     return {
@@ -463,7 +492,8 @@ const generateSDKClientFromSwagger = async (
       url: fullUrl,
     };
   }`,
-    );
+      );
+    }
   }
 
   for (const endpointPath in authProxySwaggerSpec.paths) {

packages/core/src/__clients__/core.ts

@@ -18,6 +18,8 @@ import {
   type v1CreatePolicyIntentV3,
   type v1BootProof,
   ProxyTSignupResponse,
+  TGetWalletsResponse,
+  TGetUserResponse,
 } from "@turnkey/sdk-types";
 import {
   DEFAULT_SESSION_EXPIRATION_IN_SECONDS,
@@ -1966,11 +1968,22 @@ export class TurnkeyClient {
           | Promise<{ ethereum: string[]; solana: string[] }>
           | undefined;
         if (organizationId && userId && this.walletManager?.connector) {
-          userPromise = this.fetchUser({
-            userId,
-            organizationId,
+          const signedUserRequest = await this.httpClient.stampGetUser(
+            {
+              userId,
+              organizationId,
+            },
             stampWith,
-          }).then(getAuthenticatorAddresses);
+          );
+          if (!signedUserRequest) {
+            throw new TurnkeyError(
+              "Failed to stamp user request",
+              TurnkeyErrorCodes.INVALID_REQUEST,
+            );
+          }
+          userPromise = sendSignedRequest<TGetUserResponse>(
+            signedUserRequest,
+          ).then((response) => getAuthenticatorAddresses(response.user));
         }
 
         // if connectedOnly is true, we skip fetching embedded wallets
@@ -1989,18 +2002,29 @@ export class TurnkeyClient {
             );
           }
 
+          // we stamp the wallet request first
+          // this is done to avoid concurrent passkey prompts
+          const signedWalletsRequest = await this.httpClient.stampGetWallets(
+            {
+              organizationId,
+            },
+            stampWith,
+          );
+
+          if (!signedWalletsRequest) {
+            throw new TurnkeyError(
+              "Failed to stamp wallet request",
+              TurnkeyErrorCodes.INVALID_REQUEST,
+            );
+          }
+
           const [accounts, walletsRes] = await Promise.all([
             fetchAllWalletAccountsWithCursor(
               this.httpClient,
               organizationId,
               stampWith,
             ),
-            this.httpClient.getWallets(
-              {
-                organizationId,
-              },
-              stampWith,
-            ),
+            sendSignedRequest<TGetWalletsResponse>(signedWalletsRequest),
           ]);
 
           // create a map of walletId to EmbeddedWallet for easy lookup
@@ -2726,7 +2750,7 @@ export class TurnkeyClient {
           );
         }
 
-        return userResponse.user as v1User;
+        return userResponse.user;
       },
       {
         errorMessage: "Failed to fetch user",