thirdweb 5.90.3 → 5.91.0

package/src/wallets/in-app/native/ecosystem.ts

@@ -83,6 +83,7 @@ export function ecosystemWallet(
       return new InAppNativeConnector({
         client,
         ecosystem,
+        storage: createOptions?.storage,
         // TODO (enclave): passkeyDomain for ecosystem wallets
       });
     },

package/src/wallets/in-app/native/in-app.ts

@@ -65,6 +65,7 @@ export function inAppWallet(
       return new InAppNativeConnector({
         client,
         passkeyDomain: createOptions?.auth?.passkeyDomain,
+        storage: createOptions?.storage,
       });
     },
   }) as Wallet<"inApp">;

package/src/wallets/in-app/native/native-connector.ts

@@ -1,5 +1,6 @@
 import type { ThirdwebClient } from "../../../client/client.js";
 import { stringify } from "../../../utils/json.js";
+import type { AsyncStorage } from "../../../utils/storage/AsyncStorage.js";
 import { nativeLocalStorage } from "../../../utils/storage/nativeStorage.js";
 import type { Account } from "../../interfaces/wallet.js";
 import { getUserStatus } from "../core/actions/get-enclave-user-status.js";
@@ -37,11 +38,11 @@ import { sendOtp, verifyOtp } from "../web/lib/auth/otp.js";
 import { deleteActiveAccount, socialAuth } from "./auth/native-auth.js";
 import { logoutUser } from "./helpers/auth/logout.js";
 import { ShardedWallet } from "./helpers/wallet/sharded-wallet.js";
-
 type NativeConnectorOptions = {
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
   passkeyDomain?: string;
+  storage?: AsyncStorage;
 };
 
 export class InAppNativeConnector implements InAppConnector {
@@ -56,7 +57,7 @@ export class InAppNativeConnector implements InAppConnector {
     this.passkeyDomain = options.passkeyDomain;
     this.ecosystem = options.ecosystem;
     this.storage = new ClientScopedStorage({
-      storage: nativeLocalStorage,
+      storage: options.storage ?? nativeLocalStorage,
       clientId: this.client.clientId,
       ecosystem: options.ecosystem,
     });

package/src/wallets/in-app/web/ecosystem.ts

@@ -73,6 +73,7 @@ export function ecosystemWallet(
       return new InAppWebConnector({
         client,
         ecosystem,
+        storage: createOptions?.storage,
       });
     },
   }) as Wallet<EcosystemWalletId>;

package/src/wallets/in-app/web/in-app.ts

@@ -222,6 +222,31 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  * });
  * ```
  *
+ * ### Override storage for the wallet state
+ *
+ * By default, wallet state is stored in the browser's local storage. You can override this behavior by providing a custom storage object, useful for server side integrations.
+ *
+ * ```ts
+ * import { inAppWallet } from "thirdweb/wallets";
+ * import { AsyncStorage } from "thirdweb/storage";
+ *
+ * const myStorage: AsyncStorage = {
+ *  getItem: async (key) => {
+ *    return customGet(`CUSTOM_STORAGE_KEY${key}`);
+ *  },
+ *  setItem: async (key, value) => {
+ *    return customSet(`CUSTOM_STORAGE_KEY${key}`, value);
+ *  },
+ *  removeItem: async (key) => {
+ *    return customRemove(`CUSTOM_STORAGE_KEY${key}`);
+ *  },
+ * };
+ *
+ * const wallet = inAppWallet({
+ *  storage: myStorage,
+ * });
+ * ```
+ *
  * @returns The created in-app wallet.
  * @wallet
  */
@@ -235,6 +260,7 @@ export function inAppWallet(
       return new InAppWebConnector({
         client,
         passkeyDomain: createOptions?.auth?.passkeyDomain,
+        storage: createOptions?.storage,
       });
     },
   }) as Wallet<"inApp">;

package/src/wallets/in-app/web/lib/auth/passkeys.ts

@@ -1,5 +1,6 @@
 import { client, parsers } from "@passwordless-id/webauthn";
 import type { ThirdwebClient } from "../../../../../client/client.js";
+import type { AsyncStorage } from "../../../../../utils/storage/AsyncStorage.js";
 import { webLocalStorage } from "../../../../../utils/storage/webStorage.js";
 import {
   base64ToString,
@@ -83,12 +84,13 @@ export class PasskeyWebClient implements PasskeyClient {
 export async function hasStoredPasskey(
   client: ThirdwebClient,
   ecosystemId?: EcosystemWalletId,
+  storage?: AsyncStorage,
 ) {
-  const storage = new ClientScopedStorage({
-    storage: webLocalStorage, // TODO (passkey) react native variant of this fn
+  const clientStorage = new ClientScopedStorage({
+    storage: storage ?? webLocalStorage, // TODO (passkey) react native variant of this fn
     clientId: client.clientId,
     ecosystem: ecosystemId ? { id: ecosystemId } : undefined,
   });
-  const credId = await storage.getPasskeyCredentialId();
+  const credId = await clientStorage.getPasskeyCredentialId();
   return !!credId;
 }

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -74,6 +74,7 @@ export class InAppWebConnector implements InAppConnector {
     onAuthSuccess,
     ecosystem,
     passkeyDomain,
+    storage,
   }: InAppWalletConstructorType) {
     if (this.isClientIdLegacyPaper(client.clientId)) {
       throw new Error(
@@ -85,7 +86,7 @@ export class InAppWebConnector implements InAppConnector {
     this.ecosystem = ecosystem;
     this.passkeyDomain = passkeyDomain;
     this.storage = new ClientScopedStorage({
-      storage: webLocalStorage,
+      storage: storage ?? webLocalStorage,
       clientId: client.clientId,
       ecosystem: ecosystem,
     });

package/src/wallets/in-app/web/types.ts

@@ -2,11 +2,11 @@
 // types for class constructors still a little messy right now.
 
 import type { ThirdwebClient } from "../../../client/client.js";
+import type { AsyncStorage } from "../../../utils/storage/AsyncStorage.js";
 import type { AuthAndWalletRpcReturnType } from "../core/authentication/types.js";
 import type { Ecosystem } from "../core/wallet/types.js";
 import type { InAppWalletIframeCommunicator } from "./utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
 
-// Open to PRs from whoever sees this and knows of a cleaner way to handle things
 type ClientIdConstructorType = {
   /**
    * the clientId of your API Key. You can create an API key by creating a project on thirdweb dashboard.
@@ -29,6 +29,11 @@ export type InAppWalletConstructorType = ClientIdConstructorType & {
    * The domain of the passkey to use for authentication
    */
   passkeyDomain?: string;
+
+  /**
+   * The storage to use for storing wallet state
+   */
+  storage?: AsyncStorage;
 };
 
 export type ClientIdWithQuerierType = ClientIdConstructorType & {

package/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -8,8 +8,8 @@ import { parseEventLogs } from "../../event/actions/parse-logs.js";
 import { TEST_WALLET_A } from "~test/addresses.js";
 import { verifyEip1271Signature } from "../../auth/verify-hash.js";
 import { verifyTypedData } from "../../auth/verify-typed-data.js";
+import { arbitrumSepolia } from "../../chains/chain-definitions/arbitrum-sepolia.js";
 import { baseSepolia } from "../../chains/chain-definitions/base-sepolia.js";
-import { sepolia } from "../../chains/chain-definitions/sepolia.js";
 import {
   addAdmin,
   adminUpdatedEvent,
@@ -41,12 +41,12 @@ let smartWalletAddress: string;
 let personalAccount: Account;
 let accountContract: ThirdwebContract;
 
-const chain = sepolia;
+const chain = arbitrumSepolia;
 const client = TEST_CLIENT;
 const contract = getContract({
   client,
   chain,
-  address: "0xe2cb0eb5147b42095c2FfA6F7ec953bb0bE347D8",
+  address: "0x6A7a26c9a595E6893C255C9dF0b593e77518e0c3",
 });
 
 describe.runIf(process.env.TW_SECRET_KEY).sequential(
@@ -132,6 +132,8 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
       await new Promise((resolve) => setTimeout(resolve, 3000)); // pause for a second to prevent race condition
 
+      expect(await isContractDeployed(accountContract)).toEqual(true);
+
       const signature = await smartAccount.signMessage({
         message: "hello world",
       });
@@ -201,10 +203,10 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
 
       await expect(tx).rejects.toMatchInlineSnapshot(`
-        [TransactionError: Execution Reverted: {"code":3,"message":"execution reverted: Not authorized"}
+        [TransactionError: Error - Not authorized
 
         contract: ${contract.address}
-        chainId: 11155111]
+        chainId: 421614]
       `);
     });