@turnkey/core 1.8.3 → 1.10.0

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

@@ -23,10 +23,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);
@@ -50,10 +53,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);
@@ -77,10 +83,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);
@@ -104,10 +113,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);
@@ -131,10 +143,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);
@@ -158,10 +173,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);
@@ -185,10 +203,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);
@@ -212,10 +263,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);
@@ -239,10 +323,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);
@@ -266,10 +353,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);
@@ -293,10 +383,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);
@@ -320,10 +413,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);
@@ -347,10 +443,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);
@@ -374,10 +473,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);
@@ -401,10 +503,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);
@@ -428,10 +533,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);
@@ -455,10 +593,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);
@@ -482,10 +623,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);
@@ -509,10 +653,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);
@@ -536,10 +683,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);
@@ -563,10 +713,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);
@@ -590,10 +743,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);
@@ -617,10 +773,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);
@@ -644,10 +803,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);
@@ -671,10 +833,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);
@@ -698,10 +863,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);
@@ -725,10 +893,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);
@@ -752,11 +923,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);
@@ -780,10 +954,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);
@@ -807,10 +984,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);
@@ -834,10 +1014,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);
@@ -861,10 +1044,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);
@@ -888,10 +1074,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);
@@ -915,10 +1104,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);
@@ -942,10 +1134,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);
@@ -973,10 +1168,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",
             };
@@ -1006,10 +1202,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",
             };
@@ -1039,10 +1236,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",
             };
@@ -1072,10 +1270,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",
             };
@@ -1105,11 +1304,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",
             };
@@ -1139,10 +1339,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",
             };
@@ -1172,10 +1373,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",
             };
@@ -1205,10 +1407,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",
             };
@@ -1238,10 +1441,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",
             };
@@ -1271,10 +1475,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",
             };
@@ -1304,10 +1509,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",
             };
@@ -1337,10 +1543,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",
             };
@@ -1370,10 +1577,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",
             };
@@ -1403,10 +1611,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",
             };
@@ -1436,11 +1645,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",
             };
@@ -1470,10 +1680,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",
             };
@@ -1503,10 +1714,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",
             };
@@ -1536,10 +1748,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",
             };
@@ -1569,10 +1782,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",
             };
@@ -1602,10 +1816,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",
             };
@@ -1635,10 +1850,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",
             };
@@ -1668,10 +1884,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",
             };
@@ -1701,11 +1918,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",
             };
@@ -1735,10 +1953,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",
             };
@@ -1768,10 +1987,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",
             };
@@ -1801,10 +2021,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",
             };
@@ -1834,10 +2055,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",
             };
@@ -1867,10 +2089,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",
             };
@@ -1900,10 +2123,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",
             };
@@ -1933,10 +2157,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",
             };
@@ -1966,11 +2191,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",
             };
@@ -2000,10 +2226,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",
             };
@@ -2033,10 +2260,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",
             };
@@ -2066,10 +2294,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",
             };
@@ -2099,10 +2328,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",
             };
@@ -2132,10 +2362,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",
             };
@@ -2156,7 +2387,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) => {
@@ -2165,12 +2396,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);
@@ -2198,10 +2430,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",
             };
@@ -2231,10 +2464,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",
             };
@@ -2264,10 +2498,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",
             };
@@ -2297,10 +2532,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",
             };
@@ -2330,10 +2566,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",
             };
@@ -2363,10 +2600,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",
             };
@@ -2396,10 +2634,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",
             };
@@ -2429,10 +2668,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",
             };
@@ -2462,10 +2702,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",
             };
@@ -2495,10 +2736,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",
             };
@@ -2519,7 +2761,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) => {
@@ -2528,12 +2770,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);
@@ -2552,7 +2795,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) => {
@@ -2561,12 +2804,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);
@@ -2585,7 +2829,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) => {
@@ -2594,12 +2838,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);
@@ -2627,10 +2872,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",
             };
@@ -2660,10 +2906,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",
             };
@@ -2693,10 +2940,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",
             };
@@ -2726,10 +2974,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",
             };
@@ -2759,10 +3008,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",
             };
@@ -2792,10 +3042,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",
             };
@@ -2825,10 +3076,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",
             };
@@ -2858,10 +3110,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",
             };
@@ -2891,10 +3144,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",
             };
@@ -2924,10 +3178,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",
             };
@@ -2957,10 +3212,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",
             };
@@ -2990,10 +3246,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",
             };
@@ -3023,10 +3280,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",
             };
@@ -3056,11 +3314,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",
             };
@@ -3090,10 +3349,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",
             };
@@ -3123,10 +3383,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",
             };
@@ -3156,10 +3417,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",
             };
@@ -3189,10 +3451,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",
             };
@@ -3222,10 +3485,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",
             };
@@ -3255,10 +3519,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",
             };
@@ -3288,10 +3553,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",
             };
@@ -3321,10 +3587,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",
             };
@@ -3354,10 +3621,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",
             };
@@ -3387,10 +3655,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",
             };
@@ -3420,10 +3689,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",
             };
@@ -3449,10 +3719,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);