Merge branch 'main' into yash/deploy-config-updates

kumaryash90 · web-flow · commit bf67f7475399 · 2025-02-11T17:04:43.000+05:30
diff --git a/.changeset/cool-pumpkins-punch.md b/.changeset/cool-pumpkins-punch.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Dont retry on quote errors, show fiat value in every step
diff --git a/.changeset/good-carpets-dream.md b/.changeset/good-carpets-dream.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Handle updating session keys with new params and expose `shouldUpdateSessionKey` from `extensions/erc4337`
diff --git a/.changeset/many-cameras-cover.md b/.changeset/many-cameras-cover.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Add treasure and treasureTopaz chain definitions
diff --git a/apps/dashboard/src/@/api/team.ts b/apps/dashboard/src/@/api/team.ts
@@ -24,6 +24,7 @@ export type Team = {
   image?: string;
   billingPlan: "pro" | "growth" | "free" | "starter";
   billingStatus: "validPayment" | (string & {}) | null;
+  supportPlan: "pro" | "growth" | "free" | "starter";
   billingEmail: string | null;
   growthTrialEligible: false;
   enabledScopes: EnabledTeamScope[];
diff --git a/apps/dashboard/src/app/(dashboard)/support/create-ticket/components/create-ticket.action.ts b/apps/dashboard/src/app/(dashboard)/support/create-ticket/components/create-ticket.action.ts
@@ -98,9 +98,10 @@ export async function createTicketAction(
     loginRedirect("/support");
   }
 
-  const customerId = isValidPlan(team.billingPlan)
-    ? planToCustomerId[team.billingPlan]
-    : undefined;
+  const customerId = isValidPlan(team.supportPlan)
+    ? planToCustomerId[team.supportPlan]
+    : // fallback to "free" tier
+      planToCustomerId.free;
 
   const product = formData.get("product")?.toString() || "";
   const problemArea = formData.get("extraInfo_Problem_Area")?.toString() || "";
diff --git a/apps/dashboard/src/app/(landing)/in-app-wallets/page.tsx b/apps/dashboard/src/app/(landing)/in-app-wallets/page.tsx
@@ -14,7 +14,6 @@ import analyticsImage from "../../../../public/assets/landingpage/desktop/analyt
 import authDesktopImage from "../../../../public/assets/landingpage/desktop/auth.png";
 import crossPlatformDesktopImage from "../../../../public/assets/landingpage/desktop/cross-platform.png";
 import enterpriseSecurityImage from "../../../../public/assets/landingpage/desktop/enterprise-security.png";
-import guestImage from "../../../../public/assets/landingpage/desktop/guest.png";
 import magicImage from "../../../../public/assets/landingpage/desktop/magic.png";
 import onboardImage from "../../../../public/assets/landingpage/desktop/onboard.png";
 import powerfulImage from "../../../../public/assets/landingpage/desktop/powerful.png";
@@ -24,7 +23,6 @@ import analyticsMobileImage from "../../../../public/assets/landingpage/mobile/a
 import authMobileImage from "../../../../public/assets/landingpage/mobile/auth.png";
 import crossPlatformMobileImage from "../../../../public/assets/landingpage/mobile/cross-platform.png";
 import enterpriseSecurityMobileImage from "../../../../public/assets/landingpage/mobile/enterprise-security.png";
-import guestMobileImage from "../../../../public/assets/landingpage/mobile/guest.png";
 import magicMobileImage from "../../../../public/assets/landingpage/mobile/magic.png";
 import mobileOnboardImage from "../../../../public/assets/landingpage/mobile/onboard.png";
 import powerfulMobileImage from "../../../../public/assets/landingpage/mobile/powerful.png";
@@ -190,16 +188,6 @@ export default function Page() {
           href="https://portal.thirdweb.com/connect/in-app-wallet/how-to/enable-gasless"
         />
 
-        <LandingCardWithImage
-          title="Guest mode"
-          description={`Allow anyone to use your app in seconds — with a wallet that's generated automatically when they press "Continue as guest."`}
-          image={guestImage}
-          mobileImage={guestMobileImage}
-          TRACKING_CATEGORY={TRACKING_CATEGORY}
-          href="https://portal.thirdweb.com/references/wallets/latest/LocalWallet"
-          colSpan={1}
-        />
-
         <LandingCardWithImage
           title="Bring your own auth"
           description="Integrate your authentication system and spin up in-app wallets for your users — new and existing."
diff --git a/apps/dashboard/src/contract-ui/tabs/code/components/code-overview.tsx b/apps/dashboard/src/contract-ui/tabs/code/components/code-overview.tsx
@@ -242,7 +242,7 @@ const WALLETS_SNIPPETS = [
     description: "Deploy accounts for your users",
     iconUrl:
       "ipfs://QmeAJVqn17aDNQhjEU3kcWVZCFBrfta8LzaDGkS8Egdiyk/smart-wallet.svg",
-    link: "https://portal.thirdweb.com/references/wallets/latest/SmartWallet",
+    link: "https://portal.thirdweb.com/references/typescript/v5/smartWallet",
     supportedLanguages: {
       javascript: `import { defineChain } from "thirdweb";
 import { inAppWallet, smartWallet } from "thirdweb/wallets";
diff --git a/apps/dashboard/src/stories/stubs.ts b/apps/dashboard/src/stories/stubs.ts
@@ -36,6 +36,7 @@ export function teamStub(id: string, billingPlan: Team["billingPlan"]): Team {
   const team: Team = {
     id: `team-${id}-id`,
     billingPlan: billingPlan,
+    supportPlan: billingPlan,
     billingStatus: "validPayment",
     name: `Team ${id}`,
     slug: `team-${id}`,
diff --git a/apps/portal/redirects.mjs b/apps/portal/redirects.mjs
@@ -998,6 +998,8 @@ const v4ToV5Redirects = {
   "/storage-sdk/v2/:path*": "/typescript/v5/storage",
   "/unity/v4": "/unity/v5",
   "/unity/v4/:path*": "/unity/v5",
+  "/references/wallets": "/typescript/v5/supported-wallets",
+  "/references/wallets/:path*": "/typescript/v5/supported-wallets",
 };
 
 /**
diff --git a/apps/portal/src/app/cli/login/page.mdx b/apps/portal/src/app/cli/login/page.mdx
@@ -58,7 +58,7 @@ This only needs to be done once per device.
 
 When you login with the dashboard, a number of things happen:
 
-- A [local wallet](/references/wallets/v2/LocalWallet) is created and stored in your device's local storage.
+- A local wallet is created and stored in your device's local storage.
 - An auth token is generated for this local wallet.
 - The auth token is linked to your wallet when you sign the message.
 
diff --git a/apps/portal/src/app/connect/account-abstraction/how-it-works/page.mdx b/apps/portal/src/app/connect/account-abstraction/how-it-works/page.mdx
@@ -20,7 +20,7 @@ Smart accounts rely on code instead of private keys to secure and recover wallet
 
 **A smart account is a type of Web3 wallet powered by smart contracts.**
 
-This smart account is unlocked by a 'key' - a personal account. This key can be anything from a [MetaMask](/references/wallets/v2/MetaMaskWallet) wallet or even a [In-App Wallet](/connect/in-app-wallet/overview) and is used as a way to 'sign in' to the wallet.
+This smart account is unlocked by a 'key' - a personal account. This key can be anything from a [MetaMask wallet](/typescript/v5/supported-wallets/io.metamask) or even an [In-App Wallet](/connect/in-app-wallet/overview) and is used as a way to 'sign in' to the wallet.
 
 ## Benefits of Smart Accounts
 
diff --git a/apps/portal/src/app/engine/features/backend-wallets/page.mdx b/apps/portal/src/app/engine/features/backend-wallets/page.mdx
@@ -60,13 +60,14 @@ Smart accounts need to be deployed on each chain. This costs gas and is billed t
 
 ## Local wallet
 
-A [local wallet](/references/wallets/v2/LocalWallet) is a wallet created or imported from a private key. Ensure your private key is backed up before transacting with a local wallet in a production environment.
+A local wallet is a wallet created or imported from a private key. Ensure your private key is backed up before transacting with a local wallet in a production environment.
 
 > Local wallets private keys are stored encrypted in Engine's database. For security reasons, private keys cannot be exported.
 
 ## AWS KMS wallet
 
-An [AWS KMS Wallet](/references/wallets/v2/AwsKmsWallet) is a wallet securely stored in your AWS account. Engine can create and transact with the wallet, but not delete it.
+An AWS KMS Wallet is a wallet securely stored in your AWS account. Engine can create and transact with the wallet, but not delete it.
+
 
 #### Setup
 
diff --git a/apps/portal/src/app/glossary/smart-wallet/page.mdx b/apps/portal/src/app/glossary/smart-wallet/page.mdx
@@ -9,7 +9,7 @@ Instead, you set _who_ and _under what conditions_, users may access the wallet
 
 **A smart contract wallet is a type of Web3 wallet powered by smart contracts.**
 
-This smart account is unlocked by a 'key' - a personal account. This key can be anything from a [MetaMask](/references/wallets/v2/MetaMaskWallet) wallet or even a [Local Wallet](/references/wallets/v2/LocalWallet) and is used as a way to 'sign in' to the wallet.
+This smart account is unlocked by a 'key' - a personal account. This key can be anything from a [MetaMask wallet](/typescript/v5/supported-wallets/io.metamask) or even an [in-App Wallet](/typescript/v5/in-app-wallet) and is used as a way to 'sign in' to the wallet.
 
 Benefits of Smart Accounts:
 
diff --git a/apps/portal/src/app/react/v5/connecting-wallets/hooks/page.mdx b/apps/portal/src/app/react/v5/connecting-wallets/hooks/page.mdx
@@ -72,7 +72,7 @@ You can create any wallet by id with auto completion using the [`createWallet`](
 </Stack>
 ## Pre Connection Hooks
 
-Use these hooks to trigger and manage wallet wallet connection within your own UI. Refer to [wallet connection hooks reference](/references/typescript/v5/useConnect) for more information.
+Use these hooks to trigger and manage wallet connection within your own UI. Refer to [wallet connection hooks reference](/references/typescript/v5/useConnect) for more information.
 
 <Stack>
 
@@ -154,4 +154,4 @@ Once the wallet is connected, you can use the [wallet connection hooks](/referen
 	description="Get the underlying admin wallet of a smart account"
 />
 
-</Stack>
+</Stack>
diff --git a/apps/portal/src/app/unity/v5/wallets/in-app-wallet/page.mdx b/apps/portal/src/app/unity/v5/wallets/in-app-wallet/page.mdx
@@ -107,7 +107,7 @@ var inAppWalletOptions = new InAppWalletOptions(
 ### Login with Custom Auth - OIDC Compatible
 
 ```csharp
-var inAppWalletOptions = new InAppWalletOptions(authprovider: AuthProvider.JWT, jwtOrPayload: "myjwt", encryptionKey: "myencryptionkey");
+var inAppWalletOptions = new InAppWalletOptions(authprovider: AuthProvider.JWT, jwtOrPayload: "myjwt");
 var options = new WalletOptions(
     provider: WalletProvider.InAppWallet, 
     chainId: 1, 
@@ -121,8 +121,7 @@ var wallet = await ThirdwebManager.Instance.ConnectWallet(options);
 ```csharp
 var inAppWalletOptions = new InAppWalletOptions(
     authprovider: AuthProvider.AuthEndpoint, 
-    jwtOrPayload: "mypayload", 
-    encryptionKey: "myencryptionkey"
+    jwtOrPayload: "mypayload"
 );
 var options = new WalletOptions(
     provider: WalletProvider.InAppWallet, 
diff --git a/packages/thirdweb/src/chains/chain-definitions/treasure.ts b/packages/thirdweb/src/chains/chain-definitions/treasure.ts
@@ -0,0 +1,16 @@
+import { defineChain } from "../utils.js";
+
+/**
+ * @chain
+ */
+export const treasure = /* @__PURE__ */ defineChain({
+  id: 61166,
+  name: "Treasure",
+  nativeCurrency: { name: "MAGIC", symbol: "MAGIC", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "Treasure Block Explorer",
+      url: "https://treasurescan.io",
+    },
+  ],
+});
diff --git a/packages/thirdweb/src/chains/chain-definitions/treasureTopaz.ts b/packages/thirdweb/src/chains/chain-definitions/treasureTopaz.ts
@@ -0,0 +1,16 @@
+import { defineChain } from "../utils.js";
+
+/**
+ * @chain
+ */
+export const treasureTopaz = /* @__PURE__ */ defineChain({
+  id: 978658,
+  name: "Treasure Topaz",
+  nativeCurrency: { name: "MAGIC", symbol: "MAGIC", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "Treasure Topaz Block Explorer",
+      url: "https://topaz.treasurescan.io",
+    },
+  ],
+});
diff --git a/packages/thirdweb/src/exports/chains.ts b/packages/thirdweb/src/exports/chains.ts
@@ -80,3 +80,5 @@ export { metalL2Testnet } from "../chains/chain-definitions/metal-l2-testnet.js"
 export { modeTestnet } from "../chains/chain-definitions/mode-testnet.js";
 export { mode } from "../chains/chain-definitions/mode.js";
 export { soneiumMinato } from "../chains/chain-definitions/soneium-minato.js";
+export { treasure } from "../chains/chain-definitions/treasure.js";
+export { treasureTopaz } from "../chains/chain-definitions/treasureTopaz.js";
diff --git a/packages/thirdweb/src/exports/extensions/erc4337.ts b/packages/thirdweb/src/exports/extensions/erc4337.ts
@@ -16,6 +16,7 @@ export {
   type AddSessionKeyOptions,
   addSessionKey,
   isAddSessionKeySupported,
+  shouldUpdateSessionKey,
 } from "../../extensions/erc4337/account/addSessionKey.js";
 
 export {
diff --git a/packages/thirdweb/src/extensions/erc4337/account/addSessionKey.ts b/packages/thirdweb/src/extensions/erc4337/account/addSessionKey.ts
@@ -1,5 +1,10 @@
+import { ZERO_ADDRESS } from "../../../constants/addresses.js";
+import type { ThirdwebContract } from "../../../contract/contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
+import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
+import { toWei } from "../../../utils/units.js";
 import type { Account } from "../../../wallets/interfaces/wallet.js";
+import { getPermissionsForSigner } from "../__generated__/IAccountPermissions/read/getPermissionsForSigner.js";
 import {
   isSetPermissionsForSignerSupported,
   setPermissionsForSigner,
@@ -86,3 +91,78 @@ export function addSessionKey(
 export function isAddSessionKeySupported(availableSelectors: string[]) {
   return isSetPermissionsForSignerSupported(availableSelectors);
 }
+
+/**
+ * Checks if the session key should be updated.
+ * @param currentPermissions - The current permissions of the session key.
+ * @param newPermissions - The new permissions to set for the session key.
+ * @returns A boolean indicating if the session key should be updated.
+ */
+export async function shouldUpdateSessionKey(args: {
+  accountContract: ThirdwebContract;
+  sessionKeyAddress: string;
+  newPermissions: AccountPermissions;
+}): Promise<boolean> {
+  const { accountContract, sessionKeyAddress, newPermissions } = args;
+
+  // check if account is deployed
+  const accountDeployed = await isContractDeployed(accountContract);
+  if (!accountDeployed) {
+    return true;
+  }
+
+  // get current permissions
+  const currentPermissions = await getPermissionsForSigner({
+    contract: accountContract,
+    signer: sessionKeyAddress,
+  });
+  // check end time validity
+  if (
+    currentPermissions.endTimestamp &&
+    currentPermissions.endTimestamp < Math.floor(new Date().getTime() / 1000)
+  ) {
+    return true;
+  }
+
+  // check targets
+  if (
+    !areSessionKeyContractTargetsEqual(
+      currentPermissions.approvedTargets,
+      newPermissions.approvedTargets,
+    )
+  ) {
+    return true;
+  }
+
+  // check if the new native token limit is greater than the current one
+  if (
+    toWei(newPermissions.nativeTokenLimitPerTransaction?.toString() ?? "0") >
+    currentPermissions.nativeTokenLimitPerTransaction
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
+function areSessionKeyContractTargetsEqual(
+  currentTargets: readonly string[],
+  newTargets: string[] | "*",
+): boolean {
+  // Handle the case where approvedTargets is "*"
+  if (
+    newTargets === "*" &&
+    currentTargets.length === 1 &&
+    currentTargets[0] === ZERO_ADDRESS
+  ) {
+    return true;
+  }
+  if (newTargets !== "*") {
+    return newTargets
+      .map((target) => target.toLowerCase())
+      .every((target) =>
+        currentTargets.map((t) => t.toLowerCase()).includes(target),
+      );
+  }
+  return false;
+}
diff --git a/packages/thirdweb/src/extensions/erc4337/account/permissions.test.ts b/packages/thirdweb/src/extensions/erc4337/account/permissions.test.ts
@@ -1,9 +1,11 @@
 import { beforeAll, describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
+import { USDT_CONTRACT_ADDRESS } from "../../../../test/src/test-contracts.js";
 import {
   TEST_ACCOUNT_A,
   TEST_ACCOUNT_B,
+  TEST_ACCOUNT_C,
 } from "../../../../test/src/test-wallets.js";
 import { ZERO_ADDRESS } from "../../../constants/addresses.js";
 import {
@@ -20,7 +22,7 @@ import { adminUpdatedEvent } from "../__generated__/IAccountPermissions/events/A
 import { signerPermissionsUpdatedEvent } from "../__generated__/IAccountPermissions/events/SignerPermissionsUpdated.js";
 import { getAllAdmins } from "../__generated__/IAccountPermissions/read/getAllAdmins.js";
 import { addAdmin } from "./addAdmin.js";
-import { addSessionKey } from "./addSessionKey.js";
+import { addSessionKey, shouldUpdateSessionKey } from "./addSessionKey.js";
 import { removeAdmin } from "./removeAdmin.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
@@ -129,5 +131,62 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
     expect(logs[0]?.args.permissions.approvedTargets).toStrictEqual([
       ZERO_ADDRESS,
     ]);
+
+    expect(
+      await shouldUpdateSessionKey({
+        accountContract,
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
+        newPermissions: {
+          approvedTargets: "*",
+        },
+      }),
+    ).toBe(false);
+
+    expect(
+      await shouldUpdateSessionKey({
+        accountContract,
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
+        newPermissions: {
+          approvedTargets: "*",
+          nativeTokenLimitPerTransaction: 0,
+        },
+      }),
+    ).toBe(false);
+
+    expect(
+      await shouldUpdateSessionKey({
+        accountContract,
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
+        newPermissions: {
+          approvedTargets: [USDT_CONTRACT_ADDRESS],
+        },
+      }),
+    ).toBe(true);
+
+    expect(
+      await shouldUpdateSessionKey({
+        accountContract,
+        sessionKeyAddress: TEST_ACCOUNT_A.address,
+        newPermissions: {
+          approvedTargets: "*",
+          nativeTokenLimitPerTransaction: 0.1,
+        },
+      }),
+    ).toBe(true);
+  });
+
+  it("should update session key if account is not deployed", async () => {
+    const shouldUpdate = await shouldUpdateSessionKey({
+      accountContract: getContract({
+        address: TEST_ACCOUNT_C.address,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+      }),
+      sessionKeyAddress: TEST_ACCOUNT_A.address,
+      newPermissions: {
+        approvedTargets: "*",
+      },
+    });
+    expect(shouldUpdate).toBe(true);
   });
 });
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts
diff --git a/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuote.ts b/packages/thirdweb/src/react/core/hooks/pay/useBuyWithFiatQuote.ts
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/fiat/FiatSteps.tsx
diff --git a/packages/thirdweb/src/utils/any-evm/zksync/isZkSyncChain.ts b/packages/thirdweb/src/utils/any-evm/zksync/isZkSyncChain.ts
diff --git a/packages/thirdweb/src/wallets/smart/index.ts b/packages/thirdweb/src/wallets/smart/index.ts

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"thirdweb": patch
 +---
++
 +Dont retry on quote errors, show fiat value in every step