return address type for contractoptions #5874

dirtycajunrice · 2025-01-02T10:46:47Z

title: "[SDK/Dashboard/Portal] Feature/Fix: Concise title for the changes"

If you did not copy the branch name from Linear, paste the issue tag here (format is TEAM-0000):

Notes for the reviewer

Anything important to call out? Be sure to also clarify these in your comments.

How to test

Unit tests, playground, etc.

PR-Codex overview

This PR primarily focuses on correcting a typo in the regex for validating Ethereum addresses and enhancing type definitions for contract options to include an address type.

Detailed summary

Renamed ADRESS_REGEX to ADDRESS_REGEX in packages/thirdweb/src/utils/address.ts.
Simplified the logic in isAddress function.
Updated ContractOptions type to include a generic address type.
Modified ThirdwebContract type to use the new address type.
Updated getContract function to return ThirdwebContract<abi, Address>.

✨ Ask PR-Codex anything about this PR by commenting with /codex {your question}

changeset-bot · 2025-01-02T10:46:51Z

⚠️ No Changeset found

Latest commit: fb307e9

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

vercel · 2025-01-02T10:46:52Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
docs-v2	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 3, 2025 10:38pm
thirdweb_playground	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 3, 2025 10:38pm
thirdweb-www	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 3, 2025 10:38pm
wallet-ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 3, 2025 10:38pm

dirtycajunrice · 2025-01-02T10:47:24Z

return address type for contractoptions #5874 👈 (View in Graphite)
main

How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

merge-queue - adds this PR to the back of the merge queue
hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

_{An organization admin has enabled the Graphite Merge Queue in this repository.} _{Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.}

This stack of pull requests is managed by Graphite. Learn more about stacking.

This reverts commit d778bb8.

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/embed/embed-setup.tsx

+  const validApiKey = (apiKeys.data || []).find(
+    (apiKey) =>
+      (apiKey.domains.includes("*") ||
+        apiKey.domains.includes("embed.ipfscdn.io") ||


To fix the problem, we need to ensure that the domain check is performed on the parsed host value of the URL rather than using a substring match. This involves parsing the URL and checking if the host matches the allowed domains explicitly.

Parse the URL to extract the host value.

Use an explicit whitelist of allowed hosts to perform the check.

Update the relevant code to use this new approach.

github-actions · 2025-01-02T11:00:49Z

size-limit report 📦

Path	Size	Loading time (3g)	Running time (snapdragon)	Total time
thirdweb (esm)	45.01 KB (-0.17% 🔽)	901 ms (-0.17% 🔽)	491 ms (+37.57% 🔺)	1.4 s
thirdweb (cjs)	110.93 KB (+0.08% 🔺)	2.3 s (+0.08% 🔺)	780 ms (-17.71% 🔽)	3 s
thirdweb (minimal + tree-shaking)	5.58 KB (0%)	112 ms (0%)	41 ms (+17.18% 🔺)	152 ms
thirdweb/chains (tree-shaking)	506 B (0%)	10 ms (0%)	12 ms (+17.16% 🔺)	22 ms
thirdweb/react (minimal + tree-shaking)	19.1 KB (-0.08% 🔽)	383 ms (-0.08% 🔽)	170 ms (+83.05% 🔺)	552 ms

Signed-off-by: greg <gregfromstl@gmail.com>

return address type for contractoptions

d778bb8

dirtycajunrice requested review from jnsdls, joaquim-verges, jakubkrehel and a team as code owners January 2, 2025 10:46

github-actions bot assigned dirtycajunrice Jan 2, 2025

vercel bot had a problem deploying to Preview – wallet-ui January 2, 2025 10:47 Failure

vercel bot had a problem deploying to Preview – docs-v2 January 2, 2025 10:48 Failure

vercel bot had a problem deploying to Preview – thirdweb_playground January 2, 2025 10:48 Failure

vercel bot had a problem deploying to Preview – thirdweb-www January 2, 2025 10:48 Failure

Revert "return address type for contractoptions"

f34e2a6

This reverts commit d778bb8.

github-advanced-security bot found potential problems Jan 2, 2025

View reviewed changes

vercel bot had a problem deploying to Preview – wallet-ui January 2, 2025 10:52 Failure

vercel bot had a problem deploying to Preview – docs-v2 January 2, 2025 10:52 Failure

vercel bot had a problem deploying to Preview – thirdweb_playground January 2, 2025 10:52 Failure

vercel bot had a problem deploying to Preview – thirdweb-www January 2, 2025 10:53 Failure

fix line endings

df0cc31

dirtycajunrice force-pushed the 01-02-return_address_type_for_contractoptions branch from 81efdbb to df0cc31 Compare January 2, 2025 10:57

vercel bot deployed to Preview – wallet-ui January 2, 2025 11:00 View deployment

vercel bot deployed to Preview – thirdweb_playground January 2, 2025 11:00 View deployment

vercel bot deployed to Preview – docs-v2 January 2, 2025 11:06 View deployment

vercel bot deployed to Preview – thirdweb-www January 2, 2025 11:07 View deployment

joaquim-verges approved these changes Jan 2, 2025

View reviewed changes

gregfromstl added 3 commits January 3, 2025 12:27

Update contract.ts

4a5f0ee

Signed-off-by: greg <gregfromstl@gmail.com>

Update contract.ts

c4fafc5

Signed-off-by: greg <gregfromstl@gmail.com>

Merge branch 'main' into 01-02-return_address_type_for_contractoptions

fb307e9

gregfromstl added the merge-queue Adds the pull request to Graphite's merge queue. label Jan 3, 2025

vercel bot deployed to Preview – thirdweb_playground January 3, 2025 22:30 View deployment

vercel bot deployed to Preview – wallet-ui January 3, 2025 22:32 View deployment

vercel bot deployed to Preview – docs-v2 January 3, 2025 22:32 View deployment

gregfromstl merged commit 5cb8e3b into main Jan 3, 2025
27 of 29 checks passed

gregfromstl deleted the 01-02-return_address_type_for_contractoptions branch January 3, 2025 22:36

vercel bot deployed to Preview – thirdweb-www January 3, 2025 22:38 View deployment

@@ -219,7 +219,10 @@
-              const validApiKey = (apiKeys.data || []).find(
-                (apiKey) =>
-                  (apiKey.domains.includes("*") ||
-                    apiKey.domains.includes("embed.ipfscdn.io") ||
-                    apiKey.domains.includes("*.ipfscdn.io")) &&
+              const validApiKey = (apiKeys.data || []).find((apiKey) => {
+                const allowedHosts = ["embed.ipfscdn.io", "*.ipfscdn.io"];
+                const isValidDomain = apiKey.domains.some((domain) => {
+                  const parsedUrl = new URL(domain);
+                  return allowedHosts.includes(parsedUrl.host);
+                });
+                return (
+                  (apiKey.domains.includes("*") || isValidDomain) &&
                   (apiKey.services || [])
@@ -227,4 +230,5 @@
                     ?.actions.includes("read") &&
-                  !!(apiKey.services || []).find((service) => service.name === "rpc"),
-              );
+                  !!(apiKey.services || []).find((service) => service.name === "rpc")
+                );
+              });

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

return address type for contractoptions #5874

return address type for contractoptions #5874

Uh oh!

dirtycajunrice commented Jan 2, 2025 •

edited by pr-codex bot

Loading

Uh oh!

changeset-bot bot commented Jan 2, 2025 •

edited

Loading

Uh oh!

vercel bot commented Jan 2, 2025 •

edited

Loading

Uh oh!

dirtycajunrice commented Jan 2, 2025

Uh oh!

Check failure

Copilot Autofix

github-actions bot commented Jan 2, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

return address type for contractoptions #5874

return address type for contractoptions #5874

Uh oh!

Conversation

dirtycajunrice commented Jan 2, 2025 • edited by pr-codex bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

title: "[SDK/Dashboard/Portal] Feature/Fix: Concise title for the changes"

Notes for the reviewer

How to test

PR-Codex overview

Detailed summary

Uh oh!

changeset-bot bot commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

vercel bot commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dirtycajunrice commented Jan 2, 2025

How to use the Graphite Merge Queue

Uh oh!

Check failure

Uh oh!

Copilot Autofix

github-actions bot commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

size-limit report 📦

Uh oh!

Uh oh!

Uh oh!

dirtycajunrice commented Jan 2, 2025 •

edited by pr-codex bot

Loading

changeset-bot bot commented Jan 2, 2025 •

edited

Loading

vercel bot commented Jan 2, 2025 •

edited

Loading

github-actions bot commented Jan 2, 2025 •

edited

Loading