@turnkey/core 1.8.3 → 1.10.0

package/dist/__generated__/sdk-client-base.mjs

@@ -21,10 +21,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_activity";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -48,10 +51,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_api_key";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -75,10 +81,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_api_keys";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -102,10 +111,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_attestation";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -129,10 +141,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_authenticator";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -156,10 +171,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_authenticators";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -183,10 +201,43 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_boot_proof";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
+            };
+            const stringifiedBody = JSON.stringify(body);
+            const stamp = await activeStamper.stamp(stringifiedBody);
+            return {
+                body: stringifiedBody,
+                stamp: stamp,
+                url: fullUrl,
+            };
+        };
+        this.getGasUsage = async (input, stampWith) => {
+            const session = await this.storageManager?.getActiveSession();
+            return this.request("/public/v1/query/get_gas_usage", {
+                ...input,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
+            }, stampWith);
+        };
+        this.stampGetGasUsage = async (input, stampWith) => {
+            const activeStamper = this.getStamper(stampWith);
+            if (!activeStamper) {
+                return undefined;
+            }
+            const session = await this.storageManager?.getActiveSession();
+            const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_gas_usage";
+            const body = {
+                ...input,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -210,10 +261,43 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_latest_boot_proof";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
+            };
+            const stringifiedBody = JSON.stringify(body);
+            const stamp = await activeStamper.stamp(stringifiedBody);
+            return {
+                body: stringifiedBody,
+                stamp: stamp,
+                url: fullUrl,
+            };
+        };
+        this.getNonces = async (input, stampWith) => {
+            const session = await this.storageManager?.getActiveSession();
+            return this.request("/public/v1/query/get_nonces", {
+                ...input,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
+            }, stampWith);
+        };
+        this.stampGetNonces = async (input, stampWith) => {
+            const activeStamper = this.getStamper(stampWith);
+            if (!activeStamper) {
+                return undefined;
+            }
+            const session = await this.storageManager?.getActiveSession();
+            const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_nonces";
+            const body = {
+                ...input,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -237,10 +321,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_oauth2_credential";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -264,10 +351,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_oauth_providers";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -291,10 +381,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_onramp_transaction_status";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -318,10 +411,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_organization";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -345,10 +441,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_organization_configs";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -372,10 +471,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_policy";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -399,10 +501,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_policy_evaluations";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -426,10 +531,43 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_private_key";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
+            };
+            const stringifiedBody = JSON.stringify(body);
+            const stamp = await activeStamper.stamp(stringifiedBody);
+            return {
+                body: stringifiedBody,
+                stamp: stamp,
+                url: fullUrl,
+            };
+        };
+        this.getSendTransactionStatus = async (input, stampWith) => {
+            const session = await this.storageManager?.getActiveSession();
+            return this.request("/public/v1/query/get_send_transaction_status", {
+                ...input,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
+            }, stampWith);
+        };
+        this.stampGetSendTransactionStatus = async (input, stampWith) => {
+            const activeStamper = this.getStamper(stampWith);
+            if (!activeStamper) {
+                return undefined;
+            }
+            const session = await this.storageManager?.getActiveSession();
+            const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_send_transaction_status";
+            const body = {
+                ...input,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -453,10 +591,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_smart_contract_interface";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -480,10 +621,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_user";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -507,10 +651,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_wallet";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -534,10 +681,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/get_wallet_account";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -561,10 +711,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_activities";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -588,10 +741,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_app_proofs";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -615,10 +771,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_fiat_on_ramp_credentials";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -642,10 +801,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_oauth2_credentials";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -669,10 +831,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_policies";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -696,10 +861,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_private_key_tags";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -723,10 +891,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_private_keys";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -750,11 +921,14 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl +
                 "/public/v1/query/list_smart_contract_interfaces";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -778,10 +952,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_suborgs";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -805,10 +982,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_user_tags";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -832,10 +1012,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_users";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -859,10 +1042,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_verified_suborgs";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -886,10 +1072,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_wallet_accounts";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -913,10 +1102,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/list_wallets";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -940,10 +1132,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/query/whoami";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -971,10 +1166,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/approve_activity";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_APPROVE_ACTIVITY",
             };
@@ -1004,10 +1200,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_api_keys";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_API_KEYS_V2",
             };
@@ -1037,10 +1234,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_api_only_users";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_API_ONLY_USERS",
             };
@@ -1070,10 +1268,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_authenticators";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_AUTHENTICATORS_V2",
             };
@@ -1103,11 +1302,12 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl +
                 "/public/v1/submit/create_fiat_on_ramp_credential";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_FIAT_ON_RAMP_CREDENTIAL",
             };
@@ -1137,10 +1337,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_invitations";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_INVITATIONS",
             };
@@ -1170,10 +1371,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_oauth2_credential";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_OAUTH2CREDENTIAL",
             };
@@ -1203,10 +1405,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_oauth_providers";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_OAUTH_PROVIDERS",
             };
@@ -1236,10 +1439,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_policies";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_POLICIES",
             };
@@ -1269,10 +1473,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_policy";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_POLICY_V3",
             };
@@ -1302,10 +1507,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_private_key_tag";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_PRIVATE_KEY_TAG",
             };
@@ -1335,10 +1541,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_private_keys";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_PRIVATE_KEYS_V2",
             };
@@ -1368,10 +1575,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_read_only_session";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_READ_ONLY_SESSION",
             };
@@ -1401,10 +1609,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_read_write_session";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_READ_WRITE_SESSION_V2",
             };
@@ -1434,11 +1643,12 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl +
                 "/public/v1/submit/create_smart_contract_interface";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_SMART_CONTRACT_INTERFACE",
             };
@@ -1468,10 +1678,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_sub_organization";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V7",
             };
@@ -1501,10 +1712,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_user_tag";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_USER_TAG",
             };
@@ -1534,10 +1746,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_users";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_USERS_V3",
             };
@@ -1567,10 +1780,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_wallet";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_WALLET",
             };
@@ -1600,10 +1814,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/create_wallet_accounts";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_WALLET_ACCOUNTS",
             };
@@ -1633,10 +1848,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_api_keys";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_API_KEYS",
             };
@@ -1666,10 +1882,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_authenticators";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_AUTHENTICATORS",
             };
@@ -1699,11 +1916,12 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl +
                 "/public/v1/submit/delete_fiat_on_ramp_credential";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_FIAT_ON_RAMP_CREDENTIAL",
             };
@@ -1733,10 +1951,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_invitation";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_INVITATION",
             };
@@ -1766,10 +1985,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_oauth2_credential";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_OAUTH2CREDENTIAL",
             };
@@ -1799,10 +2019,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_oauth_providers";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_OAUTH_PROVIDERS",
             };
@@ -1832,10 +2053,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_policies";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_POLICIES",
             };
@@ -1865,10 +2087,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_policy";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_POLICY",
             };
@@ -1898,10 +2121,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_private_key_tags";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_PRIVATE_KEY_TAGS",
             };
@@ -1931,10 +2155,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_private_keys";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_PRIVATE_KEYS",
             };
@@ -1964,11 +2189,12 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl +
                 "/public/v1/submit/delete_smart_contract_interface";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_SMART_CONTRACT_INTERFACE",
             };
@@ -1998,10 +2224,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_sub_organization";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_SUB_ORGANIZATION",
             };
@@ -2031,10 +2258,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_user_tags";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_USER_TAGS",
             };
@@ -2064,10 +2292,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_users";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_USERS",
             };
@@ -2097,10 +2326,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_wallet_accounts";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_WALLET_ACCOUNTS",
             };
@@ -2130,10 +2360,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/delete_wallets";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_WALLETS",
             };
@@ -2154,7 +2385,7 @@ class TurnkeySDKClientBase {
                     session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_EMAIL_AUTH_V2",
+                type: "ACTIVITY_TYPE_EMAIL_AUTH_V3",
             }, "emailAuthResult", stampWith);
         };
         this.stampEmailAuth = async (input, stampWith) => {
@@ -2163,12 +2394,13 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/email_auth";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_EMAIL_AUTH_V2",
+                type: "ACTIVITY_TYPE_EMAIL_AUTH_V3",
             };
             const stringifiedBody = JSON.stringify(bodyWithType);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -2196,10 +2428,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/eth_send_raw_transaction";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_ETH_SEND_RAW_TRANSACTION",
             };
@@ -2229,10 +2462,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/eth_send_transaction";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_ETH_SEND_TRANSACTION",
             };
@@ -2262,10 +2496,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/export_private_key";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EXPORT_PRIVATE_KEY",
             };
@@ -2295,10 +2530,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/export_wallet";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EXPORT_WALLET",
             };
@@ -2328,10 +2564,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/export_wallet_account";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EXPORT_WALLET_ACCOUNT",
             };
@@ -2361,10 +2598,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/import_private_key";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_IMPORT_PRIVATE_KEY",
             };
@@ -2394,10 +2632,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/import_wallet";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_IMPORT_WALLET",
             };
@@ -2427,10 +2666,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/init_fiat_on_ramp";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_FIAT_ON_RAMP",
             };
@@ -2460,10 +2700,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/init_import_private_key";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_IMPORT_PRIVATE_KEY",
             };
@@ -2493,10 +2734,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/init_import_wallet";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_IMPORT_WALLET",
             };
@@ -2517,7 +2759,7 @@ class TurnkeySDKClientBase {
                     session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_INIT_OTP",
+                type: "ACTIVITY_TYPE_INIT_OTP_V2",
             }, "initOtpResult", stampWith);
         };
         this.stampInitOtp = async (input, stampWith) => {
@@ -2526,12 +2768,13 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/init_otp";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_INIT_OTP",
+                type: "ACTIVITY_TYPE_INIT_OTP_V2",
             };
             const stringifiedBody = JSON.stringify(bodyWithType);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -2550,7 +2793,7 @@ class TurnkeySDKClientBase {
                     session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_INIT_OTP_AUTH_V2",
+                type: "ACTIVITY_TYPE_INIT_OTP_AUTH_V3",
             }, "initOtpAuthResult", stampWith);
         };
         this.stampInitOtpAuth = async (input, stampWith) => {
@@ -2559,12 +2802,13 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/init_otp_auth";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_INIT_OTP_AUTH_V2",
+                type: "ACTIVITY_TYPE_INIT_OTP_AUTH_V3",
             };
             const stringifiedBody = JSON.stringify(bodyWithType);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -2583,7 +2827,7 @@ class TurnkeySDKClientBase {
                     session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_INIT_USER_EMAIL_RECOVERY",
+                type: "ACTIVITY_TYPE_INIT_USER_EMAIL_RECOVERY_V2",
             }, "initUserEmailRecoveryResult", stampWith);
         };
         this.stampInitUserEmailRecovery = async (input, stampWith) => {
@@ -2592,12 +2836,13 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/init_user_email_recovery";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
-                type: "ACTIVITY_TYPE_INIT_USER_EMAIL_RECOVERY",
+                type: "ACTIVITY_TYPE_INIT_USER_EMAIL_RECOVERY_V2",
             };
             const stringifiedBody = JSON.stringify(bodyWithType);
             const stamp = await activeStamper.stamp(stringifiedBody);
@@ -2625,10 +2870,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/oauth";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OAUTH",
             };
@@ -2658,10 +2904,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/oauth2_authenticate";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OAUTH2AUTHENTICATE",
             };
@@ -2691,10 +2938,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/oauth_login";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OAUTH_LOGIN",
             };
@@ -2724,10 +2972,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/otp_auth";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OTP_AUTH",
             };
@@ -2757,10 +3006,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/otp_login";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OTP_LOGIN",
             };
@@ -2790,10 +3040,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/recover_user";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_RECOVER_USER",
             };
@@ -2823,10 +3074,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/reject_activity";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_REJECT_ACTIVITY",
             };
@@ -2856,10 +3108,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/remove_organization_feature";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_REMOVE_ORGANIZATION_FEATURE",
             };
@@ -2889,10 +3142,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/set_organization_feature";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SET_ORGANIZATION_FEATURE",
             };
@@ -2922,10 +3176,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/sign_raw_payload";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
             };
@@ -2955,10 +3210,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/sign_raw_payloads";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOADS",
             };
@@ -2988,10 +3244,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/sign_transaction";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SIGN_TRANSACTION_V2",
             };
@@ -3021,10 +3278,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/stamp_login";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_STAMP_LOGIN",
             };
@@ -3054,11 +3312,12 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl +
                 "/public/v1/submit/update_fiat_on_ramp_credential";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_FIAT_ON_RAMP_CREDENTIAL",
             };
@@ -3088,10 +3347,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_oauth2_credential";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_OAUTH2CREDENTIAL",
             };
@@ -3121,10 +3381,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_policy";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_POLICY_V2",
             };
@@ -3154,10 +3415,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_private_key_tag";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_PRIVATE_KEY_TAG",
             };
@@ -3187,10 +3449,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_root_quorum";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_ROOT_QUORUM",
             };
@@ -3220,10 +3483,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_user";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER",
             };
@@ -3253,10 +3517,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_user_email";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER_EMAIL",
             };
@@ -3286,10 +3551,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_user_name";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER_NAME",
             };
@@ -3319,10 +3585,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_user_phone_number";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER_PHONE_NUMBER",
             };
@@ -3352,10 +3619,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_user_tag";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER_TAG",
             };
@@ -3385,10 +3653,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/update_wallet";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_WALLET",
             };
@@ -3418,10 +3687,11 @@ class TurnkeySDKClientBase {
                 return undefined;
             }
             const { organizationId, timestampMs, ...parameters } = input;
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/public/v1/submit/verify_otp";
             const bodyWithType = {
                 parameters,
-                organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_VERIFY_OTP",
             };
@@ -3447,10 +3717,13 @@ class TurnkeySDKClientBase {
             if (!activeStamper) {
                 return undefined;
             }
+            const session = await this.storageManager?.getActiveSession();
             const fullUrl = this.config.apiBaseUrl + "/tkhq/api/v1/test_rate_limits";
             const body = {
                 ...input,
-                organizationId: input.organizationId,
+                organizationId: input.organizationId ??
+                    session?.organizationId ??
+                    this.config.organizationId,
             };
             const stringifiedBody = JSON.stringify(body);
             const stamp = await activeStamper.stamp(stringifiedBody);