Merge remote-tracking branch 'origin' into ian/ftux

Author: ianthirdweb

.changeset/bright-walls-applaud.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Optimize mintAdditionalSupplyToBatch extension

.changeset/late-bats-cry.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Auto resolve entrypoint address from factory when available

.changeset/lovely-items-live.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fixes Brave Wallet Metadata

.changeset/tame-tips-type.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/service-utils": patch
+---
+
+Adds ecosystem headers to extractAuthorizationData result

apps/dashboard/src/@/components/blocks/app-footer.tsx

@@ -119,13 +119,7 @@ export function AppFooter(props: AppFooterProps) {
           >
             Terms of Service
           </Link>
-          <Link
-            className="px-[10px] py-[6px] text-muted-foreground text-sm hover:underline"
-            href="https://thirdweb.com/gas"
-            target="_blank"
-          >
-            Gas Estimator
-          </Link>
+
           <Link
             className="px-[10px] py-[6px] text-muted-foreground text-sm hover:underline"
             href="https://thirdweb.com/chainlist"

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/layout.tsx

@@ -3,7 +3,9 @@ import { SidebarLayout } from "@/components/blocks/SidebarLayout";
 import { ContractMetadata } from "components/custom-contract/contract-header/contract-metadata";
 import { DeprecatedAlert } from "components/shared/DeprecatedAlert";
 import type { Metadata } from "next";
+import { notFound } from "next/navigation";
 import { getContractMetadata } from "thirdweb/extensions/common";
+import { isContractDeployed } from "thirdweb/utils";
 import { resolveFunctionSelectors } from "../../../../../lib/selectors";
 import { shortenIfAddress } from "../../../../../utils/usedapp-external";
 import { ConfigureCustomChain } from "./ConfigureCustomChain";
@@ -26,6 +28,13 @@ export default async function Layout(props: {
     return <ConfigureCustomChain chainSlug={props.params.chain_id} />;
   }
 
+  // check if the contract exists
+  const isValidContract = await isContractDeployed(info.contract);
+  if (!isValidContract) {
+    // TODO - replace 404 with a better page to upsale deploy or other thirdweb products
+    notFound();
+  }
+
   const { contract, chainMetadata } = info;
   const contractPageMetadata = await getContractPageMetadata(contract);
   const sidebarLinks = getContractPageSidebarLinks({

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/overview/ContractOverviewPage.tsx

@@ -1,4 +1,5 @@
 import { PublishedBy } from "components/contract-components/shared/published-by";
+import { ErrorBoundary } from "react-error-boundary";
 import type { ThirdwebContract } from "thirdweb";
 import { AnalyticsOverview } from "./components/Analytics";
 import { BuildYourApp } from "./components/BuildYourApp";
@@ -99,7 +100,9 @@ export const ContractOverviewPage: React.FC<ContractOverviewPageProps> = ({
         />
       </div>
       <div className="shrink-0 lg:w-[300px]">
-        <PublishedBy contract={contract} />
+        <ErrorBoundary fallback={null}>
+          <PublishedBy contract={contract} />
+        </ErrorBoundary>
       </div>
     </div>
   );

packages/service-utils/src/cf-worker/index.ts

@@ -105,6 +105,16 @@ export async function extractAuthorizationData(
     bundleId = requestUrl.searchParams.get("bundleId");
   }
 
+  let ecosystemId = headers.get("x-ecosystem-id");
+  if (!ecosystemId) {
+    ecosystemId = requestUrl.searchParams.get("ecosystemId");
+  }
+
+  let ecosystemPartnerId = headers.get("x-ecosystem-partner-id");
+  if (!ecosystemPartnerId) {
+    ecosystemPartnerId = requestUrl.searchParams.get("ecosystemPartnerId");
+  }
+
   let origin = headers.get("origin");
   // if origin header is not available we'll fall back to referrer;
   if (!origin) {
@@ -150,6 +160,8 @@ export async function extractAuthorizationData(
     hashedJWT: jwt ? await hashSecretKey(jwt) : null,
     secretKey,
     clientId,
+    ecosystemId,
+    ecosystemPartnerId,
     origin,
     bundleId,
     secretKeyHash,

packages/service-utils/src/core/authorize/index.ts

@@ -12,6 +12,8 @@ import type { AuthorizationResult } from "./types.js";
 export type AuthorizationInput = {
   secretKey: string | null;
   clientId: string | null;
+  ecosystemId: string | null;
+  ecosystemPartnerId: string | null;
   origin: string | null;
   bundleId: string | null;
   secretKeyHash: string | null;

packages/service-utils/src/node/index.ts

@@ -107,6 +107,7 @@ export function extractAuthorizationData(
   if (!clientId) {
     clientId = requestUrl.searchParams.get("clientId");
   }
+
   // bundle id from header is first preference
   let bundleId = getHeader(headers, "x-bundle-id");
 
@@ -115,6 +116,16 @@ export function extractAuthorizationData(
     bundleId = requestUrl.searchParams.get("bundleId");
   }
 
+  let ecosystemId = getHeader(headers, "x-ecosystem-id");
+  if (!ecosystemId) {
+    ecosystemId = requestUrl.searchParams.get("ecosystemId");
+  }
+
+  let ecosystemPartnerId = getHeader(headers, "x-ecosystem-partner-id");
+  if (!ecosystemPartnerId) {
+    ecosystemPartnerId = requestUrl.searchParams.get("ecosystemPartnerId");
+  }
+
   let origin = getHeader(headers, "origin");
   // if origin header is not available we'll fall back to referrer;
   if (!origin) {
@@ -166,6 +177,8 @@ export function extractAuthorizationData(
     secretKeyHash,
     secretKey,
     clientId,
+    ecosystemId,
+    ecosystemPartnerId,
     origin,
     bundleId,
     targetAddress: authInput.targetAddress,