Version Packages (#504)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.changeset/config.json

@@ -7,7 +7,7 @@
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": [],
+  "ignore": ["e2e-cra-5", "e2e-next-12", "e2e-vite-3"],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "updateInternalDependents": "always",
     "onlyUpdatePeerDependentsWhenOutOfRange": true

.github/composite-actions/install/action.yml

@@ -9,7 +9,7 @@ runs:
       with:
         node-version: 16
         registry-url: "https://registry.npmjs.org"
-        # cache: "yarn"
+        cache: "yarn"
 
     - name: Install dependencies
       shell: bash

.github/workflows/CI.yml

@@ -13,9 +13,8 @@ concurrency:
 jobs:
   build:
     name: Build and Test
-    # timeout-minutes: 15
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
     # To use Remote Caching, uncomment the next lines and follow the steps below.
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}

.github/workflows/e2e.yml

@@ -12,9 +12,8 @@ concurrency:
 
 jobs:
   integration-tests:
-    timeout-minutes: 60
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
     steps:
       - uses: actions/checkout@v3
 
@@ -28,9 +27,3 @@ jobs:
         run: yarn e2e
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"
-      - uses: actions/upload-artifact@v2
-        if: always()
-        with:
-          name: playwright-report
-          path: packages/react/playwright-report/
-          retention-days: 30

.github/workflows/lint.yml

@@ -13,8 +13,7 @@ concurrency:
 jobs:
   lint:
     name: Lint
-    # timeout-minutes: 15
-    # try out buildjet to speed up build and test
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     # To use Remote Caching, uncomment the next lines and follow the steps below.
     env:

.github/workflows/release-pr.yml

@@ -40,8 +40,8 @@ jobs:
       comment_body: ${{ github.event.comment.body }}
 
   deploy:
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    runs-on: ubuntu-latest-32
+    timeout-minutes: 30
     needs: deploy-check
     if: needs.deploy-check.outputs.triggered == 'true'
     steps:

.github/workflows/release.yml

@@ -14,8 +14,8 @@ concurrency:
 jobs:
   release:
     name: Release
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
     steps:
       - name: Checkout branch
         uses: actions/checkout@v3

.github/workflows/size.yml

@@ -4,8 +4,8 @@ on: [pull_request]
 
 jobs:
   build:
-    # try out buildjet to speed up build and test
-    runs-on: buildjet-32vcpu-ubuntu-2204
+    runs-on: ubuntu-latest-32
+    timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v3
@@ -16,3 +16,5 @@ jobs:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           strip-hash: "\\-(\\w{8})(?:\\.esm|\\.cjs)"
           minimum-change-threshold: 100
+          # exclude source maps, node modules and any test related files
+          exclude: "{**/*.map,**/node_modules/**,**/test/**}"

.gitignore

@@ -12,4 +12,9 @@ server/dist
 public/dist
 .turbo
 ./packages/contracts-js/abis
-.idea/
+.idea/
+.yalc/
+yalc.lock
+build/
+playwright-report/
+.vscode/

.prettierignore

@@ -1,4 +1,3 @@
-lib
 node_modules
 dist
 contracts-js

README.md

@@ -28,7 +28,6 @@
 | [/storage](./packages/storage) | Best in class decentralized storage SDK for Browser and Node         | <a href="https://www.npmjs.com/package/@thirdweb-dev/storage"><img src="https://img.shields.io/npm/v/@thirdweb-dev/storage?color=red&label=npm&logo=npm" alt="npm version"/></a> |
 | [/cli](./packages/cli)         | Publish and deploy smart contracts without dealing with private keys | <a href="https://www.npmjs.com/package/thirdweb"><img src="https://img.shields.io/npm/v/thirdweb?color=red&label=npm&logo=npm" alt="npm version"/></a>                           |
 
-
 ## Documentation
 
 Visit [https://portal.thirdweb.com/](https://portal.thirdweb.com/) to view the full documentation.

package.json

@@ -8,14 +8,15 @@
   "private": true,
   "workspaces": {
     "packages": [
-      "packages/*"
+      "packages/*",
+      "test/**/*"
     ]
   },
   "scripts": {
     "test": "turbo run test test:evm test:solana",
     "e2e": "turbo run e2e",
-    "build": "turbo run build",
-    "build:release": "turbo run build --force",
+    "build": "turbo run build --filter=./packages/*",
+    "build:release": "turbo run build --force --filter=./packages/*",
     "dev": "turbo run dev --no-cache --parallel --continue",
     "fix:repo": "manypkg fix",
     "lint": "turbo run lint",
@@ -27,12 +28,7 @@
     "release": "node ./scripts/pre-release.mjs && changeset publish",
     "version-packages:nightly": "changeset version --snapshot nightly",
     "release:nightly": "node ./scripts/pre-release.mjs && changeset publish --tag nightly",
-    "push": "turbo run push"
-  },
-  "preconstruct": {
-    "packages": [
-      "packages/*"
-    ]
+    "push": "turbo run push --filter=./packages/*"
   },
   "packageManager": "[email protected]",
   "dependencies": {
@@ -40,7 +36,7 @@
     "@changesets/cli": "^2.24.3",
     "@manypkg/cli": "^0.19.1",
     "@manypkg/get-packages": "^1.1.3",
-    "@trivago/prettier-plugin-sort-imports": "^3.3.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "eslint": "^8.21.0",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.7.1",

packages/auth/CHANGELOG.md

@@ -1,5 +1,69 @@
 # @thirdweb-dev/auth
 
+## 2.0.41
+
+## 2.0.40
+
+## 2.0.39
+
+## 2.0.38
+
+## 2.0.37
+
+## 2.0.36
+
+## 2.0.35
+
+## 2.0.34
+
+### Patch Changes
+
+- [#425](https://github.com/thirdweb-dev/js/pull/425) [`f545a67`](https://github.com/thirdweb-dev/js/commit/f545a67e9fb597d27bb39ca515d24d306fbb121a) Thanks [@adam-maj](https://github.com/adam-maj)! - Add sameSite none and include credentials
+
+## 2.0.33
+
+## 2.0.32
+
+## 2.0.31
+
+### Patch Changes
+
+- [#397](https://github.com/thirdweb-dev/js/pull/397) [`72589ec`](https://github.com/thirdweb-dev/js/commit/72589ec234d86939b67b0ca8b3b789f2e9c54cc2) Thanks [@adam-maj](https://github.com/adam-maj)! - Call user callback in getUser
+
+## 2.0.30
+
+## 2.0.29
+
+## 2.0.28
+
+## 2.0.27
+
+## 2.0.26
+
+## 2.0.25
+
+## 2.0.24
+
+## 2.0.23
+
+## 2.0.22
+
+## 2.0.21
+
+### Patch Changes
+
+- [#327](https://github.com/thirdweb-dev/js/pull/327) [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5) Thanks [@jnsdls](https://github.com/jnsdls)! - enable e2e testing
+
+## 2.0.20
+
+## 2.0.19
+
+## 2.0.18
+
+## 2.0.17
+
+## 2.0.16
+
 ## 2.0.15
 
 ## 2.0.14

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/auth",
-  "version": "2.0.15",
+  "version": "2.0.41",
   "exports": {
     "./next": {
       "module": "./next/dist/thirdweb-dev-auth-next.esm.js",
@@ -73,7 +73,7 @@
     "eslint-plugin-inclusive-language": "^2.2.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-tsdoc": "^0.2.16",
-    "ethers": "^5.7.1",
+    "ethers": "^5.7.2",
     "express": "^4.18.1",
     "next": "^12.2.0",
     "next-auth": "^4.10.3",

packages/auth/src/express/evm/routes/login.ts

@@ -43,7 +43,7 @@ export default async function handler(
       path: "/",
       httpOnly: true,
       secure: true,
-      sameSite: "strict",
+      sameSite: "none",
     }),
   );
 

packages/auth/src/next-auth/evm/index.ts

@@ -40,11 +40,11 @@ export function ThirdwebNextAuth(cfg: ThirdwebNextAuthConfig) {
               path: "/",
               httpOnly: true,
               secure: true,
-              sameSite: "strict",
+              sameSite: "none",
             }),
           );
 
-          return { address };
+          return { id: address, address };
         } catch (err) {
           return null;
         }

packages/auth/src/next/evm/index.ts

@@ -70,7 +70,13 @@ export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
     if (token) {
       try {
         const address = await sdk.auth.authenticate(domain, token);
-        user = { address };
+
+        let data = {};
+        if (ctx.callbacks?.user) {
+          data = await ctx.callbacks.user(address);
+        }
+
+        user = { ...data, address };
       } catch {
         // No-op
       }

packages/auth/src/next/evm/routes/login.ts

@@ -47,7 +47,7 @@ export default async function handler(
       path: "/",
       httpOnly: true,
       secure: true,
-      sameSite: "strict",
+      sameSite: "none",
     }),
   );
 

packages/auth/src/next/solana/index.ts

@@ -70,7 +70,13 @@ export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
     if (token) {
       try {
         const address = await sdk.auth.authenticate(domain, token);
-        user = { address };
+
+        let data = {};
+        if (ctx.callbacks?.user) {
+          data = await ctx.callbacks.user(address);
+        }
+
+        user = { ...data, address };
       } catch {
         // No-op
       }

packages/auth/src/next/solana/routes/login.ts

@@ -47,7 +47,7 @@ export default async function handler(
       path: "/",
       httpOnly: true,
       secure: true,
-      sameSite: "strict",
+      sameSite: "none",
     }),
   );
 

packages/cli/CHANGELOG.md

@@ -1,5 +1,231 @@
 # thirdweb
 
+## 0.9.10
+
+### Patch Changes
+
+- Updated dependencies [[`7cab8d1`](https://github.com/thirdweb-dev/js/commit/7cab8d1679f8d007091aa03adb83add3822a504a)]:
+  - @thirdweb-dev/sdk@3.6.11
+
+## 0.9.9
+
+### Patch Changes
+
+- [#483](https://github.com/thirdweb-dev/js/pull/483) [`4e8ff58`](https://github.com/thirdweb-dev/js/commit/4e8ff582084c3d201314e6c5dff5b79f15eb6292) Thanks [@jnsdls](https://github.com/jnsdls)! - `thirdweb create` with usage of `forge` should now function correctly in windows CMD shell
+
+- Updated dependencies [[`5fba324`](https://github.com/thirdweb-dev/js/commit/5fba324ac17ab02bc8f13d82a232bc5c6970c8e5), [`894cbef`](https://github.com/thirdweb-dev/js/commit/894cbefc6361f23fc528a6c6819f5c71793d46e4), [`557429b`](https://github.com/thirdweb-dev/js/commit/557429b5cfb3af2983ee01cf7d12d41ee0557593), [`73dc026`](https://github.com/thirdweb-dev/js/commit/73dc026ff9d0ac9099bd5a9a9cab8fdbfc0ae723), [`9eaa21d`](https://github.com/thirdweb-dev/js/commit/9eaa21d09ab9c700aea61a2a25f8ca9859d20857), [`68c8e3c`](https://github.com/thirdweb-dev/js/commit/68c8e3c4d79f5d56dc4414241bcca0d88285fcca), [`bff433e`](https://github.com/thirdweb-dev/js/commit/bff433e12150dc029e33a578219c8437a510da99)]:
+  - @thirdweb-dev/sdk@3.6.10
+
+## 0.9.8
+
+### Patch Changes
+
+- Updated dependencies [[`e913e0d`](https://github.com/thirdweb-dev/js/commit/e913e0daa9ece9a6274f7ffa4e66bdcbf32e6ada), [`5862c55`](https://github.com/thirdweb-dev/js/commit/5862c558fb48604b5aca4defd1ccc06fc3536358), [`73883f5`](https://github.com/thirdweb-dev/js/commit/73883f56d0ed0a35ace8b98b96caa782443be22e), [`f7a74a3`](https://github.com/thirdweb-dev/js/commit/f7a74a3b7c489ada5b1ec435632a326334a33c9b)]:
+  - @thirdweb-dev/sdk@3.6.9
+
+## 0.9.7
+
+### Patch Changes
+
+- [#454](https://github.com/thirdweb-dev/js/pull/454) [`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0) Thanks [@jnsdls](https://github.com/jnsdls)! - upgraded dependencies
+
+- [#461](https://github.com/thirdweb-dev/js/pull/461) [`af85389`](https://github.com/thirdweb-dev/js/commit/af85389dc07fb163b8f9d70093eb1b691e47561a) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix deprecated links
+
+- Updated dependencies [[`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0), [`ea95c5f`](https://github.com/thirdweb-dev/js/commit/ea95c5f609e306e333ee0f73f7920503358ca848), [`699a2b1`](https://github.com/thirdweb-dev/js/commit/699a2b16fb991c474ec57db8f178e2601d631f39), [`4cdd0bd`](https://github.com/thirdweb-dev/js/commit/4cdd0bd6348494a256d7c6a2bdf8f7b5c20f6877), [`a8267f9`](https://github.com/thirdweb-dev/js/commit/a8267f912df84c58d3fe3f47b90bd474f73c84ca)]:
+  - @thirdweb-dev/sdk@3.6.8
+
+## 0.9.6
+
+### Patch Changes
+
+- [#441](https://github.com/thirdweb-dev/js/pull/441) [`64f24f1`](https://github.com/thirdweb-dev/js/commit/64f24f1bb167c3d0cb3beca51fd300eaec21cc27) Thanks [@adam-maj](https://github.com/adam-maj)! - CLI autoupdates on run
+
+- [#447](https://github.com/thirdweb-dev/js/pull/447) [`e7740a5`](https://github.com/thirdweb-dev/js/commit/e7740a59db022a3396194ac66cd195d8ae754d57) Thanks [@adam-maj](https://github.com/adam-maj)! - Detect whether forge is installed
+
+- Updated dependencies [[`3731459`](https://github.com/thirdweb-dev/js/commit/3731459d33f1ded7ebb69124809449b901b3ad3d), [`cac6c30`](https://github.com/thirdweb-dev/js/commit/cac6c30bca5e17df81d746ef81316af47d5e252e), [`7a37e56`](https://github.com/thirdweb-dev/js/commit/7a37e564fd5d5a9df84c8da44ecaf6c42f67a0e2)]:
+  - @thirdweb-dev/sdk@3.6.7
+
+## 0.9.5
+
+### Patch Changes
+
+- Updated dependencies [[`8c6cdaa`](https://github.com/thirdweb-dev/js/commit/8c6cdaa2887fb2cc40d3ee6991233d195d103805)]:
+  - @thirdweb-dev/sdk@3.6.6
+
+## 0.9.4
+
+### Patch Changes
+
+- [#444](https://github.com/thirdweb-dev/js/pull/444) [`94f49b1`](https://github.com/thirdweb-dev/js/commit/94f49b1294bc0208171b16ed413cbb44644af017) Thanks [@adam-maj](https://github.com/adam-maj)! - Add changeset
+
+## 0.9.3
+
+### Patch Changes
+
+- Updated dependencies [[`efc56fa`](https://github.com/thirdweb-dev/js/commit/efc56fa5802490ac8ef50037658d046afd89e9a1)]:
+  - @thirdweb-dev/sdk@3.6.5
+
+## 0.9.2
+
+### Patch Changes
+
+- [#430](https://github.com/thirdweb-dev/js/pull/430) [`e684d7e`](https://github.com/thirdweb-dev/js/commit/e684d7e1ca16f633bce8698529d16bf60c264aa4) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix uploading contracts with special characters in the comments
+
+- [#435](https://github.com/thirdweb-dev/js/pull/435) [`bef97f7`](https://github.com/thirdweb-dev/js/commit/bef97f72f4860596b7b70b05e67fcadf2c9a012e) Thanks [@adam-maj](https://github.com/adam-maj)! - Make solc default backup compilation
+
+- [#432](https://github.com/thirdweb-dev/js/pull/432) [`3e87dd3`](https://github.com/thirdweb-dev/js/commit/3e87dd3ccb04a2b73437357c939a251e83b783b2) Thanks [@adam-maj](https://github.com/adam-maj)! - Display file name on duplicate contract names
+
+- [#431](https://github.com/thirdweb-dev/js/pull/431) [`c42545a`](https://github.com/thirdweb-dev/js/commit/c42545a64725492136025fa1dcdb4d46ba674a30) Thanks [@adam-maj](https://github.com/adam-maj)! - Add changeset
+
+- [#428](https://github.com/thirdweb-dev/js/pull/428) [`6e20d1f`](https://github.com/thirdweb-dev/js/commit/6e20d1f21a622f102e94b956f700d0871c0dc779) Thanks [@adam-maj](https://github.com/adam-maj)! - Update CLI to enable create contract inside contracts project
+
+- Updated dependencies [[`f451da6`](https://github.com/thirdweb-dev/js/commit/f451da6395689a5f89800ee63f34b6175b61f703), [`af3acc6`](https://github.com/thirdweb-dev/js/commit/af3acc6b10751b840e56aef6400da5eea6040df2), [`1bfb91d`](https://github.com/thirdweb-dev/js/commit/1bfb91dbf3a39160c987a425813ac5dbb84703ad), [`ee47840`](https://github.com/thirdweb-dev/js/commit/ee478407673b0416e0c1cfe2be11bd6963395348), [`def4251`](https://github.com/thirdweb-dev/js/commit/def42511ff5a20d83f9094164dafb87e412571b5), [`034a257`](https://github.com/thirdweb-dev/js/commit/034a257442314c67729f7bafcbe3740cff33fa32), [`eca4776`](https://github.com/thirdweb-dev/js/commit/eca47763cd89cc3b7aa57b542971837987540b55), [`639e535`](https://github.com/thirdweb-dev/js/commit/639e535ed55280ad9d081001aab3f5af72bb3e45)]:
+  - @thirdweb-dev/sdk@3.6.4
+
+## 0.9.1
+
+### Patch Changes
+
+- [#415](https://github.com/thirdweb-dev/js/pull/415) [`48d91e4`](https://github.com/thirdweb-dev/js/commit/48d91e4431a3740d0f98f730ed5abf5b287f92c1) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix mappings for prebuilts redirect on deploy
+
+## 0.9.0
+
+### Minor Changes
+
+- [#403](https://github.com/thirdweb-dev/js/pull/403) [`27996cb`](https://github.com/thirdweb-dev/js/commit/27996cb4bc6f054f45b0a66b0a3aca732e0ef610) Thanks [@avneesh0612](https://github.com/avneesh0612)! - Add CLI Support for solana with --solana flag on create command
+
+- [#283](https://github.com/thirdweb-dev/js/pull/283) [`2eaa67a`](https://github.com/thirdweb-dev/js/commit/2eaa67acbe21464e7715d0b696afdc024460a44d) Thanks [@adam-maj](https://github.com/adam-maj)! - add capability to deploy apps
+
+### Patch Changes
+
+- [#413](https://github.com/thirdweb-dev/js/pull/413) [`1b0bf99`](https://github.com/thirdweb-dev/js/commit/1b0bf99da796df88ff307dd004cdaf239fb2b1ba) Thanks [@furqanrydhan](https://github.com/furqanrydhan)! - small interface tweaks
+
+- Updated dependencies [[`48797c7`](https://github.com/thirdweb-dev/js/commit/48797c7cf0695965e33eb6bf602be4652f7085a8), [`83dcaf7`](https://github.com/thirdweb-dev/js/commit/83dcaf70584af8c5cdf0427f9fc1ba82d89f0887), [`f03be39`](https://github.com/thirdweb-dev/js/commit/f03be398e0d7b75c9c5b4fb643f35903e89a17e7), [`2eaa67a`](https://github.com/thirdweb-dev/js/commit/2eaa67acbe21464e7715d0b696afdc024460a44d), [`47f8945`](https://github.com/thirdweb-dev/js/commit/47f8945325447874b1ace0359919c1d54fd55436)]:
+  - @thirdweb-dev/sdk@3.6.3
+
+## 0.8.18
+
+### Patch Changes
+
+- Updated dependencies [[`ccb7db4`](https://github.com/thirdweb-dev/js/commit/ccb7db48739b8dddcb2c032b3b6e3e5200485715), [`9151aa7`](https://github.com/thirdweb-dev/js/commit/9151aa7dc80754a7aa4fd3f6ce0207bccbb6451f), [`5a01c53`](https://github.com/thirdweb-dev/js/commit/5a01c537e30bd7ef562aad1012413990de6faedf)]:
+  - @thirdweb-dev/sdk@3.6.2
+
+## 0.8.17
+
+### Patch Changes
+
+- Updated dependencies [[`15514f1`](https://github.com/thirdweb-dev/js/commit/15514f190a844d809ae5b1edb580aab46a682485), [`7c0744a`](https://github.com/thirdweb-dev/js/commit/7c0744a006e78987ad8b271b2c64f4bac7759510), [`f8bceec`](https://github.com/thirdweb-dev/js/commit/f8bceec10c60b30dc3d6f45926e2a9e018202578), [`887af24`](https://github.com/thirdweb-dev/js/commit/887af24450e316c2ea390cd49c0563cebe793c0f), [`96bd92e`](https://github.com/thirdweb-dev/js/commit/96bd92e724ec7d880d23348071b26ab8c21dd868)]:
+  - @thirdweb-dev/sdk@3.6.1
+
+## 0.8.16
+
+### Patch Changes
+
+- Updated dependencies [[`7cb8e59`](https://github.com/thirdweb-dev/js/commit/7cb8e59be48dc923316eb36ab43a1bef7364f6b1), [`0ed77d2`](https://github.com/thirdweb-dev/js/commit/0ed77d2c9e7526444ef660aab82a950865234aa6), [`04a47e8`](https://github.com/thirdweb-dev/js/commit/04a47e8971d28da2532ebd9db824eeb459c17bd4)]:
+  - @thirdweb-dev/sdk@3.6.0
+
+## 0.8.15
+
+### Patch Changes
+
+- Updated dependencies [[`3eba69a`](https://github.com/thirdweb-dev/js/commit/3eba69afd78b7aa472a9c00c9d4220bb69ad1d3e), [`4af785c`](https://github.com/thirdweb-dev/js/commit/4af785c37c831ecd7087c1c9eb9095922cac0855), [`6f818f3`](https://github.com/thirdweb-dev/js/commit/6f818f393eb9023b53a3358d62d60ec23a9246bd), [`b79dc18`](https://github.com/thirdweb-dev/js/commit/b79dc18f7ab5155bbf4af02dc1a953546160bad0)]:
+  - @thirdweb-dev/sdk@3.5.2
+
+## 0.8.14
+
+### Patch Changes
+
+- Updated dependencies [[`4e7b293`](https://github.com/thirdweb-dev/js/commit/4e7b293c543244de79c150ca8c37d941221fc9a3), [`c9c0e4f`](https://github.com/thirdweb-dev/js/commit/c9c0e4ff39b054af746f3aec75fcbd0a3ef7239d)]:
+  - @thirdweb-dev/sdk@3.5.1
+
+## 0.8.13
+
+### Patch Changes
+
+- Updated dependencies [[`5200d5d`](https://github.com/thirdweb-dev/js/commit/5200d5d7e730da58bd4d3e7c222e3c661265f913), [`42a6065`](https://github.com/thirdweb-dev/js/commit/42a606588dfed03c67c57357dd0ee1ad19fad6ea)]:
+  - @thirdweb-dev/sdk@3.5.0
+
+## 0.8.12
+
+### Patch Changes
+
+- Updated dependencies [[`e731c1a`](https://github.com/thirdweb-dev/js/commit/e731c1a7c341e6f2b9cc42c88d5c1b036dcf4a7c)]:
+  - @thirdweb-dev/sdk@3.4.5
+
+## 0.8.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.4.4
+
+## 0.8.10
+
+### Patch Changes
+
+- Updated dependencies [[`1c24c3c`](https://github.com/thirdweb-dev/js/commit/1c24c3c3c48476a824f817e09e7bf0fbe67c1db5), [`65fc7ba`](https://github.com/thirdweb-dev/js/commit/65fc7ba6fff093a971b53cb0979c39768e090ba1)]:
+  - @thirdweb-dev/sdk@3.4.3
+
+## 0.8.9
+
+### Patch Changes
+
+- Updated dependencies [[`21c21c1`](https://github.com/thirdweb-dev/js/commit/21c21c1adfd09b60ad563bfd4c308597140de33c), [`3522917`](https://github.com/thirdweb-dev/js/commit/352291791ee900e1500f84f095290497934d2f60)]:
+  - @thirdweb-dev/sdk@3.4.2
+
+## 0.8.8
+
+### Patch Changes
+
+- Updated dependencies [[`72227b2`](https://github.com/thirdweb-dev/js/commit/72227b2e166a3a68bbb41cf2b389322f5b7547a2)]:
+  - @thirdweb-dev/sdk@3.4.1
+
+## 0.8.7
+
+### Patch Changes
+
+- [#327](https://github.com/thirdweb-dev/js/pull/327) [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5) Thanks [@jnsdls](https://github.com/jnsdls)! - enable e2e testing
+
+- Updated dependencies [[`340605b`](https://github.com/thirdweb-dev/js/commit/340605b507f384fbd2999b9c16542af3c53e84a9), [`26116a6`](https://github.com/thirdweb-dev/js/commit/26116a6f637ee845f7bd17f20ffe17caf184658e), [`15f8006`](https://github.com/thirdweb-dev/js/commit/15f8006e1fb22333b7ee239b45e7b1b12d6dccc8), [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5)]:
+  - @thirdweb-dev/sdk@3.4.0
+
+## 0.8.6
+
+### Patch Changes
+
+- Updated dependencies [[`ad851f7`](https://github.com/thirdweb-dev/js/commit/ad851f7b4d6abb5ab9364ef3dec229f913e18ce5), [`6218c88`](https://github.com/thirdweb-dev/js/commit/6218c885842e6b4e44ec38ec92a9211e56c49bf4)]:
+  - @thirdweb-dev/sdk@3.3.1
+
+## 0.8.5
+
+### Patch Changes
+
+- [#326](https://github.com/thirdweb-dev/js/pull/326) [`126752d`](https://github.com/thirdweb-dev/js/commit/126752d7d02c9a808a63fb9e67a9df6658b5682b) Thanks [@jnsdls](https://github.com/jnsdls)! - remove tons of unused dependencies, use SDK function for extracting ipfs has from bytecode
+
+- Updated dependencies [[`126752d`](https://github.com/thirdweb-dev/js/commit/126752d7d02c9a808a63fb9e67a9df6658b5682b), [`df74340`](https://github.com/thirdweb-dev/js/commit/df74340fa51323304c32419761d6f18628b060fa), [`89ff921`](https://github.com/thirdweb-dev/js/commit/89ff921a7d9f0e42b4e6707c8b56d0aab95c1aa0), [`a57b4f0`](https://github.com/thirdweb-dev/js/commit/a57b4f01f3a49590b897101f2730582e4124a554)]:
+  - @thirdweb-dev/sdk@3.3.0
+
+## 0.8.4
+
+### Patch Changes
+
+- Updated dependencies [[`4f867e1`](https://github.com/thirdweb-dev/js/commit/4f867e15edbe5757afbf54cab207458711a8986c), [`b6eec61`](https://github.com/thirdweb-dev/js/commit/b6eec6146c23b66a3681bbb48b173b9019254214), [`9727502`](https://github.com/thirdweb-dev/js/commit/9727502eb30ac139382b7c7c8e8fc0967cbfbcf1), [`782b58d`](https://github.com/thirdweb-dev/js/commit/782b58d3f6a3b49ff9b3d837551db5161f96171a), [`f41a443`](https://github.com/thirdweb-dev/js/commit/f41a443c5785240197607b5bf93ff18a1c8e8307), [`f45ef62`](https://github.com/thirdweb-dev/js/commit/f45ef62128cfefe06275a38440c90d45e9f3cef7), [`2f8ec89`](https://github.com/thirdweb-dev/js/commit/2f8ec89c4c83ae577092c840c198e6fcfb114e69), [`b7cd744`](https://github.com/thirdweb-dev/js/commit/b7cd744cd0482a6c3fe5ae0c858f20cd380d4114), [`53c6507`](https://github.com/thirdweb-dev/js/commit/53c65076696a43bd9a7e58a7493d4e65c172900f)]:
+  - @thirdweb-dev/sdk@3.2.6
+
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies [[`712b11a`](https://github.com/thirdweb-dev/js/commit/712b11a43e389ae10b7f09648779a69c05b2c913)]:
+  - @thirdweb-dev/sdk@3.2.5
+
+## 0.8.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.2.4
+
 ## 0.8.1
 
 ### Patch Changes

packages/cli/README.md

@@ -62,7 +62,7 @@ Deploying released contracts give deployers access to automatic SDKs to integrat
 npx thirdweb@latest detect
 ```
 
-As you're developing your contracts, you may want to implement [Extensions](https://portal.thirdweb.com/extensions) to unlock functionality on the SDKs (ie. nft minting with automatic upload to IPFS) and the dashboard (ie. generated UI to manage permissions). This command will show what extensions were detected on your contract, unlocking the corresponding functionality on the SDKs and dashboard.
+As you're developing your contracts, you may want to implement [Extensions](https://portal.thirdweb.com/contractkit) to unlock functionality on the SDKs (ie. nft minting with automatic upload to IPFS) and the dashboard (ie. generated UI to manage permissions). This command will show what extensions were detected on your contract, unlocking the corresponding functionality on the SDKs and dashboard.
 
 ---
 

packages/cli/constants/constants.ts

@@ -1,6 +1,8 @@
 export const CREATE_MESSAGES = {
   typeOfProject: "What type of project do you want to create?",
   projectName: "What is your project named?",
+  contractName: "What will be the name of your new smart contract?",
+  chain: "Which blockchain do you want to use?",
   framework: "What framework do you want to use?",
   language: "What language do you want to use?",
   contract: "What type of contract do you want to start from?",
@@ -9,5 +11,5 @@ export const CREATE_MESSAGES = {
 
 export const ERROR_MESSAGES = {
   noConfiguration:
-    "Failed to find a supported project configuration file in current directory",
+    "No contract project configuration file found in current directory",
 };

packages/cli/e2e/create.test.ts

@@ -2,7 +2,7 @@ import { CREATE_MESSAGES } from "../constants/constants";
 import { prepareEnvironment } from "@gmrchk/cli-testing-library";
 
 // this creates an app, can take some time that's fine
-jest.setTimeout(120_000);
+jest.setTimeout(150_000);
 
 describe("npx thirdweb create", () => {
   it("should create app (CRA) successfully", async () => {
@@ -16,6 +16,8 @@ describe("npx thirdweb create", () => {
     await pressKey("enter");
     await waitForText(CREATE_MESSAGES.projectName);
     await pressKey("enter");
+    await waitForText(CREATE_MESSAGES.chain);
+    await pressKey("enter");
     await waitForText(CREATE_MESSAGES.framework);
     // select CRA
     await pressKey("arrowDown");

packages/cli/e2e/deploy.test.ts

@@ -15,8 +15,8 @@ describe("npx thirdweb deploy", () => {
       `${path}/BasicContract.sol`,
     );
 
-    const { waitForText, waitForFinish, getExitCode, writeText, getStdout } =
-      await spawn("node", "./dist/cli/index.js deploy");
+    const { waitForText, waitForFinish, getExitCode, writeText, getStderr } =
+      await spawn("node", "./dist/cli/index.js deploy --contract");
 
     expect(await exists("BasicContract.sol")).toEqual(true);
 
@@ -26,7 +26,7 @@ describe("npx thirdweb deploy", () => {
     // wait for program to finish
     await waitForFinish();
 
-    expect(getStdout().at(-1)).toContain(
+    expect(getStderr().at(-1)).toContain(
       "https://thirdweb.com/contracts/deploy/",
     );
 

packages/cli/e2e/detect.test.ts

@@ -19,6 +19,10 @@ describe("npx thirdweb detect", () => {
     await create.waitForText(CREATE_MESSAGES.framework);
     // select hardhat
     await create.pressKey("enter");
+    await create.waitForText(CREATE_MESSAGES.contractName);
+    // set contract name
+    await create.writeText("Contract");
+    await create.pressKey("enter");
     await create.waitForText(CREATE_MESSAGES.contract);
     // select ERC721
     await create.pressKey("arrowDown");

packages/cli/e2e/release.test.ts

@@ -15,7 +15,7 @@ describe("npx thirdweb release", () => {
       `${path}/BasicContract.sol`,
     );
 
-    const { waitForText, waitForFinish, getExitCode, writeText, getStdout } =
+    const { waitForText, waitForFinish, getExitCode, writeText, getStderr } =
       await spawn("node", "./dist/cli/index.js release");
 
     expect(await exists("BasicContract.sol")).toEqual(true);
@@ -26,7 +26,7 @@ describe("npx thirdweb release", () => {
     // wait for program to finish
     await waitForFinish();
 
-    expect(getStdout().at(-1)).toContain(
+    expect(getStderr().at(-1)).toContain(
       "https://thirdweb.com/contracts/release/",
     );
 

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thirdweb",
   "main": "dist/cli/index.js",
-  "version": "0.8.1",
+  "version": "0.9.10",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@gmrchk/cli-testing-library": "^0.1.2",
-    "@types/async-retry": "1.3.0",
+    "@types/async-retry": "^1.3.0",
     "@types/cross-spawn": "^6.0.2",
     "@types/inquirer": "^8.2.1",
     "@types/jest": "^29.0.0",
@@ -18,12 +18,12 @@
     "@types/prompts": "^2.0.14",
     "@types/rimraf": "^3.0.0",
     "@types/tar": "^6.1.2",
-    "@types/update-notifier": "^5.1.0",
+    "@types/update-notifier": "^6.0.1",
     "@types/validate-npm-package-name": "^4.0.0",
     "hardhat": "^2.9.3",
-    "jest": "^28",
+    "jest": "^29",
     "prettier": "^2.7.1",
-    "ts-jest": "^28.0.8",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.7.0",
     "tsup": "^6.2.3",
     "typescript": "^4.7.4"
@@ -31,24 +31,18 @@
   "dependencies": {
     "@thirdweb-dev/sdk": "*",
     "async-retry": "^1.3.3",
-    "cbor": "^8.1.0",
     "commander": "^9.1.0",
-    "cpy": "^9.0.1",
+    "detect-package-manager": "^2.0.1",
     "enquirer": "^2.3.6",
-    "ethers": "^5.7.0",
-    "form-data": "^4.0.0",
+    "ethers": "^5.7.2",
     "got": "11.8.5",
     "inquirer": "^8.2.3",
-    "ipfs-unixfs": "^6.0.7",
-    "ipld-dag-pb": "^0.22.3",
-    "multihashes": "^4.0.3",
     "open": "^8.4.0",
     "prompts": "^2.4.2",
     "rimraf": "^3.0.2",
-    "solc": "0.8.13",
+    "solc": "0.8.17",
     "tar": "^6.1.11",
     "tslog": "^3.3.3",
-    "update-check": "^1.5.4",
     "update-notifier": "^6.0.2",
     "validate-npm-package-name": "^4.0.0",
     "yaml": "^2.1.1"

packages/cli/src/cli/index.ts

@@ -2,37 +2,37 @@
 import { detectExtensions } from "../common/feature-detector";
 import { processProject } from "../common/processor";
 import { cliVersion, pkg } from "../constants/urls";
-import { info, logger } from "../core/helpers/logger";
+import { info, logger, spinner } from "../core/helpers/logger";
 import { twCreate } from "../create/command";
-import generateDashboardUrl from "../helpers/generate-dashboard-url";
+import { deploy } from "../deploy";
+import { findPackageInstallation } from "../helpers/detect-local-packages";
 import { upload } from "../storage/command";
 import { ThirdwebStorage } from "@thirdweb-dev/storage";
 import chalk from "chalk";
+import { exec, spawn } from "child_process";
 import { Command } from "commander";
 import open from "open";
+import prompts from "prompts";
 
 const main = async () => {
+  // eslint-disable-next-line turbo/no-undeclared-env-vars
+  const skipIntro = process.env.THIRDWEB_CLI_SKIP_INTRO === "true";
+
   const program = new Command();
 
-  //yes this has to look like this, eliminates whitespace
-  console.info(`
-  $$\\     $$\\       $$\\                 $$\\                         $$\\       
-  $$ |    $$ |      \\__|                $$ |                        $$ |      
-$$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$$$$\\  
-\\_$$  _|  $$  __$$\\ $$ |$$  __$$\\ $$  __$$ |$$ | $$ | $$ |$$  __$$\\ $$  __$$\\ 
-  $$ |    $$ |  $$ |$$ |$$ |  \\__|$$ /  $$ |$$ | $$ | $$ |$$$$$$$$ |$$ |  $$ |
-  $$ |$$\\ $$ |  $$ |$$ |$$ |      $$ |  $$ |$$ | $$ | $$ |$$   ____|$$ |  $$ |
-  \\$$$$  |$$ |  $$ |$$ |$$ |      \\$$$$$$$ |\\$$$$$\\$$$$  |\\$$$$$$$\\ $$$$$$$  |
-   \\____/ \\__|  \\__|\\__|\\__|       \\_______| \\_____\\____/  \\_______|\\_______/ `);
-  console.info(`\n 💎 thirdweb-cli v${cliVersion} 💎\n`);
-  import("update-notifier").then(({ default: updateNotifier }) => {
-    updateNotifier({
-      pkg,
-      shouldNotifyInNpmScript: true,
-      // check every time while we're still building the CLI
-      updateCheckInterval: 0,
-    }).notify();
-  });
+  // yes this has to look like this, eliminates whitespace
+  if (!skipIntro) {
+    console.info(`
+    $$\\     $$\\       $$\\                 $$\\                         $$\\       
+    $$ |    $$ |      \\__|                $$ |                        $$ |      
+  $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$$$$\\  
+  \\_$$  _|  $$  __$$\\ $$ |$$  __$$\\ $$  __$$ |$$ | $$ | $$ |$$  __$$\\ $$  __$$\\ 
+    $$ |    $$ |  $$ |$$ |$$ |  \\__|$$ /  $$ |$$ | $$ | $$ |$$$$$$$$ |$$ |  $$ |
+    $$ |$$\\ $$ |  $$ |$$ |$$ |      $$ |  $$ |$$ | $$ | $$ |$$   ____|$$ |  $$ |
+    \\$$$$  |$$ |  $$ |$$ |$$ |      \\$$$$$$$ |\\$$$$$\\$$$$  |\\$$$$$$$\\ $$$$$$$  |
+     \\____/ \\__|  \\__|\\__|\\__|       \\_______| \\_____\\____/  \\_______|\\_______/ `);
+    console.info(`\n 💎 thirdweb-cli v${cliVersion} 💎\n`);
+  }
 
   program
     .name("thirdweb-cli")
@@ -40,34 +40,40 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
     .version(cliVersion, "-v, --version");
 
   program
-    .command("create")
+    .command("create [projectType] [projectPath]")
     .description(
       "Create a web3 app from any of our official templates: https://github.com/thirdweb-example/",
     )
-    .option("--app", `Create a web3 app.`)
-    .option("--contract", `Create a web3 contract project`)
-    .option("--ts, --typescript", `Initialize as a TypeScript project.`)
-    .option("--js, --javascript", `Initialize as a JavaScript project.`)
-    .option("--forge", `Initialize as a Forge project.`)
-    .option("--hardhat", `Initialize as a Hardhat project.`)
-    .option("--cra", `Initialize as a Create React App project.`)
-    .option("--next", `Initialize as a Next.js project.`)
-    .option("--vite", `Initialize as a Vite project.`)
+    .option("--app", "Create a web3 app.")
+    .option("--contract", "Create a web3 contract project")
+    .option("--ts, --typescript", "Initialize as a TypeScript project.")
+    .option("--js, --javascript", "Initialize as a JavaScript project.")
+    .option("--forge", "Initialize as a Forge project.")
+    .option("--hardhat", "Initialize as a Hardhat project.")
+    .option("--cra", "Initialize as a Create React App project.")
+    .option("--next", "Initialize as a Next.js project.")
+    .option("--vite", "Initialize as a Vite project.")
     .option(
       "--use-npm",
-      `Explicitly tell the CLI to bootstrap the app using npm`,
+      "Explicitly tell the CLI to bootstrap the app using npm",
     )
     .option(
       "--use-pnpm",
-      `Explicitly tell the CLI to bootstrap the app using pnpm`,
+      "Explicitly tell the CLI to bootstrap the app using pnpm",
     )
-    .option("--framework [name]", `The preferred framework.`)
+    .option("--framework [name]", "The preferred framework.")
+    .option("--solana", "Initialize as a Solana project.")
+    .option("--evm", "Initialize as an Ethereum project.")
     .option(
       "-t, --template [name]",
-      `A template to start your project from. You can use an template repository name from the official thirdweb-example org.`,
+      "A template to start your project from. You can use an template repository name from the official thirdweb-example org.",
     )
-    .action(async (options) => {
-      await twCreate(options);
+    .option(
+      "-c, --contract-name [name]",
+      "Name of the new smart contract to create",
+    )
+    .action(async (type, path, options) => {
+      await twCreate(type, path, options);
     });
 
   program
@@ -87,39 +93,33 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
     .option("--dry-run", "dry run (skip actually publishing)")
     .option("-d, --debug", "show debug logs")
     .option("--ci", "Continuous Integration mode")
+    .option(
+      "--dist-path [distPath]",
+      "Path to the dist folder where the HTML based App is",
+    )
     .option(
       "-n, --name [name]",
       "Name of the pre-built or released contract (such as nft-drop)",
     )
+    .option(
+      "-f, --file [name]",
+      "Filter for contract files that contain this file name",
+    )
+    .option(
+      "-cn, --contract-name [name]",
+      "Filter for contracts that contain this contract name",
+    )
     .option(
       "-cv, --contract-version [version]",
       "Version of the released contract",
     )
+    .option("--app", "Deploy a web app to decentralized storage")
+    .option("--contract", "Deploy a smart contract to blockchains")
     .action(async (options) => {
-      if (options.name) {
-        const url = generateDashboardUrl(options.name, options.contractVersion);
-
-        if (!url) {
-          logger.error(
-            chalk.red(
-              `Could not find a contract named ${options.name} ${
-                options.contractVersion || ""
-              }`,
-            ),
-          );
-          return;
-        }
-
-        info(`Open this link to deploy your contract:`);
-        logger.info(chalk.blueBright(url));
-        open(url.toString());
-        return;
+      const url = await deploy(options);
+      if (url) {
+        open(url);
       }
-
-      const url = await processProject(options, "deploy");
-      info(`Open this link to deploy your contracts:`);
-      logger.info(chalk.blueBright(url.toString()));
-      open(url.toString());
     });
 
   program
@@ -128,13 +128,24 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
       "Release your protocol so other devs can deploy them and unlock SDKs, Dashboards and Analytics",
     )
     .option("-p, --path <project-path>", "path to project", ".")
+    .option(
+      "-f, --file [name]",
+      "Filter for contract files that contain the file name",
+    )
+    .option(
+      "-cn, --contract-name [name]",
+      "Filter for contracts that contain this contract name",
+    )
     .option("--dry-run", "dry run (skip actually publishing)")
     .option("-d, --debug", "show debug logs")
     .option("--ci", "Continuous Integration mode")
     .action(async (options) => {
       const url = await processProject(options, "release");
-      info(`Open this link to release your contracts:`);
-      logger.info(chalk.blueBright(url.toString()));
+      info(
+        `Open this link to release your contracts: ${chalk.blueBright(
+          url.toString(),
+        )}`,
+      );
       open(url.toString());
     });
 
@@ -144,13 +155,35 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
     .argument("[upload]", "path to file or directory to upload")
     .action(async (path) => {
       const storage = new ThirdwebStorage();
-      const uri = await upload(storage, path);
-      info(`Files stored at the following IPFS URI:`);
-      logger.info(chalk.blueBright(uri.toString()));
+      try {
+        const uri = await upload(storage, path);
+        info(
+          `Files stored at the following IPFS URI: ${chalk.blueBright(
+            uri.toString(),
+          )}`,
+        );
 
-      const url = storage.resolveScheme(uri);
-      info(`Open this link to view your upload:`);
-      logger.info(chalk.blueBright(url.toString()));
+        const url = storage.resolveScheme(uri);
+        info(
+          `Open this link to view your upload: ${chalk.blueBright(
+            url.toString(),
+          )}`,
+        );
+      } catch (err: any) {
+        if (
+          err.toString() === "No files detected in specified directory" ||
+          err.toString() === "Invalid path provided" ||
+          err.toString() === "No path provided"
+        ) {
+          logger.error(
+            chalk.redBright(
+              "Please specify a valid file or directory to upload",
+            ),
+          );
+        } else {
+          logger.error(chalk.redBright("Failed to upload files"), err);
+        }
+      }
     });
 
   program
@@ -165,6 +198,134 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
       await detectExtensions(options);
     });
 
+  if (!skipIntro) {
+    const versionSpinner = spinner("Checking for updates...");
+    await import("update-notifier").then(
+      async ({ default: updateNotifier }) => {
+        const notifier = updateNotifier({
+          pkg,
+          shouldNotifyInNpmScript: true,
+          // check every time while we're still building the CLI
+          updateCheckInterval: 0,
+        });
+
+        const versionInfo = await notifier.fetchInfo();
+        versionSpinner.stop();
+
+        if (versionInfo.type !== "latest") {
+          const res = await prompts({
+            type: "toggle",
+            name: "upgrade",
+            message: `A new version of the CLI is available. Would you like to upgrade?`,
+            initial: true,
+            active: "yes",
+            inactive: "no",
+          });
+
+          if (res.upgrade) {
+            const updateSpinner = spinner(
+              `Upgrading CLI to version ${versionInfo.latest}...`,
+            );
+
+            const clonedEnvironment = { ...process.env };
+            clonedEnvironment.THIRDWEB_CLI_SKIP_INTRO = "true";
+
+            const installation = await findPackageInstallation();
+
+            // If the package isn't installed anywhere, just defer to npx thirdweb@latest
+            if (!installation) {
+              updateSpinner.succeed(
+                `Now using CLI version ${versionInfo.latest}. Continuing execution...`,
+              );
+
+              await new Promise((done, failed) => {
+                const shell = spawn(
+                  `npx --yes thirdweb@latest ${process.argv
+                    .slice(2)
+                    .join(" ")}`,
+                  [],
+                  { stdio: "inherit", shell: true, env: clonedEnvironment },
+                );
+                shell.on("close", (code) => {
+                  if (code === 0) {
+                    done("");
+                  } else {
+                    failed();
+                  }
+                });
+              });
+
+              return process.exit(0);
+            }
+
+            // Otherwise, get the correct command based on package manager and local vs. global
+            let command = "";
+            switch (installation.packageManager) {
+              case "npm":
+                command = installation.isGlobal
+                  ? `npm install -g thirdweb`
+                  : `npm install thirdweb`;
+                break;
+              case "yarn":
+                command = installation.isGlobal
+                  ? `yarn global add thirdweb`
+                  : `yarn add thirdweb`;
+                break;
+              case "pnpm":
+                command = installation.isGlobal
+                  ? `pnpm add -g thirdweb@latest`
+                  : `pnpm add thirdweb@latest`;
+                break;
+              default:
+                console.error(
+                  `Could not detect package manager in use, aborting automatic upgrade.\nIf you want to upgrade the CLI, please do it manually with your package manager.`,
+                );
+                process.exit(1);
+            }
+
+            await new Promise((done, failed) => {
+              exec(command, (err, stdout, stderr) => {
+                if (err) {
+                  failed(err);
+                  return;
+                }
+
+                done({ stdout, stderr });
+              });
+            });
+
+            updateSpinner.succeed(
+              `Successfully upgraded CLI to version ${versionInfo.latest}. Continuing execution...`,
+            );
+
+            // If the package is installed globally with yarn or pnpm, then npx won't recognize it
+            // So we need to make sure to run the command directly
+            const executionCommand =
+              !installation.isGlobal || installation.packageManager === "npm"
+                ? `npx thirdweb`
+                : `thirdweb`;
+            await new Promise((done, failed) => {
+              const shell = spawn(
+                `${executionCommand} ${process.argv.slice(2).join(" ")}`,
+                [],
+                { stdio: "inherit", shell: true, env: clonedEnvironment },
+              );
+              shell.on("close", (code) => {
+                if (code === 0) {
+                  done("");
+                } else {
+                  failed();
+                }
+              });
+            });
+
+            process.exit(0);
+          }
+        }
+      },
+    );
+  }
+
   await program.parseAsync();
 };
 

packages/cli/src/common/feature-detector.ts

@@ -72,13 +72,13 @@ export async function detectExtensions(options: any) {
       const enabledFeatures: Feature[] = features.enabledFeatures.map(
         (feature) => ({
           name: feature.name,
-          reference: `https://portal.thirdweb.com/extensions/${feature.name.toLowerCase()}`,
+          reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
         }),
       );
       const suggestedFeatures: Feature[] = features.suggestedFeatures.map(
         (feature) => ({
           name: feature.name,
-          reference: `https://portal.thirdweb.com/extensions/${feature.name.toLowerCase()}`,
+          reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
         }),
       );
 

packages/cli/src/common/processor.ts

@@ -76,7 +76,7 @@ export async function processProject(
     }
   }
 
-  let compiledResult;
+  let compiledResult: { contracts: ContractPayload[] };
   const compileLoader = spinner("Compiling project...");
   try {
     compiledResult = await build(projectPath, projectType);
@@ -106,10 +106,47 @@ export async function processProject(
     if (options.ci) {
       selectedContracts = compiledResult.contracts;
     } else {
-      const choices = compiledResult.contracts.map((c) => ({
-        name: c.name,
-        value: c,
-      }));
+      const filtered = compiledResult.contracts
+        .filter((c) => {
+          if (typeof options.file === "string" && options.file.length > 0) {
+            return c.fileName.includes(options.file);
+          }
+
+          return true;
+        })
+        .filter((c) => {
+          if (
+            typeof options.contractName === "string" &&
+            options.contractName.length > 0
+          ) {
+            return c.name.includes(options.contractName);
+          }
+
+          return true;
+        });
+
+      if (filtered.length === 0) {
+        logger.error(`No contracts found matching the specified filters.`);
+        process.exit(1);
+      }
+
+      const choices = filtered.map((c) => {
+        if (
+          compiledResult.contracts.filter(
+            (other: ContractPayload) => other.name === c.name,
+          ).length > 1
+        ) {
+          return {
+            name: `${c.name} - ${chalk.gray(c.fileName)}`,
+            value: c,
+          };
+        }
+
+        return {
+          name: c.name,
+          value: c,
+        };
+      });
       const prompt = createContractsPrompt(
         choices,
         `Choose which contract(s) to ${command}`,
@@ -164,7 +201,7 @@ export async function processProject(
     const metadataURIs = await Promise.all(
       selectedContracts.map(async (c) => {
         logger.debug(`Uploading ${c.name}...`);
-        return await storage.upload(JSON.parse(c.metadata), {
+        return await storage.upload(JSON.parse(JSON.stringify(c.metadata)), {
           uploadWithoutDirectory: true,
         });
       }),

packages/cli/src/core/builder/brownie.ts

@@ -55,6 +55,7 @@ export class BrownieBuilder extends BaseBuilder {
             metadata: {},
             bytecode,
             sources: [], // TODO
+            fileName: "", // TODO
             name: contractName,
           });
           break;

packages/cli/src/core/builder/builder-base.ts

@@ -1,7 +1,7 @@
-import { extractIPFSHashFromBytecode } from "../helpers/ipfs";
 import { logger } from "../helpers/logger";
 import { CompileOptions, IBuilder } from "../interfaces/Builder";
 import { ContractPayload } from "../interfaces/ContractPayload";
+import { extractIPFSHashFromBytecode } from "@thirdweb-dev/sdk/evm";
 
 export abstract class BaseBuilder implements IBuilder {
   abstract compile(

packages/cli/src/core/builder/foundry.ts

@@ -1,9 +1,11 @@
 import { findFiles } from "../../common/file-helper";
+import { hasForge } from "../../create/helpers/has-forge";
 import { execute } from "../helpers/exec";
 import { logger } from "../helpers/logger";
 import { CompileOptions } from "../interfaces/Builder";
 import { ContractPayload } from "../interfaces/ContractPayload";
 import { BaseBuilder } from "./builder-base";
+import chalk from "chalk";
 import { existsSync, readFileSync } from "fs";
 import { basename, join } from "path";
 
@@ -11,6 +13,18 @@ export class FoundryBuilder extends BaseBuilder {
   public async compile(options: CompileOptions): Promise<{
     contracts: ContractPayload[];
   }> {
+    const isInstalled = await hasForge();
+    if (!isInstalled) {
+      console.error(
+        `\n${chalk.redBright(
+          `error`,
+        )} You don't have forge installed on this machine!\n\nYou can install forge by following these instructions:\n${chalk.blueBright(
+          `https://book.getfoundry.sh/getting-started/installation`,
+        )}\n`,
+      );
+      process.exit(1);
+    }
+
     await execute("forge clean", options.projectPath);
     await execute("forge build --extra-output metadata", options.projectPath);
 
@@ -88,6 +102,11 @@ export class FoundryBuilder extends BaseBuilder {
         })
         .filter((path) => path !== undefined) as string[];
 
+      const fileNames = Object.keys(
+        parsedMetadata?.settings?.compilationTarget || {},
+      );
+      const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
       if (
         this.shouldProcessContract(
           contractInfo.abi,
@@ -99,6 +118,7 @@ export class FoundryBuilder extends BaseBuilder {
           name: contractName,
           metadata,
           bytecode,
+          fileName,
           sources,
         });
       }

packages/cli/src/core/builder/hardhat.ts

@@ -25,7 +25,7 @@ export class HardhatBuilder extends BaseBuilder {
     //the hardhat extractor **logs out** the runtime config of hardhat, we take that stdout and parse it
     const stringifiedConfig = (
       await execute(
-        `npx hardhat run ${configExtractorScriptPath} --no-compile`,
+        `npx hardhat run "${configExtractorScriptPath}" --no-compile`,
         options.projectPath,
       )
     ).stdout;
@@ -123,11 +123,17 @@ export class HardhatBuilder extends BaseBuilder {
             })
             .filter((path) => path !== undefined) as string[];
 
+          const fileNames = Object.keys(
+            meta?.settings?.compilationTarget || {},
+          );
+          const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
           if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
             contracts.push({
               metadata,
               bytecode,
               name: contractName,
+              fileName,
               sources,
             });
           }

packages/cli/src/core/builder/solc.ts

@@ -140,11 +140,17 @@ export class SolcBuilder extends BaseBuilder {
         })
         .filter((path) => path !== undefined) as string[];
 
+      const fileNames = Object.keys(
+        parsedMetadata?.settings?.compilationTarget || {},
+      );
+      const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
       if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
         contracts.push({
           metadata,
           bytecode,
           name: contractName,
+          fileName,
           sources: _sources,
         });
       }

packages/cli/src/core/builder/truffle.ts

@@ -72,11 +72,18 @@ export class TruffleBuilder extends BaseBuilder {
           return undefined;
         })
         .filter((path) => path !== undefined) as string[];
+
+      const fileNames = Object.keys(
+        parsedMetadata?.settings?.compilationTarget || {},
+      );
+      const fileName = fileNames.length > 0 ? fileNames[0] : "";
+
       if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
         contracts.push({
           metadata,
           bytecode,
           name: contractName,
+          fileName,
           sources,
         });
       }

packages/cli/src/core/detection/detect.ts

@@ -36,6 +36,7 @@ export default async function detect(
         name: "continue",
         message:
           "Do you want to continue and compile this project with solc instead?",
+        initial: true,
       });
       const shouldCompile = await prompt.run();
       if (!shouldCompile) {

packages/cli/src/core/detection/npm.ts

@@ -0,0 +1,11 @@
+import { ProjectType } from "../types/ProjectType";
+import { Detector } from "./detector";
+import { existsSync } from "fs";
+
+export default class NPMDetector implements Detector {
+  public projectType: ProjectType = "npm";
+
+  public matches(path: string): boolean {
+    return existsSync(path + "/package-lock.json");
+  }
+}

packages/cli/src/core/detection/vite.ts

@@ -0,0 +1,14 @@
+import { ProjectType } from "../types/ProjectType";
+import { Detector } from "./detector";
+import { existsSync } from "fs";
+
+export default class ViteDetector implements Detector {
+  public projectType: ProjectType = "vite";
+
+  public matches(path: string): boolean {
+    return (
+      existsSync(path + "/vite.config.js") ||
+      existsSync(path + "/vite.config.ts")
+    );
+  }
+}

packages/cli/src/core/detection/yarn.ts

@@ -0,0 +1,11 @@
+import { ProjectType } from "../types/ProjectType";
+import { Detector } from "./detector";
+import { existsSync } from "fs";
+
+export default class YarnDetector implements Detector {
+  public projectType: ProjectType = "yarn";
+
+  public matches(path: string): boolean {
+    return existsSync(path + "/yarn.lock");
+  }
+}

packages/cli/src/core/helpers/ipfs.ts

@@ -1,66 +0,0 @@
-import { decodeFirstSync } from "cbor";
-import { UnixFS } from "ipfs-unixfs";
-import { DAGNode } from "ipld-dag-pb";
-import { toB58String } from "multihashes";
-
-/**
- * Derives IPFS hash of string
- * @param  {String} str
- * @return {String}     IPFS hash (ex: "Qm")
- */
-export async function getIPFSHash(str: string) {
-  const file = new UnixFS({
-    type: "file",
-    data: Buffer.from(str),
-  });
-  const node = new DAGNode(file.marshal());
-  const metadataLink = await node.toDAGLink();
-  return toB58String(metadataLink.Hash.multihash);
-}
-
-/**
- * Extract the IPFS hash from the given bytecode
- * @param bytecode
- * @returns
- */
-export function extractIPFSHashFromBytecode(
-  bytecode: string,
-): string | undefined {
-  const numericBytecode = hexToBytes(bytecode);
-  const cborLength: number =
-    numericBytecode[numericBytecode.length - 2] * 0x100 +
-    numericBytecode[numericBytecode.length - 1];
-  const bytecodeBuffer = Buffer.from(
-    numericBytecode.slice(numericBytecode.length - 2 - cborLength, -2),
-  );
-  const cborData = decodeFirstSync(bytecodeBuffer);
-  if (cborData["ipfs"]) {
-    const uri = toB58String(cborData["ipfs"]);
-    return uri;
-  }
-  return undefined;
-}
-
-function hexToBytes(hex: string | number) {
-  hex = hex.toString(16);
-  if (!hex.startsWith("0x")) {
-    hex = `0x${hex}`;
-  }
-  if (!isHexStrict(hex)) {
-    throw new Error('Given value "' + hex + '" is not a valid hex string.');
-  }
-
-  hex = hex.replace(/^0x/i, "");
-
-  for (var bytes = [], c = 0; c < hex.length; c += 2) {
-    bytes.push(parseInt(hex.slice(c, c + 2), 16));
-  }
-  return bytes;
-}
-
-function isHexStrict(hex: string | number) {
-  return (
-    (typeof hex === "string" || typeof hex === "number") &&
-    /^(-)?0x[0-9a-f]*$/i.test(hex.toString())
-  );
-}

packages/cli/src/core/interfaces/ContractPayload.ts

@@ -17,6 +17,11 @@ export interface ContractPayload {
    */
   metadata: any;
 
+  /**
+   * The file name of the original compiled file
+   */
+  fileName: string;
+
   /**
    * The source file paths
    */

packages/cli/src/core/types/ProjectType.ts

@@ -4,4 +4,10 @@ export type ProjectType =
   | "hardhat"
   | "truffle"
   | "solc"
+  | "vite"
+  | "next"
+  | "cra"
+  | "spa-webapp"
+  | "yarn"
+  | "npm"
   | "none";

packages/cli/src/create/command.ts

@@ -2,60 +2,82 @@
 
 /* eslint-disable import/no-extraneous-dependencies */
 import { CREATE_MESSAGES } from "../../constants/constants";
+import detect from "../core/detection/detect";
 import { DownloadError, createApp } from "./helpers/create-app";
-import { createContract } from "./helpers/create-contract";
+import { createContractProject } from "./helpers/create-contract";
 import { getPkgManager } from "./helpers/get-pkg-manager";
 import { validateNpmName } from "./helpers/validate-pkg";
 import chalk from "chalk";
+import fs from "fs";
 import path from "path";
 import prompts from "prompts";
 
-let projectType: string = "";
+let contractName: string = "";
 let projectPath: string = "";
+let projectType: string = "";
 let framework: string = "";
 let language: string = "";
 let baseContract: string = "";
+let chain: string = "";
 /* let createType: string = "app"; */
 
-export async function twCreate(options: any) {
-  if (typeof projectPath === "string") {
-    projectPath = projectPath.trim();
+export async function twCreate(
+  pType: string,
+  pPath: string = "",
+  options: any,
+) {
+  if (typeof pPath === "string") {
+    projectPath = pPath;
   }
 
-  if (options.app) {
+  if (typeof options.contractName === "string") {
+    contractName = options.contractName;
+  }
+
+  if (pType === "app" || options.app) {
     projectType = "app";
-  }
-
-  if (options.contract) {
+  } else if (pType === "contract" || options.contract) {
     projectType = "contract";
   }
 
-  if (options.typescript) {
-    language = "typescript";
+  if (projectType === "app") {
+    if (options.typescript) {
+      language = "typescript";
+    }
+
+    if (options.javascript) {
+      language = "javascript";
+    }
+
+    if (options.next) {
+      framework = "next";
+    }
+
+    if (options.cra) {
+      framework = "cra";
+    }
+
+    if (options.vite) {
+      framework = "vite";
+    }
+
+    if (options.solana) {
+      chain = "solana";
+    }
+
+    if (options.evm) {
+      chain = "evm";
+    }
   }
 
-  if (options.javascript) {
-    language = "javascript";
-  }
+  if (projectType === "contract") {
+    if (options.forge) {
+      framework = "forge";
+    }
 
-  if (options.next) {
-    framework = "next";
-  }
-
-  if (options.cra) {
-    framework = "cra";
-  }
-
-  if (options.vite) {
-    framework = "vite";
-  }
-
-  if (options.forge) {
-    framework = "forge";
-  }
-
-  if (options.hardhat) {
-    framework = "hardhat";
+    if (options.hardhat) {
+      framework = "hardhat";
+    }
   }
 
   if (options.framework) {
@@ -76,103 +98,216 @@ export async function twCreate(options: any) {
     if (typeof res.projectType === "string") {
       projectType = res.projectType.trim();
     }
-  } else if (!projectType && options.template) {
+  } else if (!projectType || options.template) {
     // If no project type is specified, but a template is, we assume the user wants to create an app.
     // We do this so old users can still use the --template flag to create an app.
     projectType = "app";
   }
 
-  if (!projectPath) {
-    const defaultName =
-      projectType === "contract" ? "thirdweb-contracts" : "thirdweb-app";
-    const res = await prompts({
-      type: "text",
-      name: "path",
-      message: CREATE_MESSAGES.projectName,
-      initial: options.template || defaultName,
-      format: (name: string) => name.toLowerCase(),
-      validate: (name: string) => {
-        const validation = validateNpmName(
-          path.basename(path.resolve(name.toLowerCase())),
-        );
-        if (validation.valid) {
-          return true;
-        }
-        return "Invalid project name: " + validation.problems?.[0];
-      },
-    });
-
-    if (typeof res.path === "string") {
-      projectPath = res.path.trim();
-    }
-  }
-
-  if (!projectPath) {
-    console.log(
-      "\nPlease specify the project directory:\n" +
-        `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
-          "<project-directory>",
-        )}\n` +
-        "For example:\n" +
-        `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
-          "my-thirdweb-app",
-        )}\n\n` +
-        `Run ${chalk.cyan("npx thirdweb --help")} to see all options.`,
-    );
-    process.exit(1);
-  }
-
-  if (!options.template) {
-    if (projectType === "app" && !framework) {
-      const res = await prompts({
-        type: "select",
-        name: "framework",
-        message: CREATE_MESSAGES.framework,
-        choices: [
-          { title: "Next.js", value: "next" },
-          { title: "Create React App", value: "cra" },
-          { title: "Vite", value: "vite" },
-        ],
-      });
-
-      if (typeof res.framework === "string") {
-        framework = res.framework.trim();
-      }
-    }
-
-    if (projectType === "app" && !language) {
-      const res = await prompts({
-        type: "select",
-        name: "language",
-        message: CREATE_MESSAGES.language,
-        choices: [
-          { title: "JavaScript", value: "javascript" },
-          { title: "TypeScript", value: "typescript" },
-        ],
-      });
-
-      if (typeof res.language === "string") {
-        language = res.language.trim();
-      }
-    }
+  // Whether to only create a new contract without the project
+  let onlyContract = false;
+  if (projectType === "contract") {
+    const resolvedProjectPath = path.resolve(projectPath);
+    const contractProjectType = await detect(resolvedProjectPath, {});
 
     if (
-      projectType === "contract" &&
-      framework !== "forge" &&
-      framework !== "hardhat"
+      contractProjectType === "foundry" &&
+      fs.existsSync(path.join(resolvedProjectPath, "src"))
     ) {
+      onlyContract = true;
+      projectPath = path.join(projectPath, "src");
+    } else if (contractProjectType === "hardhat") {
+      if (fs.existsSync(path.join(resolvedProjectPath, "contracts"))) {
+        onlyContract = true;
+        projectPath = path.join(projectPath, "contracts");
+      } else {
+        // If there's no expected contracts folder, check for a directory that has .sol files
+        const directories = fs
+          .readdirSync(resolvedProjectPath)
+          .filter((file) =>
+            fs.lstatSync(path.join(resolvedProjectPath, file)).isDirectory(),
+          );
+        for (const directory of directories) {
+          const files = fs.readdirSync(path.join(projectPath, directory));
+          if (files.some((file) => file.endsWith(".sol"))) {
+            onlyContract = true;
+            projectPath = path.join(projectPath, directory);
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  if (!onlyContract) {
+    if (!projectPath) {
+      const defaultName =
+        projectType === "contract" ? "thirdweb-contracts" : "thirdweb-app";
       const res = await prompts({
-        type: "select",
-        name: "framework",
-        message: CREATE_MESSAGES.framework,
-        choices: [
-          { title: "Hardhat", value: "hardhat" },
-          { title: "Forge", value: "forge" },
-        ],
+        type: "text",
+        name: "path",
+        message: CREATE_MESSAGES.projectName,
+        initial: options.template || defaultName,
+        format: (name: string) => name.toLowerCase(),
+        validate: (name: string) => {
+          const validation = validateNpmName(
+            path.basename(path.resolve(name.toLowerCase())),
+          );
+          if (validation.valid) {
+            return true;
+          }
+          return "Invalid project name: " + validation.problems?.[0];
+        },
       });
 
-      if (typeof res.framework === "string") {
-        framework = res.framework.trim();
+      if (typeof res.path === "string") {
+        projectPath = path.join(projectPath, res.path.trim());
+      }
+    }
+
+    if (!projectPath) {
+      console.log(
+        "\nPlease specify the project directory:\n" +
+          `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
+            "<project-directory>",
+          )}\n` +
+          "For example:\n" +
+          `  ${chalk.cyan("npx thirdweb create")} ${chalk.green(
+            "my-thirdweb-app",
+          )}\n\n` +
+          `Run ${chalk.cyan("npx thirdweb --help")} to see all options.`,
+      );
+      process.exit(1);
+    }
+
+    if (!options.template) {
+      if (projectType === "app" && !chain) {
+        const res = await prompts({
+          type: "select",
+          name: "chain",
+          message: CREATE_MESSAGES.chain,
+          choices: [
+            { title: "EVM", value: "evm" },
+            { title: "Solana", value: "solana" },
+          ],
+        });
+
+        if (res.chain === "solana") {
+          chain = "solana";
+        } else {
+          chain = "evm";
+        }
+      }
+
+      if (projectType === "app" && !framework) {
+        const res = await prompts({
+          type: "select",
+          name: "framework",
+          message: CREATE_MESSAGES.framework,
+          choices:
+            // Solana doesn't support Vite just yet:
+            chain === "solana"
+              ? [
+                  { title: "Next.js", value: "next" },
+                  { title: "Create React App", value: "cra" },
+                  // { title: "Vite", value: "vite" },
+                ]
+              : [
+                  { title: "Next.js", value: "next" },
+                  { title: "Create React App", value: "cra" },
+                  { title: "Vite", value: "vite" },
+                ],
+        });
+
+        if (typeof res.framework === "string") {
+          framework = res.framework.trim();
+        }
+      }
+
+      if (projectType === "app" && !language) {
+        const res = await prompts({
+          type: "select",
+          name: "language",
+          message: CREATE_MESSAGES.language,
+          choices: [
+            { title: "JavaScript", value: "javascript" },
+            { title: "TypeScript", value: "typescript" },
+          ],
+        });
+
+        if (typeof res.language === "string") {
+          language = res.language.trim();
+        }
+      }
+
+      if (
+        projectType === "contract" &&
+        framework !== "forge" &&
+        framework !== "hardhat"
+      ) {
+        const res = await prompts({
+          type: "select",
+          name: "framework",
+          message: CREATE_MESSAGES.framework,
+          choices: [
+            { title: "Hardhat", value: "hardhat" },
+            { title: "Forge", value: "forge" },
+          ],
+        });
+
+        if (typeof res.framework === "string") {
+          framework = res.framework.trim();
+        }
+      }
+
+      if (!framework) {
+        console.log("Please specify a framework");
+        process.exit(1);
+      }
+
+      if (!language) {
+        // Default = JavaScript
+        language = "javascript";
+      }
+    }
+  }
+
+  if (projectType === "contract") {
+    // Select contract name
+    if (!contractName) {
+      const defaultName = "MyContract";
+      const res = await prompts({
+        type: "text",
+        name: "path",
+        message: CREATE_MESSAGES.contractName,
+        initial: defaultName,
+        validate: (name: string) => {
+          const isValid = /(^[a-z0-9A-Z]+$)|(^[a-z0-9A-Z]+\.sol$)/.test(name);
+          if (isValid) {
+            return true;
+          }
+
+          return `Invalid contract name 'contractName' (only alphanumeric characters allowed)`;
+        },
+      });
+
+      if (typeof res.path === "string") {
+        contractName = res.path.trim();
+      }
+
+      if (!contractName) {
+        console.log(
+          "\nPlease specify the contract name:\n" +
+            `  ${chalk.cyan(
+              "npx thirdweb create --contract --name",
+            )} ${chalk.green("<contract-name>")}\n` +
+            "For example:\n" +
+            `  ${chalk.cyan(
+              "npx thirdweb create --contract --name",
+            )} ${chalk.green("MyContract")}\n\n` +
+            `Run ${chalk.cyan("npx thirdweb --help")} to see all options.`,
+        );
+        process.exit(1);
       }
     }
 
@@ -184,7 +319,9 @@ export async function twCreate(options: any) {
         name: "standard",
         message: CREATE_MESSAGES.contract,
         choices: [
-          { title: "Empty Contract", value: "none" },
+          ...(!onlyContract
+            ? [{ title: "Empty Contract", value: "none" }]
+            : []),
           { title: "ERC721", value: "erc721" },
           { title: "ERC20", value: "erc20" },
           { title: "ERC1155", value: "erc1155" },
@@ -238,20 +375,11 @@ export async function twCreate(options: any) {
         }
       }
     }
-
-    if (!framework) {
-      console.log("Please specify a framework");
-      process.exit(1);
-    }
-
-    if (!language) {
-      // Default = JavaScript
-      language = "javascript";
-    }
   }
 
-  const resolvedProjectPath = path.resolve(projectPath);
-  const projectName = path.basename(resolvedProjectPath);
+  // Resolve project path
+  projectPath = path.resolve(projectPath);
+  const projectName = path.basename(projectPath);
 
   const { valid, problems } = validateNpmName(projectName);
   if (!valid) {
@@ -283,18 +411,21 @@ export async function twCreate(options: any) {
   try {
     if (projectType === "app") {
       await createApp({
-        appPath: resolvedProjectPath,
+        appPath: projectPath,
         packageManager,
         framework,
         language,
         template,
+        chain,
       });
     } else {
-      await createContract({
-        contractPath: resolvedProjectPath,
+      await createContractProject({
+        contractPath: projectPath,
         packageManager,
         framework,
+        contractName,
         baseContract,
+        onlyContract,
       });
     }
   } catch (reason) {

packages/cli/src/create/helpers/create-app.ts

@@ -22,12 +22,14 @@ export async function createApp({
   framework,
   language,
   template,
+  chain,
 }: {
   appPath: string;
   packageManager: PackageManager;
   framework?: string;
   language?: string;
   template?: string;
+  chain?: string;
 }): Promise<void> {
   let frameworkPath = "";
 
@@ -43,7 +45,9 @@ export async function createApp({
       process.exit(1);
     }
   } else if (framework) {
-    frameworkPath = `${framework}-${language || "javascript"}-starter`;
+    frameworkPath = `${framework}-${language || "javascript"}-${
+      chain === "solana" ? "solana-" : ""
+    }starter`;
     const found = await hasTemplate(frameworkPath);
 
     if (!found) {

packages/cli/src/create/helpers/create-contract.ts

@@ -2,6 +2,7 @@ import { hasBaseContract, readBaseContract } from "./base-contracts";
 import { DownloadError } from "./create-app";
 import { PackageManager } from "./get-pkg-manager";
 import { tryGitInit } from "./git";
+import { hasForge } from "./has-forge";
 import { install } from "./install";
 import { isFolderEmpty } from "./is-folder-empty";
 import { getOnline } from "./is-online";
@@ -11,22 +12,28 @@ import { submodules } from "./submodules";
 import { downloadAndExtractRepo } from "./templates";
 import retry from "async-retry";
 import chalk from "chalk";
+import fs from "fs";
 import { writeFile } from "fs/promises";
 import path from "path";
 
-interface ICreateContract {
+interface ICreateContractProject {
   contractPath: string;
   packageManager: PackageManager;
+  contractName: string;
   framework?: string;
   baseContract?: string;
+  onlyContract: boolean;
 }
 
-export async function createContract({
+export async function createContractProject({
   contractPath,
   packageManager,
   framework,
+  contractName,
   baseContract,
-}: ICreateContract) {
+  onlyContract,
+}: ICreateContractProject) {
+  // Check that the selected base contract is valid
   if (baseContract) {
     const found = hasBaseContract(baseContract);
 
@@ -40,8 +47,8 @@ export async function createContract({
     }
   }
 
+  // Check that we have write permission for the specified directory
   const root = path.resolve(contractPath);
-
   if (!(await isWriteable(path.dirname(root)))) {
     console.error(
       "The application path is not writable, please check folder permissions and try again.",
@@ -52,117 +59,179 @@ export async function createContract({
     process.exit(1);
   }
 
-  const projectName = path.basename(root);
-
-  await makeDir(root);
-  if (!isFolderEmpty(root, projectName)) {
+  // Check that the contract name is valid
+  if (!/(^[a-z0-9A-Z]+$)|(^[a-z0-9A-Z]+\.sol$)/.test(contractName)) {
+    console.error(
+      `Contract name ${chalk.red(
+        `"${contractName}"`,
+      )} is not valid (only alphanumeric characters are allowed).`,
+    );
     process.exit(1);
   }
 
+  // Clean the contract name
+  contractName = contractName.replace(/\.sol$/, "") + ".sol";
+
   const useYarn = packageManager === "yarn";
-  const isOnline = !useYarn || (await getOnline());
-  const originalDirectory = process.cwd();
 
-  console.log(
-    `Creating a new thirdweb contracts project in ${chalk.green(root)}.`,
-  );
-  console.log();
-
-  process.chdir(root);
-
-  function isErrorLike(err: unknown): err is { message: string } {
-    return (
-      typeof err === "object" &&
-      err !== null &&
-      typeof (err as { message?: unknown }).message === "string"
-    );
-  }
-
-  try {
-    console.log(`Downloading files. This might take a moment.`);
-
-    let starter = "";
-    if (framework === "hardhat") {
-      starter = "hardhat-javascript-starter";
-    } else if (framework === "forge") {
-      starter = "forge-starter";
-    } else {
-      console.error("Please provide a valid contracts framework.");
+  if (onlyContract) {
+    // If we are already in a contracts project, just create a new contract
+    if (fs.existsSync(path.join(root, contractName))) {
+      console.error(
+        `A contract with the name ${chalk.red(
+          `"${contractName}"`,
+        )} already exists in specified directory.`,
+      );
       process.exit(1);
     }
 
-    await retry(
-      () => downloadAndExtractRepo(root, { name: starter, filePath: "" }),
-      {
-        retries: 3,
-      },
-    );
-
-    // Modify the /contracts/MyContract.sol contents to match the base contract
     if (baseContract && baseContract.length > 0) {
       const baseContractText = readBaseContract(baseContract);
 
       // Set the contents of the Contract.sol file to the base contract
       let contractFile = "";
-      if (framework === "hardhat") {
-        contractFile = path.join(root, "contracts", "Contract.sol");
-      }
-      if (framework === "forge") {
-        contractFile = path.join(root, "src", "Contract.sol");
-      }
+      contractFile = path.join(root, contractName);
 
       // Write the base contract to the MyContract.sol file
       await writeFile(contractFile, baseContractText);
+
+      console.log(
+        `${chalk.green("Success!")} Created ${contractName} at ${contractPath}`,
+      );
     }
-  } catch (reason) {
-    throw new DownloadError(
-      isErrorLike(reason) ? reason.message : String(reason),
-    );
-  }
-
-  console.log("Installing packages. This might take a couple of minutes.");
-  console.log();
-
-  await install(root, null, { packageManager, isOnline });
-  console.log();
-
-  if (tryGitInit(root)) {
-    console.log("Initialized a git repository.");
-    console.log();
-  }
-
-  if (framework === "forge") {
-    await submodules();
-  }
-
-  let cdpath: string;
-  if (path.join(originalDirectory, projectName) === contractPath) {
-    cdpath = projectName;
   } else {
-    cdpath = contractPath;
-  }
+    // Otherwise, create a new contracts project
+    const projectName = path.basename(root);
 
-  console.log(
-    `${chalk.green("Success!")} Created ${projectName} at ${contractPath}`,
-  );
-  console.log();
-  console.log("Inside that directory, you can run several commands:");
-  console.log();
-  console.log(chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} build`));
-  console.log(
-    "    Compiles your contracts and detects thirdweb extensions implemented on them.",
-  );
-  console.log();
-  console.log(chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} deploy`));
-  console.log("    Deploys your contracts with the thirdweb deploy flow.");
-  console.log();
-  console.log(
-    chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} release`),
-  );
-  console.log("    Releases your contracts with the thirdweb release flow.");
-  console.log();
-  console.log("We suggest that you begin by typing:");
-  console.log();
-  console.log(chalk.cyan("  cd"), cdpath);
-  console.log();
+    await makeDir(root);
+    if (!isFolderEmpty(root, projectName)) {
+      process.exit(1);
+    }
+
+    const isOnline = !useYarn || (await getOnline());
+    const originalDirectory = process.cwd();
+
+    console.log(
+      `Creating a new thirdweb contracts project in ${chalk.green(root)}.`,
+    );
+    console.log();
+
+    process.chdir(root);
+
+    function isErrorLike(err: unknown): err is { message: string } {
+      return (
+        typeof err === "object" &&
+        err !== null &&
+        typeof (err as { message?: unknown }).message === "string"
+      );
+    }
+
+    try {
+      console.log(`Downloading files. This might take a moment.`);
+
+      let starter = "";
+      if (framework === "hardhat") {
+        starter = "hardhat-javascript-starter";
+      } else if (framework === "forge") {
+        starter = "forge-starter";
+      } else {
+        console.error("Please provide a valid contracts framework.");
+        process.exit(1);
+      }
+
+      await retry(
+        () => downloadAndExtractRepo(root, { name: starter, filePath: "" }),
+        {
+          retries: 3,
+        },
+      );
+
+      // Add in a new contracts file with specific base contract
+      if (baseContract && baseContract.length > 0) {
+        const baseContractText = readBaseContract(baseContract);
+
+        // Set the filename of the new file and delete the dummy Contract.sol file
+        let contractFile = "";
+        if (framework === "hardhat") {
+          fs.unlinkSync(path.join(root, "contracts", "Contract.sol"));
+          contractFile = path.join(root, "contracts", contractName);
+        }
+        if (framework === "forge") {
+          fs.unlinkSync(path.join(root, "src", "Contract.sol"));
+          contractFile = path.join(root, "src", contractName);
+        }
+
+        // Write the base contract to the new file
+        await writeFile(contractFile, baseContractText);
+      }
+    } catch (reason) {
+      throw new DownloadError(
+        isErrorLike(reason) ? reason.message : String(reason),
+      );
+    }
+
+    console.log("Installing packages. This might take a couple of minutes.");
+    console.log();
+
+    await install(root, null, { packageManager, isOnline });
+    console.log();
+
+    if (tryGitInit(root)) {
+      console.log("Initialized a git repository.");
+      console.log();
+    }
+
+    if (framework === "forge") {
+      await submodules();
+    }
+
+    let cdpath: string;
+    if (path.join(originalDirectory, projectName) === contractPath) {
+      cdpath = projectName;
+    } else {
+      cdpath = contractPath;
+    }
+
+    console.log(
+      `${chalk.green("Success!")} Created ${projectName} at ${contractPath}`,
+    );
+    console.log();
+    console.log("Inside that directory, you can run several commands:");
+    console.log();
+    console.log(
+      chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} build`),
+    );
+    console.log(
+      "    Compiles your contracts and detects thirdweb extensions implemented on them.",
+    );
+    console.log();
+    console.log(
+      chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} deploy`),
+    );
+    console.log("    Deploys your contracts with the thirdweb deploy flow.");
+    console.log();
+    console.log(
+      chalk.cyan(`  ${packageManager}${useYarn ? "" : " run"} release`),
+    );
+    console.log("    Releases your contracts with the thirdweb release flow.");
+    console.log();
+    console.log("We suggest that you begin by typing:");
+    console.log();
+    console.log(chalk.cyan("  cd"), cdpath);
+    console.log();
+
+    if (framework === "forge") {
+      const isInstalled = await hasForge();
+
+      if (!isInstalled) {
+        console.log(
+          `\n${chalk.yellowBright(
+            `warning`,
+          )} You don't have forge installed on this machine, and will need it to run this project! \n\nYou can install forge by following these instructions:\n${chalk.blueBright(
+            `https://book.getfoundry.sh/getting-started/installation`,
+          )}\n`,
+        );
+      }
+    }
+  }
 }

packages/cli/src/create/helpers/has-forge.ts

@@ -0,0 +1,14 @@
+import { exec } from "child_process";
+
+export async function hasForge() {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  return await new Promise((resolve, reject) => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    exec("forge --version", (error, stdout, stderr) => {
+      if (error) {
+        resolve(false);
+      }
+      resolve(true);
+    });
+  });
+}

packages/cli/src/create/helpers/run-command.ts

@@ -1,11 +1,26 @@
 import spawn from "cross-spawn";
 
-export async function runCommand(command: string, args: string[]) {
+export async function runCommand(
+  command: string,
+  args: string[],
+  logging: boolean = false,
+) {
   return new Promise<void>((resolve, reject) => {
     /**
      * Spawn the installation process.
      */
     const child = spawn(command, args);
+    child.stdout?.on("data", (data) => {
+      if (logging) {
+        console.log(data.toString());
+      }
+    });
+
+    child.stderr?.on("error", (err) => {
+      if (logging) {
+        console.error(err);
+      }
+    });
     child.on("close", (code) => {
       if (code !== 0) {
         reject({ command: `${command}` });

packages/cli/src/create/helpers/submodules.ts

@@ -1,5 +1,6 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { runCommand } from "./run-command";
+import { rm, writeFile } from "node:fs/promises";
 
 /**
  * Spawn a package manager installation with either Yarn or NPM.
@@ -8,12 +9,12 @@ import { runCommand } from "./run-command";
  */
 export async function submodules(): Promise<void> {
   // Remove script folder because it clashes with contract templates (and not needed with deploy)
-  await runCommand("rm", ["-rf", "script"]);
+  await rm("script", { recursive: true, force: true });
 
   // Reset and recursively add forge submodules
-  await runCommand("rm", ["-rf", ".gitmodules"]);
-  await runCommand("rm", ["-rf", "lib"]);
-  await runCommand("touch", [".gitmodules"]);
+  await rm(".gitmodules", { recursive: true, force: true });
+  await rm("lib", { recursive: true, force: true });
+  await writeFile(".gitmodules", "");
   await runCommand("git", [
     "submodule",
     "add",

packages/cli/src/deploy/app.ts

@@ -0,0 +1,43 @@
+import NPMDetector from "../core/detection/npm";
+import ViteDetector from "../core/detection/vite";
+import YarnDetector from "../core/detection/yarn";
+import { runCommand } from "../create/helpers/run-command";
+import { upload } from "../storage/command";
+import { DEFAULT_IPFS_GATEWAY } from "@thirdweb-dev/sdk";
+import { ThirdwebStorage } from "@thirdweb-dev/storage";
+
+export async function deployApp(distPath = "dist", projectPath = ".") {
+  const storage = new ThirdwebStorage();
+  const supportedFrameworks = [new ViteDetector()];
+
+  const possibleProjects = supportedFrameworks
+    .filter((detector) => detector.matches(projectPath))
+    .map((detector) => detector.projectType);
+
+  const hasYarn = new YarnDetector().matches(".");
+  const hasNPM = new NPMDetector().matches(".");
+
+  if (possibleProjects.length === 0) {
+    throw new Error("No supported project detected");
+  }
+
+  try {
+    if (hasYarn) {
+      await runCommand("yarn", ["build"]);
+    } else if (hasNPM) {
+      await runCommand("npm", ["build"]);
+    }
+  } catch (err) {
+    console.error("Can't build project");
+    return Promise.reject("Can't build project");
+  }
+
+  try {
+    let url = await upload(storage, distPath);
+    url = url.replace("ipfs://", DEFAULT_IPFS_GATEWAY);
+    return `${url}/index.html`;
+  } catch (err) {
+    console.error("Can't upload project");
+    return Promise.reject("Can't upload project");
+  }
+}

packages/cli/src/deploy/index.ts

@@ -0,0 +1,54 @@
+import { processProject } from "../common/processor";
+import { info, logger } from "../core/helpers/logger";
+import generateDashboardUrl from "../helpers/generate-dashboard-url";
+import { deployApp } from "./app";
+import chalk from "chalk";
+
+type DeployOptions = {
+  name: string;
+  contractVersion: string;
+  app: boolean;
+  path?: string;
+  distPath?: string;
+};
+
+export async function deploy(options: DeployOptions) {
+  if (options.name) {
+    const url = generateDashboardUrl(options.name, options.contractVersion);
+
+    if (!url) {
+      logger.error(
+        chalk.red(
+          `Could not find a contract named ${options.name} ${
+            options.contractVersion || ""
+          }`,
+        ),
+      );
+      return;
+    }
+
+    info(`Open this link to deploy your contract: ${chalk.blueBright(url)}`);
+    return url.toString();
+  }
+
+  if (options.app) {
+    try {
+      let url = await deployApp(options.distPath, options.path);
+      info(`Here is the link to your app: ${chalk.blueBright(url.toString())}`);
+      return url.toString();
+    } catch (err) {
+      logger.error("Failed to deploy app, No compatible project found", err);
+      return Promise.reject(
+        "failed to deploy app, no compatible project found",
+      );
+    }
+  }
+
+  const url = await processProject(options, "deploy");
+  info(
+    `Open this link to deploy your contracts: ${chalk.blueBright(
+      url.toString(),
+    )}`,
+  );
+  return url.toString();
+}

packages/cli/src/helpers/detect-local-packages.ts

@@ -0,0 +1,103 @@
+import { exec } from "child_process";
+
+type PackageManager = "npm" | "yarn" | "pnpm";
+
+interface Installation {
+  packageManager: PackageManager;
+  isGlobal: boolean;
+}
+
+export async function findPackageInstallation(): Promise<
+  Installation | undefined
+> {
+  const isLocal = await isInstalledLocally();
+  if (isLocal) {
+    const packageManager = await import("detect-package-manager").then(
+      ({ detect }) => {
+        return detect();
+      },
+    );
+
+    return { packageManager, isGlobal: false };
+  }
+
+  const isGlobalNpm = await isInstalledGloballyWithNpm();
+  if (isGlobalNpm) {
+    return { packageManager: "npm", isGlobal: true };
+  }
+
+  const isGlobalYarn = await isInstalledGloballyWithYarn();
+  if (isGlobalYarn) {
+    return { packageManager: "yarn", isGlobal: true };
+  }
+
+  const isGlobalPnpm = await isInstalledGloballyWithPnpm();
+  if (isGlobalPnpm) {
+    return { packageManager: "pnpm", isGlobal: true };
+  }
+
+  return undefined;
+}
+
+// For LOCAL packages, npm ls picks up things installed by yarn and pnpm too
+async function isInstalledLocally(): Promise<boolean> {
+  const packages = await detectPackages("npm ls --depth=0");
+  return containsThirdweb(packages || []);
+}
+
+// But for GLOBAL packages, we need to use a separate command for each one
+async function isInstalledGloballyWithNpm(): Promise<boolean> {
+  const packages = await detectPackages("npm ls -g --depth=0");
+  return containsThirdweb(packages || []);
+}
+
+async function isInstalledGloballyWithYarn(): Promise<boolean> {
+  const packages = await detectPackages("yarn --cwd `yarn global dir` list");
+  return containsThirdweb(packages || []);
+}
+
+async function isInstalledGloballyWithPnpm(): Promise<boolean> {
+  const packages: string[] = await new Promise((resolve) => {
+    exec(`pnpm list -g --depth=0`, (err, stdout) => {
+      var pkgs: string[] = [];
+      pkgs = stdout.split("dependencies:")[1]?.trim().split("\n") || [];
+      pkgs = pkgs.map((pkg) => pkg.replace(" ", "@"));
+      resolve(pkgs);
+    });
+  });
+  return containsThirdweb(packages || []);
+}
+
+function containsThirdweb(packages: string[]) {
+  return packages.some((pkg) => pkg.match(/^thirdweb/));
+}
+
+async function detectPackages(cmd: string): Promise<string[]> {
+  return new Promise((resolve) => {
+    exec(cmd, (err, stdout) => {
+      var packages: string[] = [];
+      packages = stdout.split("\n");
+      // We're one short on '-' to support both yarn and npm
+      packages = packages.filter(function (item) {
+        if (item.match(/^├─.+/g) !== null) {
+          return true;
+        }
+        if (item.match(/^└─.+/g) !== null) {
+          return true;
+        }
+        return undefined;
+      });
+      packages = packages
+        .map(function (item) {
+          if (item.match(/^├─.+/g) !== null) {
+            return item.replace(/(^├──\s|^├─\s)/g, "");
+          }
+          if (item.match(/^└─.+/g) !== null) {
+            return item.replace(/(^└──\s|^├─\s)/g, "");
+          }
+        })
+        .filter((item) => !!item) as string[];
+      resolve(packages);
+    });
+  });
+}

packages/cli/src/helpers/generate-dashboard-url.ts

@@ -13,18 +13,18 @@ export default function generateDashboardUrl(
   // Pre-built contract
   else {
     const mapping = {
-      "signature-drop": "drop/signature-drop",
-      "nft-drop": "drop/nft-drop",
-      "edition-drop": "drop/edition-drop",
-      "nft-collection": "token/nft-collection",
-      edition: "token/edition",
-      "token-drop": "drop/token-drop",
-      token: "token/token",
-      marketplace: "marketplace/marketplace",
-      split: "governance/split",
-      vote: "governance/vote",
-      pack: "token/pack",
-      multiwrap: "token/multiwrap",
+      "signature-drop": "SignatureDrop",
+      "nft-drop": "DropERC721",
+      "edition-drop": "DropERC1155",
+      "nft-collection": "TokenERC721",
+      edition: "TokenERC1155",
+      "token-drop": "DropERC20",
+      token: "TokenERC20",
+      marketplace: "Marketplace",
+      split: "Split",
+      vote: "VoteERC20",
+      pack: "Pack",
+      multiwrap: "Multiwrap",
     };
 
     const foundMapping = mapping[name as keyof typeof mapping];
@@ -33,6 +33,6 @@ export default function generateDashboardUrl(
       return undefined;
     }
 
-    return `https://thirdweb.com/contracts/new/pre-built/${foundMapping}`;
+    return `https://thirdweb.com/thirdweb.eth/${foundMapping}`;
   }
 }

packages/cli/src/storage/command.ts

@@ -1,7 +1,5 @@
-import { logger } from "../core/helpers/logger";
 import { spinner } from "../core/helpers/logger";
 import { BufferOrStringWithName, ThirdwebStorage } from "@thirdweb-dev/storage";
-import chalk from "chalk";
 import fs from "fs";
 import path from "path";
 
@@ -33,22 +31,12 @@ export async function upload(
   uploadPath: string,
 ): Promise<string> {
   if (!uploadPath) {
-    logger.error(
-      `Please pass a path to a file or directory to upload with the following format:\n   ${chalk.blueBright(
-        `npx thirdweb@latest upload path/to/file.jpg`,
-      )}\n`,
-    );
-    process.exit(1);
+    return Promise.reject("No path provided");
   }
 
   const pathExists = fs.existsSync(uploadPath);
   if (!pathExists) {
-    logger.error(
-      `Invalid path ${chalk.blueBright(
-        uploadPath,
-      )} provided. Please provide a valid path to a file or directory to upload."`,
-    );
-    process.exit(1);
+    return Promise.reject("Invalid path provided");
   }
 
   let uri = "";
@@ -57,12 +45,7 @@ export async function upload(
     const files = recurseFiles(uploadPath, uploadPath);
 
     if (files.length === 0) {
-      logger.error(
-        `No files detected in specified directory ${chalk.blueBright(
-          uploadPath,
-        )} to upload.`,
-      );
-      process.exit(1);
+      return Promise.reject("No files detected in specified directory");
     }
 
     const spin = spinner(
@@ -82,12 +65,7 @@ export async function upload(
     uri = await storage.upload(file, { uploadWithoutDirectory: true });
     spin.succeed("Succesfully uploaded file to IPFS.");
   } else {
-    logger.error(
-      `Path ${chalk.blueBright(
-        uploadPath,
-      )} does not point to a valid file or directory. Please provide a valid path to a file or directory to upload`,
-    );
-    process.exit(1);
+    return Promise.reject("Invalid path provided");
   }
 
   return uri;

packages/contracts-js/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @thirdweb-dev/contracts-js
 
+## 1.2.3
+
+### Patch Changes
+
+- [#463](https://github.com/thirdweb-dev/js/pull/463) [`557429b`](https://github.com/thirdweb-dev/js/commit/557429b5cfb3af2983ee01cf7d12d41ee0557593) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - PackVRF contract
+
+- [#311](https://github.com/thirdweb-dev/js/pull/311) [`9eaa21d`](https://github.com/thirdweb-dev/js/commit/9eaa21d09ab9c700aea61a2a25f8ca9859d20857) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update to v3.3.0 of contracts package
+
+- [#311](https://github.com/thirdweb-dev/js/pull/311) [`9eaa21d`](https://github.com/thirdweb-dev/js/commit/9eaa21d09ab9c700aea61a2a25f8ca9859d20857) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update to 3.1.10 of contracts package
+
+## 1.2.2
+
+### Patch Changes
+
+- [#438](https://github.com/thirdweb-dev/js/pull/438) [`f451da6`](https://github.com/thirdweb-dev/js/commit/f451da6395689a5f89800ee63f34b6175b61f703) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix SigMint detection for OSRF NFT Collection contracts
+
+## 1.2.1
+
+### Patch Changes
+
+- [#376](https://github.com/thirdweb-dev/js/pull/376) [`4af785c`](https://github.com/thirdweb-dev/js/commit/4af785c37c831ecd7087c1c9eb9095922cac0855) Thanks [@adam-maj](https://github.com/adam-maj)! - Update tiered-drop with tokens claimed
+
+- [#373](https://github.com/thirdweb-dev/js/pull/373) [`6f818f3`](https://github.com/thirdweb-dev/js/commit/6f818f393eb9023b53a3358d62d60ec23a9246bd) Thanks [@adam-maj](https://github.com/adam-maj)! - Update tiered-drop contract version
+
+## 1.2.0
+
+### Minor Changes
+
+- [#333](https://github.com/thirdweb-dev/js/pull/333) [`aa6d9ed`](https://github.com/thirdweb-dev/js/commit/aa6d9ed75d126d7a0cca9fb8fc389ff94e9d1e14) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Update to contracts package v3.2.0
+
 ## 1.1.9
 
 ### Patch Changes

packages/contracts-js/factories/TWMultichainRegistryLogic__factory/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryLogic__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryLogic__factory.esm.js"
+}

packages/contracts-js/factories/TWMultichainRegistryRouter__factory/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryRouter__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryRouter__factory.esm.js"
+}

packages/contracts-js/factories/TWMultichainRegistryStorage__factory/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryStorage__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistryStorage__factory.esm.js"
+}

packages/contracts-js/factories/TWMultichainRegistry__factory/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistry__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWMultichainRegistry__factory.esm.js"
+}

packages/contracts-js/factories/TWRegistryLegacy__factory/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWRegistryLegacy__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWRegistryLegacy__factory.esm.js"
+}

packages/contracts-js/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@thirdweb-dev/contracts-js",
-  "version": "1.1.9",
+  "version": "1.2.3",
   "main": "dist/thirdweb-dev-contracts-js.cjs.js",
   "module": "dist/thirdweb-dev-contracts-js.esm.js",
   "license": "Apache-2.0",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js",
   "dependencies": {
-    "@thirdweb-dev/contracts": "3.1.8-0"
+    "@thirdweb-dev/contracts": "3.3.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-typescript": "^7.18.6",
     "@preconstruct/cli": "^2.2.1",
     "@typechain/ethers-v5": "10.0.0",
-    "ethers": "^5.7.0",
+    "ethers": "^5.7.2",
     "typechain": "^8.1.0",
     "typescript": "^4.7.4"
   },

packages/eslint-config-thirdweb/index.js

@@ -11,7 +11,8 @@ module.exports = {
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-non-null-assertion": "error",
     "@typescript-eslint/no-parameter-properties": "error",
-    "@typescript-eslint/no-unused-vars": "warn",
+    // making this an error going forward
+    "@typescript-eslint/no-unused-vars": "error",
 
     // import rules
     "import/first": "error",

packages/eslint-config-thirdweb/package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^5.33.0",
     "@typescript-eslint/parser": "^5.33.0",
-    "eslint-config-next": "^12.0.8",
+    "eslint-config-next": "12.3.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-turbo": "latest",
     "eslint-plugin-react": "^7.28.0"

packages/pay/.babelrc

@@ -0,0 +1,6 @@
+{
+  "presets": [
+    "@babel/preset-typescript",
+    ["@babel/preset-env", { "targets": "defaults, not ie 11" }]
+  ]
+}

packages/pay/.eslintignore

@@ -0,0 +1,4 @@
+# folders
+dist/
+
+# files

packages/pay/.eslintrc.cjs

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ["thirdweb"],
+};

packages/pay/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @thirdweb-dev/pay
+
+## 0.1.0
+
+### Minor Changes
+
+- [#433](https://github.com/thirdweb-dev/js/pull/433) [`7269268`](https://github.com/thirdweb-dev/js/commit/72692689e9adb41e92038765fd01a36c2b7457e1) Thanks [@jnsdls](https://github.com/jnsdls)! - Initialize Pay Package

packages/pay/README.md

@@ -0,0 +1,16 @@
+<p align="center">
+<br />
+<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/js/blob/main/packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
+<br />
+</p>
+<h1 align="center">thirdweb wallets</h1>
+<p align="center">
+<!-- <a href="https://www.npmjs.com/package/@thirdweb-dev/sdk"><img src="https://img.shields.io/npm/v/@thirdweb-dev/sdk?color=red&label=npm&logo=npm" alt="npm version"/></a> -->
+<!-- <a href="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml"><img alt="Build Status" src="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml/badge.svg"/></a> -->
+<!-- <a href="https://discord.gg/thirdweb"><img alt="Join our Discord!" src="https://img.shields.io/discord/834227967404146718.svg?color=7289da&label=discord&logo=discord&style=flat"/></a> -->
+
+</p>
+<!-- <p align="center"><strong>Best in class Web3 SDK for Browser, Node and Mobile apps</strong></p> -->
+<br />
+
+### todo

packages/pay/integrations/coinbase/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-pay-integrations-coinbase.cjs.js",
+  "module": "dist/thirdweb-dev-pay-integrations-coinbase.esm.js"
+}

packages/pay/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "@thirdweb-dev/pay",
+  "version": "0.1.0",
+  "main": "dist/thirdweb-dev-pay.cjs.js",
+  "module": "dist/thirdweb-dev-pay.esm.js",
+  "exports": {
+    ".": {
+      "module": "./dist/thirdweb-dev-pay.esm.js",
+      "default": "./dist/thirdweb-dev-pay.cjs.js"
+    },
+    "./integrations/coinbase": {
+      "module": "./integrations/coinbase/dist/thirdweb-dev-pay-integrations-coinbase.esm.js",
+      "default": "./integrations/coinbase/dist/thirdweb-dev-pay-integrations-coinbase.cjs.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/pay",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/thirdweb-dev/js/issues"
+  },
+  "author": "thirdweb eng <[email protected]>",
+  "files": [
+    "dist/",
+    "integrations/"
+  ],
+  "preconstruct": {
+    "entrypoints": [
+      "index.ts",
+      "integrations/**"
+    ],
+    "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
+      "exports": true
+    },
+    "exports": true
+  },
+  "sideEffects": false,
+  "dependencies": {
+    "@coinbase/cbpay-js": "^1.6.0"
+  },
+  "devDependencies": {
+    "@preconstruct/cli": "^2.2.1",
+    "typescript": "^4.7.4"
+  },
+  "scripts": {
+    "format": "prettier --write 'src/**/*'",
+    "lint": "eslint src/",
+    "fix": "eslint src/ --fix",
+    "clean": "rm -rf dist/",
+    "build": "tsc && preconstruct build",
+    "push": "yalc push"
+  }
+}

packages/pay/src/index.ts

@@ -0,0 +1 @@
+export * from "./integrations/coinbase";

packages/pay/src/integrations/coinbase/index.ts

@@ -0,0 +1,62 @@
+import { initOnRamp, InitOnRampParams } from "@coinbase/cbpay-js";
+
+interface CoinbasePayOptions extends Pick<InitOnRampParams, "appId"> {}
+
+const CHAIN_ID_MAP = {
+  [-1]: "solana",
+  1: "ethereum",
+  69: "optimism",
+  137: "polygon",
+} as const;
+
+export type FundWalletOptions = {
+  address: string;
+  chainId: keyof typeof CHAIN_ID_MAP;
+  assets?: string[];
+};
+
+export class CoinbasePayIntegration {
+  #appId: string;
+  constructor(options: CoinbasePayOptions) {
+    this.#appId = options.appId;
+  }
+
+  async fundWallet(opts: FundWalletOptions): Promise<void> {
+    const { address, chainId, assets } = opts;
+
+    return new Promise((res, rej) => {
+      initOnRamp(
+        {
+          appId: this.#appId,
+          widgetParameters: {
+            destinationWallets: [
+              {
+                address,
+                assets,
+                supportedNetworks: [CHAIN_ID_MAP[chainId]],
+              },
+            ],
+          },
+          experienceLoggedIn: "embedded",
+          experienceLoggedOut: "popup",
+          closeOnExit: true,
+          onSuccess: () => {
+            res();
+          },
+          onExit(error) {
+            if (error) {
+              return rej(error);
+            }
+            return res();
+          },
+        },
+        (err, instance) => {
+          if (err || !instance) {
+            return rej(err);
+          }
+          instance.open();
+        },
+      );
+    });
+  }
+}

packages/pay/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "extends": "@thirdweb-dev/tsconfig/sdk.json",
+  "include": ["src", "types"],
+  "exclude": ["dist", "build", "node_modules"]
+}

packages/react/CHANGELOG.md

@@ -1,5 +1,180 @@
 # @thirdweb-dev/react
 
+## 3.6.11
+
+### Patch Changes
+
+- [#507](https://github.com/thirdweb-dev/js/pull/507) [`5047686`](https://github.com/thirdweb-dev/js/commit/5047686f2afbca4fa32b1bbb6bcf4419bd17cf8d) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix ConnectWallet network selector showing all options three times
+
+## 3.6.10
+
+## 3.6.9
+
+## 3.6.8
+
+### Patch Changes
+
+- [#454](https://github.com/thirdweb-dev/js/pull/454) [`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0) Thanks [@jnsdls](https://github.com/jnsdls)! - upgraded dependencies
+
+- [#422](https://github.com/thirdweb-dev/js/pull/422) [`08d04fe`](https://github.com/thirdweb-dev/js/commit/08d04fe4dc74ba0d12625d7d4004c23f7dc330a2) Thanks [@yehia67](https://github.com/yehia67)! - Add `btnTitle` prop to the `ConnectWallet` component. Now you can set customized string or child component to the connect button.
+
+## 3.6.7
+
+### Patch Changes
+
+- [#448](https://github.com/thirdweb-dev/js/pull/448) [`7a37e56`](https://github.com/thirdweb-dev/js/commit/7a37e564fd5d5a9df84c8da44ecaf6c42f67a0e2) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - allow `useContract` to fail faster to enable the import case
+
+## 3.6.6
+
+### Patch Changes
+
+- [#443](https://github.com/thirdweb-dev/js/pull/443) [`8c6cdaa`](https://github.com/thirdweb-dev/js/commit/8c6cdaa2887fb2cc40d3ee6991233d195d103805) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix magic link connector not connecting to the right chain
+
+## 3.6.5
+
+## 3.6.4
+
+### Patch Changes
+
+- [#425](https://github.com/thirdweb-dev/js/pull/425) [`f545a67`](https://github.com/thirdweb-dev/js/commit/f545a67e9fb597d27bb39ca515d24d306fbb121a) Thanks [@adam-maj](https://github.com/adam-maj)! - Add sameSite none and include credentials
+
+- [#420](https://github.com/thirdweb-dev/js/pull/420) [`639e535`](https://github.com/thirdweb-dev/js/commit/639e535ed55280ad9d081001aab3f5af72bb3e45) Thanks [@jnsdls](https://github.com/jnsdls)! - update deps
+
+## 3.6.3
+
+## 3.6.2
+
+### Patch Changes
+
+- [#405](https://github.com/thirdweb-dev/js/pull/405) [`ccb7db4`](https://github.com/thirdweb-dev/js/commit/ccb7db48739b8dddcb2c032b3b6e3e5200485715) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Add updateAll param to creators and royalty update hooks for Solana
+
+## 3.6.1
+
+### Patch Changes
+
+- [#392](https://github.com/thirdweb-dev/js/pull/392) [`846022e`](https://github.com/thirdweb-dev/js/commit/846022e2cfb12b846aae029b85899fb72fd2c9ad) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix unlimited price for useActiveClaimConditionForWallet
+
+- [#388](https://github.com/thirdweb-dev/js/pull/388) [`7c0744a`](https://github.com/thirdweb-dev/js/commit/7c0744a006e78987ad8b271b2c64f4bac7759510) Thanks [@adam-maj](https://github.com/adam-maj)! - Add support for total supply and pagination on get all
+
+## 3.6.0
+
+### Patch Changes
+
+- [#386](https://github.com/thirdweb-dev/js/pull/386) [`612bcdd`](https://github.com/thirdweb-dev/js/commit/612bcdd16fc242d8b04bc70d609e44b0df47ed3f) Thanks [@jnsdls](https://github.com/jnsdls)! - [Gnosis Connector] - switch to safe.global hostname & add support for bsc and optimism chains
+
+- [#364](https://github.com/thirdweb-dev/js/pull/364) [`7cb8e59`](https://github.com/thirdweb-dev/js/commit/7cb8e59be48dc923316eb36ab43a1bef7364f6b1) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Add experimental `useActiveClaimConditionForWallet()` hook
+
+## 3.5.2
+
+### Patch Changes
+
+- [#369](https://github.com/thirdweb-dev/js/pull/369) [`2d3fca5`](https://github.com/thirdweb-dev/js/commit/2d3fca52373046c88392139922e9c9da79f9a2d4) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Add useClaimerProofs hook
+
+- [#378](https://github.com/thirdweb-dev/js/pull/378) [`32d91ef`](https://github.com/thirdweb-dev/js/commit/32d91ef709c8fb92a903e52c65b27538a80ea4eb) Thanks [@mykcryptodev](https://github.com/mykcryptodev)! - round borders for buttons and menus on safari
+
+- [#377](https://github.com/thirdweb-dev/js/pull/377) [`b79dc18`](https://github.com/thirdweb-dev/js/commit/b79dc18f7ab5155bbf4af02dc1a953546160bad0) Thanks [@adam-maj](https://github.com/adam-maj)! - Add event filters
+
+## 3.5.1
+
+## 3.5.0
+
+## 3.4.5
+
+## 3.4.4
+
+### Patch Changes
+
+- [#356](https://github.com/thirdweb-dev/js/pull/356) [`cc4613b`](https://github.com/thirdweb-dev/js/commit/cc4613b5fd69840f4f9cfd0ac1c4e6743e62fe52) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Add Pack and Multiwrap as NFTContract types
+
+## 3.4.3
+
+### Patch Changes
+
+- [#353](https://github.com/thirdweb-dev/js/pull/353) [`1c24c3c`](https://github.com/thirdweb-dev/js/commit/1c24c3c3c48476a824f817e09e7bf0fbe67c1db5) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Add useUpdateCreators hook, fix CreatorInput schema
+
+## 3.4.2
+
+### Patch Changes
+
+- [#348](https://github.com/thirdweb-dev/js/pull/348) [`7d9a4c6`](https://github.com/thirdweb-dev/js/commit/7d9a4c6abcad1b4f43e431ce7b0b38db9016ea9a) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - [SOL] - add `useUpdateRoyaltySettings()` hook
+  [SOL] - change `useRoyalty()` hook -> `useRoyaltySettings()` for consistency
+
+- [#352](https://github.com/thirdweb-dev/js/pull/352) [`3522917`](https://github.com/thirdweb-dev/js/commit/352291791ee900e1500f84f095290497934d2f60) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - expose useExecuteAuctionSale and useAcceptDirectListingOffer
+
+- [#351](https://github.com/thirdweb-dev/js/pull/351) [`aabbb14`](https://github.com/thirdweb-dev/js/commit/aabbb149e81d6824015a4797b2b6c929ca359545) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - fix wallet connection during dev (hot reload)
+
+## 3.4.1
+
+### Patch Changes
+
+- [#343](https://github.com/thirdweb-dev/js/pull/343) [`72227b2`](https://github.com/thirdweb-dev/js/commit/72227b2e166a3a68bbb41cf2b389322f5b7547a2) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Expose new useOffers and useMakeOffer hooks
+
+## 3.4.0
+
+### Minor Changes
+
+- [#327](https://github.com/thirdweb-dev/js/pull/327) [`ef27aad`](https://github.com/thirdweb-dev/js/commit/ef27aad0aafc4577e85f44dc77dfbe880bd239b5) Thanks [@jnsdls](https://github.com/jnsdls)! - Gnosis Safe and Magic Link connectors are no longer included in the default export. They are now available as named exports instead.
+
+  ## Gnosis Safe
+
+  ### Connector
+
+  ```diff
+  - import { GnosisSafeConnector } from "@thirdweb-dev/react";
+  + import { GnosisSafeConnector } from "@thirdweb-dev/react/evm/connectors/gnosis-safe";
+  ```
+
+  ### Hook
+
+  ```diff
+  - import { useGnosis } from "@thirdweb-dev/react";
+  + import { useGnosis } from "@thirdweb-dev/react/evm/connectors/gnosis-safe";
+  ```
+
+  ## Magic Link
+
+  ### Connector
+
+  ```diff
+  - import { MagicLink } from "@thirdweb-dev/react";
+  + import { MagicConnector } from "@thirdweb-dev/react/evm/connectors/magic";
+  ```
+
+  ### Hook
+
+  ```diff
+  - import { useMagic } from "@thirdweb-dev/react";
+  + import { useMagic } from "@thirdweb-dev/react/evm/connectors/magic";
+  ```
+
+### Patch Changes
+
+- [#339](https://github.com/thirdweb-dev/js/pull/339) [`b03a902`](https://github.com/thirdweb-dev/js/commit/b03a9021451b79f802f682f66e5ae8e9355d7e6f) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Fix docs for some functions
+
+## 3.3.1
+
+## 3.3.0
+
+## 3.2.6
+
+### Patch Changes
+
+- [#316](https://github.com/thirdweb-dev/js/pull/316) [`6ae5266`](https://github.com/thirdweb-dev/js/commit/6ae52664e5865564cd4fc2e00e3120675b9e0ca3) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix SIWE when using an external signer
+
+- [#310](https://github.com/thirdweb-dev/js/pull/310) [`9727502`](https://github.com/thirdweb-dev/js/commit/9727502eb30ac139382b7c7c8e8fc0967cbfbcf1) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - [SOL] - add useMintNFTSupply hook in react and accomodate inputs for it in SDK
+
+- [#319](https://github.com/thirdweb-dev/js/pull/319) [`2f8ec89`](https://github.com/thirdweb-dev/js/commit/2f8ec89c4c83ae577092c840c198e6fcfb114e69) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Expose total claimed and unclaimed supply for erc721 drop contracts
+
+- [#318](https://github.com/thirdweb-dev/js/pull/318) [`bb1b4e6`](https://github.com/thirdweb-dev/js/commit/bb1b4e6ac39d98cc68b8e31e659cd68be3a5b967) Thanks [@nachoiacovino](https://github.com/nachoiacovino)! - Add useMinimumNextBid hook and change invariant for other marketplace hooks
+
+## 3.2.5
+
+## 3.2.4
+
+### Patch Changes
+
+- [#301](https://github.com/thirdweb-dev/js/pull/301) [`86f0cef`](https://github.com/thirdweb-dev/js/commit/86f0ceff46f72df8ebd81f843e3c66a245f23992) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Remove useAddress hook for now
+
 ## 3.2.3
 
 ### Patch Changes

packages/react/MIGRATION_GUIDE.md

@@ -26,11 +26,11 @@ The `useContractCall` hook to call a smart contract function has been renamed to
 
 ### Prebuilt Contract Hooks
 
-Hooks to connect to prebuilt contracts such as `useNFTDrop` and `useMarketplace` are now deprecated in favour of using the generic `useContract` hook:
+Hooks to connect to prebuilt contracts such as `useNFTDrop` and `useMarketplace` are now deprecated in favour of using the generic `useContract` hook followed by the contract type:
 
 ```diff
 - const contract = useNFTDrop("0x...")
-+ const { contract } = useContract("0x...")
++ const { contract } = useContract("0x...", "nft-drop")
 ```
 
 You can currently still continue to use the prebuilt hooks, however they provide a warning in the console informing you of their deprecation. We will likely remove these hooks in a future version of the SDK.

packages/react/README.md

@@ -191,7 +191,7 @@ export default function Home() {
         <div>
           {nfts.map((nft) => (
             <ThirdwebNftMedia
-              key={nft.tokenId}
+              key={nft.metadata.id}
               metadata={nft.metadata}
               height={200}
             />

packages/react/evm/connectors/gnosis-safe/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-react-evm-connectors-gnosis-safe.cjs.js",
+  "module": "dist/thirdweb-dev-react-evm-connectors-gnosis-safe.esm.js"
+}

packages/react/evm/connectors/magic/package.json

@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-react-evm-connectors-magic.cjs.js",
+  "module": "dist/thirdweb-dev-react-evm-connectors-magic.esm.js"
+}

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react",
-  "version": "3.2.3",
+  "version": "3.6.11",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",
@@ -20,6 +20,14 @@
       "module": "./solana/dist/thirdweb-dev-react-solana.esm.js",
       "default": "./solana/dist/thirdweb-dev-react-solana.cjs.js"
     },
+    "./evm/connectors/magic": {
+      "module": "./evm/connectors/magic/dist/thirdweb-dev-react-evm-connectors-magic.esm.js",
+      "default": "./evm/connectors/magic/dist/thirdweb-dev-react-evm-connectors-magic.cjs.js"
+    },
+    "./evm/connectors/gnosis-safe": {
+      "module": "./evm/connectors/gnosis-safe/dist/thirdweb-dev-react-evm-connectors-gnosis-safe.esm.js",
+      "default": "./evm/connectors/gnosis-safe/dist/thirdweb-dev-react-evm-connectors-gnosis-safe.cjs.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -31,7 +39,8 @@
     "entrypoints": [
       "index.ts",
       "solana/index.ts",
-      "evm/index.ts"
+      "evm/index.ts",
+      "evm/connectors/**.ts"
     ],
     "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
       "exports": true
@@ -49,13 +58,11 @@
     "generate-docs:solana": "api-extractor run --local --config ./config/api-extractor-solana.json && api-documenter markdown -i ./temp -o ./docs/solana && rm -rf ./temp-solana && mv ./temp ./temp-solana",
     "generate-snippets": "node ./scripts/generate-snippets-evm.mjs && node ./scripts/generate-snippets-solana.mjs && node ./scripts/generate-feature-snippets-evm.mjs",
     "build": "tsc && preconstruct build",
-    "e2e": "yarn test-ct",
-    "test-ct": "playwright test -c playwright-ct.config.ts",
     "push": "yalc push"
   },
   "sideEffects:": false,
   "devDependencies": {
-    "@babel/core": "^7.18.10",
+    "@babel/core": "^7.19.3",
     "@babel/preset-env": "^7.18.10",
     "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.18.6",
@@ -63,15 +70,12 @@
     "@microsoft/api-documenter": "^7.19.4",
     "@microsoft/api-extractor": "^7.29.2",
     "@microsoft/tsdoc": "^0.14.1",
-    "@playwright/experimental-ct-react": "1.25.1",
-    "@playwright/test": "1.25.1",
     "@preconstruct/cli": "^2.2.1",
     "@solana/wallet-adapter-base": "^0.9.17",
     "@solana/wallet-adapter-react": "^0.15.19",
     "@solana/wallet-adapter-wallets": "^0.19.0",
-    "@solana/web3.js": "^1.63.0",
+    "@solana/web3.js": "^1.62.0",
     "@thirdweb-dev/sdk": "*",
-    "@thirdweb-dev/solana": "*",
     "@types/color": "^3.0.3",
     "@types/mime": "^3.0.1",
     "@types/react": "^18.0.5",
@@ -84,7 +88,7 @@
     "eslint-plugin-inclusive-language": "^2.2.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-tsdoc": "^0.2.16",
-    "ethers": "^5.7.1",
+    "ethers": "^5.7.2",
     "prettier": "^2.7.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -93,18 +97,19 @@
   "dependencies": {
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",
-    "@gnosis.pm/safe-core-sdk": "2.1.0",
-    "@gnosis.pm/safe-ethers-adapters": "0.1.0-alpha.9",
-    "@gnosis.pm/safe-ethers-lib": "1.1.0",
     "@react-icons/all-files": "^4.1.0",
+    "@safe-global/safe-core-sdk": "^3.2.0",
+    "@safe-global/safe-ethers-adapters": "0.1.0-alpha.13",
+    "@safe-global/safe-ethers-lib": "^1.7.0",
+    "@solana/wallet-adapter-phantom": "^0.9.17",
     "@tanstack/react-query": "^4.0.10",
-    "@zag-js/menu": "0.1.14",
-    "@zag-js/react": "0.1.16",
+    "@zag-js/menu": "^0.3.0",
+    "@zag-js/react": "^0.3.1",
     "buffer": "^6.0.3",
     "color": "^4.2.3",
     "copy-to-clipboard": "^3.3.2",
     "detect-browser": "^5.3.0",
-    "magic-sdk": "^8.1.1",
+    "magic-sdk": "^10.1.0",
     "mime": "^3.0.0",
     "react-cool-dimensions": "^2.0.7",
     "tiny-invariant": "^1.2.0",
@@ -114,7 +119,7 @@
     "@solana/wallet-adapter-base": "^0.9.17",
     "@solana/wallet-adapter-react": "^0.15.19",
     "@solana/wallet-adapter-wallets": "^0.19.0",
-    "@solana/web3.js": "^1.63.0",
+    "@solana/web3.js": "^1.62.0",
     "@thirdweb-dev/sdk": "*",
     "ethers": ">=5.5.1",
     "react": ">=18.0.0",
@@ -136,9 +141,6 @@
     },
     "@solana/web3.js": {
       "optional": true
-    },
-    "@thirdweb-dev/solana": {
-      "optional": true
     }
   }
 }

packages/react/playwright-ct.config.ts

@@ -1,57 +0,0 @@
-import type { PlaywrightTestConfig } from "@playwright/experimental-ct-react";
-import { devices } from "@playwright/experimental-ct-react";
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-const config: PlaywrightTestConfig = {
-  testDir: "./",
-  /* The base directory, relative to the config file, for snapshot files created with toMatchSnapshot and toHaveScreenshot. */
-  snapshotDir: "./__snapshots__",
-  /* Maximum time one test can run for. */
-  timeout: 10 * 1000,
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  // workers: process.env.CI ? 1 : undefined,
-  // we can use parallel tests because we have more cores now
-  workers: undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: "html",
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: "on-first-retry",
-
-    /* Port to use for Playwright component endpoint. */
-    ctPort: 3100,
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: "chromium",
-      use: {
-        ...devices["Desktop Chrome"],
-      },
-    },
-    {
-      name: "firefox",
-      use: {
-        ...devices["Desktop Firefox"],
-      },
-    },
-    {
-      name: "webkit",
-      use: {
-        ...devices["Desktop Safari"],
-      },
-    },
-  ],
-};
-
-export default config;

packages/react/playwright/index.ts

@@ -1,4 +0,0 @@
-// Import styles, initialize component theme here.
-// import '../src/common.css';
-
-export {};

packages/react/src/core/query-utils/query-key.ts

@@ -1,4 +1,4 @@
-import { RequiredParam } from "../types/shared";
+import { RequiredParam } from "./required-param";
 import type { QueryKey } from "@tanstack/react-query";
 import type { ValidContractInstance } from "@thirdweb-dev/sdk";
 import type {

packages/react/src/core/query-utils/required-param.ts

@@ -0,0 +1,15 @@
+import invariant from "tiny-invariant";
+
+/**
+ * Makes a parameter required to be passed, but still allowes it to be null or undefined.
+ *
+ * @beta
+ */
+export type RequiredParam<T> = T | null | undefined;
+
+export function requiredParamInvariant<TValue>(
+  condition: RequiredParam<TValue>,
+  message?: string,
+): asserts condition {
+  invariant(condition !== null || condition !== undefined, message);
+}

packages/react/src/core/types/shared.ts

@@ -1,6 +0,0 @@
-/**
- * Makes a parameter required to be passed, but still allowes it to be null or undefined.
- *
- * @beta
- */
-export type RequiredParam<T> = T | null | undefined;

packages/react/src/evm/components/ConnectWallet/ConnectWallet.spec.tsx

@@ -1,15 +0,0 @@
-import { ConnectWallet } from ".";
-import { ThirdwebProvider } from "../../providers/full";
-import { test, expect } from "@playwright/experimental-ct-react";
-
-test.use({ viewport: { width: 500, height: 500 } });
-
-test("should render the connect wallet button", async ({ mount }) => {
-  const component = await mount(
-    <ThirdwebProvider desiredChainId={1}>
-      <ConnectWallet />
-    </ThirdwebProvider>,
-  );
-
-  await expect(component).toContainText("Connect Wallet");
-});

packages/react/src/evm/components/ConnectWallet/NetworkSelect.tsx

@@ -11,23 +11,17 @@ export const SupportedNetworkSelect: React.FC<SupportedNetworkSelectProps> = ({
   disabledChainIds,
   ...selectProps
 }) => {
-  const deprecatedNetworks = useMemo(() => {
-    return SUPPORTED_CHAIN_IDS.map((supportedChain) => {
+  const { mainnets, testnets } = useMemo(() => {
+    const networks = SUPPORTED_CHAIN_IDS.map((supportedChain) => {
       return getChainFromChainId(supportedChain);
-    }).filter((n) => !!n.deprecated);
+    });
+
+    return {
+      mainnets: networks.filter((n) => !n.testnet),
+      testnets: networks.filter((n) => n.testnet),
+    };
   }, []);
 
-  const testnets = useMemo(() => {
-    return SUPPORTED_CHAIN_IDS.map((supportedChain) => {
-      return getChainFromChainId(supportedChain);
-    }).filter((n) => n.testnet && !n.deprecated);
-  }, []);
-
-  const mainnets = useMemo(() => {
-    return SUPPORTED_CHAIN_IDS.map((supportedChain) => {
-      return getChainFromChainId(supportedChain);
-    }).filter((n) => !n.testnet && !n.deprecated);
-  }, []);
   return (
     <Select {...selectProps}>
       <option disabled value={-1}>
@@ -55,17 +49,6 @@ export const SupportedNetworkSelect: React.FC<SupportedNetworkSelectProps> = ({
           </option>
         ))}
       </optgroup>
-      <optgroup label="Deprecated">
-        {deprecatedNetworks.map((tn) => (
-          <option
-            key={tn.id}
-            value={tn.id}
-            disabled={disabledChainIds?.includes(tn.id)}
-          >
-            {tn.name} ({tn.nativeCurrency?.symbol})
-          </option>
-        ))}
-      </optgroup>
     </Select>
   );
 };

packages/react/src/evm/components/ConnectWallet/index.tsx

@@ -63,6 +63,7 @@ interface ConnectWalletProps extends ThemeProviderProps {
     loginOptional?: boolean;
   };
   className?: string;
+  btnTitle?: JSX.Element | string;
 }
 
 let connecting = false;
@@ -120,6 +121,7 @@ const chainIdToCurrencyMap: Record<
 export const ConnectWallet: React.FC<ConnectWalletProps> = ({
   auth,
   className,
+  btnTitle,
   ...themeProps
 }) => {
   const id = useId();
@@ -144,7 +146,7 @@ export const ConnectWallet: React.FC<ConnectWalletProps> = ({
     },
     connect,
   ] = useConnect();
-  const disconnect = useDisconnect({ reconnectAfterGnosis: false });
+  const disconnect = useDisconnect({ reconnectPrevious: false });
 
   const supportedConnectors = connectors.filter((c) =>
     SUPPORTED_CONNECTORS.includes(c.id as typeof SUPPORTED_CONNECTORS[number]),
@@ -248,7 +250,9 @@ export const ConnectWallet: React.FC<ConnectWalletProps> = ({
               </span>
             )
           ) : (
-            <span style={{ whiteSpace: "nowrap" }}>Connect Wallet</span>
+            <span style={{ whiteSpace: "nowrap" }}>
+              {btnTitle || "Connect Wallet"}
+            </span>
           )}
         </Button>
 

packages/react/src/evm/components/NftMedia.tsx

@@ -13,12 +13,14 @@ export interface ThirdwebNftMediaProps extends SharedMediaProps {
 }
 
 /**
+ * This component can be used to render NFTs from the thirdweb SDK.
+ * Props: {@link ThirdwebNftMediaProps}
  *
  * @example
  * ```jsx
- * import { ThirdwebNftMedia, useNFTCollection, useNFT } from "@thirdweb-dev/react";
+ * import { ThirdwebNftMedia, useContract, useNFT } from "@thirdweb-dev/react";
  * export default function NFTCollectionRender() {
- *   const contract = useNFTCollection(<your-contract-address>);
+ *   const { contract } = useContract(<your-contract-address>);
  *   const { data: nft, isLoading } = useNFT(contract, 0);
  *
  *   return (
@@ -32,11 +34,6 @@ export interface ThirdwebNftMediaProps extends SharedMediaProps {
  *   );
  * }
  * ```
- *
- * Use this to get the primary sales recipient of your {@link SmartContract}
- * @param contract - an instance of a {@link SmartContract}
- * @returns the wallet address of the primary sales recipient
- * @beta
  */
 export const ThirdwebNftMedia = React.forwardRef<
   HTMLMediaElement,

packages/react/src/evm/components/Web3Button/Web3Button.spec.tsx

@@ -1,16 +0,0 @@
-import { Web3Button } from ".";
-import { ThirdwebProvider } from "../../providers/full";
-import { test, expect } from "@playwright/experimental-ct-react";
-
-test.use({ viewport: { width: 500, height: 500 } });
-
-test("should render the connect wallet button", async ({ mount }) => {
-  const component = await mount(
-    <ThirdwebProvider desiredChainId={1}>
-      <Web3Button contractAddress="0x123" action={() => undefined}>
-        Do the thing
-      </Web3Button>
-    </ThirdwebProvider>,
-  );
-  await expect(component).toContainText("Connect Wallet");
-});

packages/react/src/evm/components/shared/Button/index.tsx

@@ -37,8 +37,19 @@ const BaseButton = styled.button<BaseButtonProps>`
     cursor: not-allowed;
   }
   &:focus {
-    outline: 2px solid ${(props) => (props.theme as TwUiTheme).colors.accent};
-    outline-offset: 1px;
+    position: relative;
+    border-radius: 0.5em;
+    outline: 0;
+  }
+  &:focus:after {
+    content: "";
+    position: absolute;
+    top: -5px;
+    right: -5px;
+    bottom: -5px;
+    left: -5px;
+    border: 2px solid ${(props) => (props.theme as TwUiTheme).colors.accent};
+    border-radius: 11px;
   }
 `;
 

packages/react/src/evm/components/shared/Menu/Menu.tsx

@@ -8,10 +8,23 @@ export const Menu = styled.ul<MenuProps>`
   margin: 0;
   background: ${(props) => (props.theme as TwUiTheme).colors.background};
   color: ${(props) => (props.theme as TwUiTheme).colors.text};
-  outline-color: ${(props) => (props.theme as TwUiTheme).colors.accent};
-  outline-style: solid;
-  outline-offset: 0px;
   list-style: none;
   border-radius: 0.5em;
   overflow: hidden;
+  position: relative;
+  pointer-events: auto;
+  &:focus {
+    outline: 0;
+  }
+  &:after {
+    content: "";
+    position: absolute;
+    border: 1px solid ${(props) => (props.theme as TwUiTheme).colors.accent};
+    border-radius: 0.5em;
+    pointer-events: none;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+  }
 `;

packages/react/src/evm/connectors/gnosis-safe.ts

@@ -1,14 +1,29 @@
-import { ChainId } from "@thirdweb-dev/sdk";
+import { useConnect } from "../hooks/wagmi-required/useConnect";
 import { Signer, ethers, utils } from "ethers";
 import invariant from "tiny-invariant";
-import { Chain, Connector, ConnectorData, normalizeChainId } from "wagmi";
+import {
+  Chain,
+  Connector,
+  ConnectorData,
+  normalizeChainId,
+  useContext as useWagmiContext,
+} from "wagmi";
 
+// exerpt from https://docs.gnosis-safe.io/backend/available-services
 const CHAIN_ID_TO_GNOSIS_SERVER_URL = {
-  [ChainId.Mainnet]: "https://safe-transaction.mainnet.gnosis.io",
-  [ChainId.Avalanche]: "https://safe-transaction.avalanche.gnosis.io",
-  [ChainId.Polygon]: "https://safe-transaction.polygon.gnosis.io",
-  [ChainId.Goerli]: "https://safe-transaction.goerli.gnosis.io",
-};
+  // mainnet
+  1: "https://safe-transaction-mainnet.safe.global",
+  // avalanche
+  43114: "https://safe-transaction-avalanche.safe.global",
+  // polygon
+  137: "https://safe-transaction-polygon.safe.global",
+  // goerli
+  5: "https://safe-transaction-goerli.safe.global",
+  // bsc
+  56: "https://safe-transaction-bsc.safe.global",
+  // optimism
+  10: "https://safe-transaction-optimism.safe.global",
+} as const;
 
 export interface GnosisConnectorArguments {
   safeAddress: string;
@@ -18,6 +33,8 @@ export interface GnosisConnectorArguments {
 const __IS_SERVER__ = typeof window === "undefined";
 
 export class GnosisSafeConnector extends Connector {
+  static supportedChains = Object.keys(CHAIN_ID_TO_GNOSIS_SERVER_URL);
+  public supportedChains = GnosisSafeConnector.supportedChains;
   id = "gnosis";
   ready = __IS_SERVER__;
   name = "Gnosis Safe";
@@ -50,6 +67,11 @@ export class GnosisSafeConnector extends Connector {
     };
   }
 
+  public isChainSupported(chainId: string | number) {
+    const id = normalizeChainId(chainId);
+    return !this.isChainUnsupported(id);
+  }
+
   private async createSafeSigner() {
     const signer = await this.previousConnector?.getSigner();
     const safeAddress = this.config?.safeAddress;
@@ -76,12 +98,15 @@ export class GnosisSafeConnector extends Connector {
     invariant(serverUrl, "Chain not supported");
 
     const [safeEthersAdapters, safeCoreSdk, safeEthersLib] = await Promise.all([
-      import("@gnosis.pm/safe-ethers-adapters"),
-      import("@gnosis.pm/safe-core-sdk"),
-      import("@gnosis.pm/safe-ethers-lib"),
+      import("@safe-global/safe-ethers-adapters"),
+      import("@safe-global/safe-core-sdk"),
+      import("@safe-global/safe-ethers-lib"),
     ]);
 
-    const ethAdapter = new safeEthersLib.default({ ethers, signer });
+    const ethAdapter = new safeEthersLib.default({
+      ethers,
+      signerOrProvider: signer,
+    });
 
     const safe = await safeCoreSdk.default.create({
       ethAdapter: ethAdapter as any,
@@ -163,3 +188,67 @@ export class GnosisSafeConnector extends Connector {
     this.config = config;
   }
 }
+
+/**
+ * Hook for connecting to a Gnosis Safe. This enables multisig wallets to connect to your application and sing transactions.
+ *
+ * ```javascript
+ * import { useGnosis } from "@thirdweb-dev/react"
+ * ```
+ *
+ *
+ * @example
+ * ```javascript
+ * import { useGnosis } from "@thirdweb-dev/react"
+ *
+ * const App = () => {
+ *   const connectWithGnosis = useGnosis()
+ *
+ *   return (
+ *     <button onClick={() => connectWithGnosis({ safeAddress: "0x...", safeChainId: 1 })}>
+ *       Connect Gnosis Safe
+ *     </button>
+ *   )
+ * }
+ * ```
+ *
+ * @public
+ */
+export function useGnosis() {
+  const wagmiContext = useWagmiContext();
+  invariant(
+    wagmiContext,
+    `useGnosis() can only be used inside <ThirdwebProvider />. If you are using <ThirdwebSDKProvider /> you will have to use your own wallet-connection logic.`,
+  );
+  const [connectors, connect] = useConnect();
+  if (connectors.loading) {
+    return () => Promise.reject("Gnosis connector not ready to be used, yet");
+  }
+  const connector = connectors.data.connectors.find((c) => c.id === "gnosis");
+  invariant(
+    connector,
+    "Gnosis connector not found, please make sure it is provided to your <ThirdwebProvider />",
+  );
+
+  return async (config: GnosisConnectorArguments) => {
+    const previousConnector = connectors.data.connector;
+    const previousConnectorChain = await previousConnector?.getChainId();
+    invariant(
+      !!previousConnector,
+      "Cannot connect to Gnosis Safe without first being connected to a personal wallet.",
+    );
+    invariant(
+      previousConnectorChain === config.safeChainId,
+      "Gnosis safe chain id must match personal wallet chain id.",
+    );
+    invariant(
+      utils.isAddress(config.safeAddress),
+      "Gnosis safe address must be a valid address.",
+    );
+    (connector as GnosisSafeConnector).setConfiguration(
+      previousConnector,
+      config,
+    );
+    return connect(connector);
+  };
+}

packages/react/src/evm/connectors/magic.ts

@@ -1,3 +1,4 @@
+import { useConnect } from "../hooks/wagmi-required/useConnect";
 import { providers, utils } from "ethers";
 import type {
   LoginWithMagicLinkConfiguration,
@@ -5,7 +6,12 @@ import type {
   MagicSDKAdditionalConfiguration,
 } from "magic-sdk";
 import invariant from "tiny-invariant";
-import { Chain, Connector, normalizeChainId } from "wagmi";
+import {
+  Chain,
+  Connector,
+  normalizeChainId,
+  useContext as useWagmiContext,
+} from "wagmi";
 
 export interface MagicConnectorArguments
   extends MagicSDKAdditionalConfiguration {
@@ -56,6 +62,18 @@ export class MagicConnector extends Connector {
     const { apiKey, ...options } = this.options;
     const configuration = this.getConfiguration();
 
+    const chains = Object.entries(this.options.rpcUrls);
+    if (chains.length > 1) {
+      console.warn(
+        `Magic only supports connecting to one chain at a time. Using the first chain specified in rpcUrls: ${chains[0]}.`,
+      );
+    }
+    const [chainId, rpcUrl] = chains[0];
+    this.options.network = {
+      chainId: parseInt(chainId),
+      rpcUrl,
+    };
+
     try {
       invariant(
         configuration,
@@ -186,3 +204,89 @@ export class MagicConnector extends Connector {
     }
   }
 }
+
+/**
+ * Hook for connecting to an email wallet using magic link.
+ * This enables users without their own wallets to connect to your application and sign transactions securely using their email.
+ *
+ * ```javascript
+ * import { useMagic } from "@thirdweb-dev/react"
+ * ```
+ *
+ *
+ * @example
+ * Before using this hook, you first need to set up the magic configuration in your `ThirdwebProvider`, including your magic API key.
+ *
+ * ```javascript
+ * // Add the magic configuration object to your wallet connectors
+ * const connectors = [
+ *   "metamask",
+ *   "walletConnect",
+ *   "walletLink",
+ *   {
+ *     name: "magic",
+ *     options: {
+ *       apiKey: "your-magic-api-key",
+ *     }
+ *   }
+ * ]
+ *
+ * // Add the above to the walletConnectors prop of your <ThirdwebProvider />
+ * const Provider = ({ children }) => (
+ *   return (
+ *     <ThirdwebProvider
+ *       walletConnectors={connectors}
+ *       // Specify remaining parameters
+ *       ...
+ *     >
+ *       {children}
+ *     </ThirdwebProvider>
+ *   )
+ * }
+ * ```
+ *
+ * In order to use the hook to connect users with magic link, you just need to provide the users email to the connect function.
+ *
+ * You can setup the hook with the following configuration:
+ * ```javascript
+ * import { useMagic } from "@thirdweb-dev/react"
+ * import { useState } from "react"
+ *
+ * const LoginWithMagicLink = () => {
+ *   const connectWithMagic = useMagic()
+ *   const [email, setEmail] = useState()
+ *
+ *   return (
+ *     <div>
+ *       <input value={email} onChange={(e) => setEmail(e.target.value)} />
+ *       <button onClick={() => connectWithMagic({ email })}>Login</button>
+ *     </div>
+ *   )
+ * }
+ * ```
+ *
+ * @public
+ */
+export function useMagic() {
+  const wagmiContext = useWagmiContext();
+  invariant(
+    wagmiContext,
+    `useMagic() can only be used inside <ThirdwebProvider />. If you are using <ThirdwebSDKProvider /> you will have to use your own wallet-connection logic.`,
+  );
+  const [connectors, connect] = useConnect();
+  if (connectors.loading) {
+    return () => Promise.reject("Magic connector not ready to be used, yet");
+  }
+
+  const connector = connectors.data.connectors.find((c) => c.id === "magic");
+
+  invariant(
+    connector,
+    "Magic connector not found, please make sure it is provided to your <ThirdwebProvider />",
+  );
+
+  return (configuration: LoginWithMagicLinkConfiguration) => {
+    (connector as MagicConnector).setConfiguration(configuration);
+    return connect(connector);
+  };
+}

packages/react/src/evm/constants/chain.ts

@@ -2,7 +2,7 @@ import { NATIVE_TOKENS, SUPPORTED_CHAIN_ID } from "@thirdweb-dev/sdk";
 import { ChainId } from "@thirdweb-dev/sdk";
 import type { Chain as WagmiChain } from "wagmi";
 
-export type Chain = WagmiChain & { deprecated?: boolean };
+export type Chain = WagmiChain;
 const chain: Record<string, Chain> = {
   mainnet: {
     id: ChainId.Mainnet,

packages/react/src/evm/contexts/thirdweb-config.tsx

@@ -3,7 +3,7 @@ import {
   SupportedChainId,
   defaultSupportedChains,
 } from "../constants/chain";
-import { ChainId } from "@thirdweb-dev/sdk";
+import { DEFAULT_RPC_URLS } from "@thirdweb-dev/sdk";
 import React, { PropsWithChildren, createContext, useContext } from "react";
 
 interface ThirdwebConfigContext {
@@ -11,17 +11,8 @@ interface ThirdwebConfigContext {
   supportedChains: Chain[];
 }
 
-export const defaultChainRpc: Record<SupportedChainId | number, string> = {
-  [ChainId.Mainnet]: "mainnet",
-  [ChainId.Goerli]: "goerli",
-  [ChainId.Polygon]: "polygon",
-  [ChainId.Mumbai]: "mumbai",
-  [ChainId.Fantom]: "fantom",
-  [ChainId.Avalanche]: "avalanche",
-};
-
 const ThirdwebConfigContext = createContext<ThirdwebConfigContext>({
-  rpcUrlMap: defaultChainRpc,
+  rpcUrlMap: DEFAULT_RPC_URLS,
   supportedChains: defaultSupportedChains,
 });
 

packages/react/src/evm/contexts/thirdweb-wallet.tsx

@@ -33,7 +33,17 @@ export const ThirdwebConnectedWalletProvider: React.FC<
   const { rpcUrlMap } = useThirdwebConfigContext();
 
   const [contextValue, setContextValue] =
-    useState<ThirdwebConnectedWalletContext>(INITIAL_CONTEXT_VALUE);
+    useState<ThirdwebConnectedWalletContext>({
+      ...INITIAL_CONTEXT_VALUE,
+      signer: signer ? signer : undefined,
+    });
+
+  useEffect(() => {
+    setContextValue((val) => ({
+      ...val,
+      signer: signer ? signer : undefined,
+    }));
+  }, [signer]);
 
   useEffect(() => {
     let s = signer;

packages/react/src/evm/hooks/async/claim-conditions.ts

@@ -1,5 +1,8 @@
-import { RequiredParam } from "../../../core/types/shared";
-import { useSDKChainId } from "../../providers/base";
+import {
+  RequiredParam,
+  requiredParamInvariant,
+} from "../../../core/query-utils/required-param";
+import { useSDK, useSDKChainId } from "../../providers/base";
 import { getErcs, DropContract, WalletAddress } from "../../types";
 import {
   cacheKeys,
@@ -7,8 +10,16 @@ import {
 } from "../../utils/cache-keys";
 import { useQueryWithNetwork } from "../query-utils/useQueryWithNetwork";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { ClaimCondition, ClaimConditionInput } from "@thirdweb-dev/sdk";
-import { BigNumberish } from "ethers";
+import {
+  ClaimCondition,
+  ClaimConditionFetchOptions,
+  ClaimConditionInput,
+  SnapshotEntryWithProof,
+  fetchCurrencyValue,
+  convertToReadableQuantity,
+  fetchCurrencyMetadata,
+} from "@thirdweb-dev/sdk";
+import { BigNumberish, constants, utils } from "ethers";
 import invariant from "tiny-invariant";
 
 /**
@@ -38,7 +49,7 @@ export type SetClaimConditionsParams = {
 /** **********************/
 
 /**
- * Use this to get the active claim conditon for ERC20, ERC721 or ERC1155 based contracts. They need to extend the `claimCondition` extension for this hook to work.
+ * Use this to get the active claim condition for ERC20, ERC721 or ERC1155 based contracts. They need to extend the `claimCondition` extension for this hook to work.
  *
  * @example
  * ```javascript
@@ -53,7 +64,7 @@ export type SetClaimConditionsParams = {
  * const { data: activeClaimCondition, isLoading, error } = useActiveClaimCondition(<YourERC1155ContractInstance>, <tokenId>);
  * ```
  *
- * @param contract - an instance of a contract that extends the ERC721 or ERC1155 spec and implements the `claimConditions` extension.
+ * @param contract - an instance of a contract that extends the ERC721, ERC1155 or ERC20 spec and implements the `claimConditions` extension.
  * @param tokenId - the id of the token to fetch the claim conditions for (if the contract is an ERC1155 contract)
  * @returns a response object with the currently active claim condition
  * @twfeature ERC721ClaimableWithConditions | ERC1155ClaimableWithConditions | ERC20ClaimableWithConditions
@@ -62,25 +73,30 @@ export type SetClaimConditionsParams = {
 export function useActiveClaimCondition(
   contract: RequiredParam<DropContract>,
   tokenId?: BigNumberish,
+  options?: ClaimConditionFetchOptions,
 ) {
   const contractAddress = contract?.getAddress();
   const { erc1155, erc721, erc20 } = getErcs(contract);
 
   return useQueryWithNetwork(
-    cacheKeys.extensions.claimConditions.getActive(contractAddress, tokenId),
+    cacheKeys.extensions.claimConditions.getActive(
+      contractAddress,
+      tokenId,
+      options,
+    ),
     () => {
       if (erc1155) {
-        invariant(
-          tokenId !== undefined,
+        requiredParamInvariant(
+          tokenId,
           "tokenId is required for ERC1155 claim conditions",
         );
-        return erc1155.claimConditions.getActive(tokenId);
+        return erc1155.claimConditions.getActive(tokenId, options);
       }
       if (erc721) {
-        return erc721.claimConditions.getActive();
+        return erc721.claimConditions.getActive(options);
       }
       if (erc20) {
-        return erc20.claimConditions.getActive();
+        return erc20.claimConditions.getActive(options);
       }
       throw new Error("Contract must be ERC721, ERC1155 or ERC20");
     },
@@ -94,7 +110,80 @@ export function useActiveClaimCondition(
 }
 
 /**
- * Use this to get all claim conditons for ERC20, ERC721 or ERC1155 based contracts. They need to extend the `claimCondition` extension for this hook to work.
+ * Use this to get the claimer proofs for an adddress for ERC20, ERC721 or ERC1155 based contracts. They need to extend the `claimCondition` extension for this hook to work.
+ *
+ * @example
+ * ```javascript
+ * const { data: claimerProofs, isLoading, error } = useClaimerProofs(<YourERC20ContractInstance>);
+ * ```
+ * @example
+ * ```javascript
+ * const { data: claimerProofs, isLoading, error } = useClaimerProofs(<YourERC721ContractInstance>);
+ * ```
+ * @example
+ * ```javascript
+ * const { data: claimerProofs, isLoading, error } = useClaimerProofs(<YourERC1155ContractInstance>, <tokenId>);
+ * ```
+ *
+ * @param contract - an instance of a contract that extends the ERC721, ERC1155 or ERC20 spec and implements the `claimConditions` extension.
+ * @param claimerAddress - the address of the claimer to fetch the claimer proofs for
+ * @param tokenId - the id of the token to fetch the claimer proofs for (if the contract is an ERC1155 contract)
+ * @param claimConditionId - optional the claim condition id to get the proofs for
+ * @returns a response object with the snapshot for the provided address
+ * @twfeature ERC721ClaimableWithConditions | ERC1155ClaimableWithConditions | ERC20ClaimableWithConditions
+ * @beta
+ */
+export function useClaimerProofs(
+  contract: RequiredParam<DropContract>,
+  claimerAddress: string,
+  tokenId?: BigNumberish,
+  claimConditionId?: BigNumberish,
+) {
+  const contractAddress = contract?.getAddress();
+  const { erc1155, erc721, erc20 } = getErcs(contract);
+
+  return useQueryWithNetwork(
+    cacheKeys.extensions.claimConditions.getClaimerProofs(
+      contractAddress,
+      tokenId,
+    ),
+    () => {
+      if (erc1155) {
+        requiredParamInvariant(
+          tokenId,
+          "tokenId is required for ERC1155 claim conditions",
+        );
+        return erc1155.claimConditions.getClaimerProofs(
+          tokenId,
+          claimerAddress,
+          claimConditionId,
+        );
+      }
+      if (erc721) {
+        return erc721.claimConditions.getClaimerProofs(
+          claimerAddress,
+          claimConditionId,
+        );
+      }
+      if (erc20) {
+        return erc20.claimConditions.getClaimerProofs(
+          claimerAddress,
+          claimConditionId,
+        );
+      }
+      throw new Error("Contract must be ERC721, ERC1155 or ERC20");
+    },
+    {
+      // Checks that happen here:
+      // 1. if the contract is based on ERC1155 contract => tokenId cannot be `undefined`
+      // 2. if the contract is NOT based on ERC1155 => we have to have either an ERC721 or ERC20 contract
+      enabled: erc1155 ? tokenId !== undefined : !!erc721 || !!erc20,
+    },
+  );
+}
+
+/**
+ * Use this to get all claim conditions for ERC20, ERC721 or ERC1155 based contracts. They need to extend the `claimCondition` extension for this hook to work.
  *
  * @example
  * ```javascript
@@ -109,7 +198,7 @@ export function useActiveClaimCondition(
  * const { data: claimConditions, isLoading, error } = useClaimConditions(<YourERC1155ContractInstance>, <tokenId>);
  * ```
  *
- * @param contract - an instance of a contract that extends the ERC721 or ERC1155 spec and implements the `claimConditions` extension.
+ * @param contract - an instance of a contract that extends the ERC721, ERC1155 or ERC20 spec and implements the `claimConditions` extension.
  * @param tokenId - the id of the token to fetch the claim conditions for (if the contract is an ERC1155 contract)
  * @returns a response object with the list of claim conditions
  * @twfeature ERC721ClaimableWithConditions | ERC1155ClaimableWithConditions | ERC20ClaimableWithConditions
@@ -118,22 +207,30 @@ export function useActiveClaimCondition(
 export function useClaimConditions(
   contract: RequiredParam<DropContract>,
   tokenId?: BigNumberish,
+  options?: ClaimConditionFetchOptions,
 ) {
   const contractAddress = contract?.getAddress();
   const { erc1155, erc721, erc20 } = getErcs(contract);
 
   return useQueryWithNetwork(
-    cacheKeys.extensions.claimConditions.getAll(contractAddress, tokenId),
+    cacheKeys.extensions.claimConditions.getAll(
+      contractAddress,
+      tokenId,
+      options,
+    ),
     () => {
       if (erc1155) {
-        invariant(tokenId, "tokenId is required for ERC1155 claim conditions");
-        return erc1155.claimConditions.getAll(tokenId);
+        requiredParamInvariant(
+          tokenId,
+          "tokenId is required for ERC1155 claim conditions",
+        );
+        return erc1155.claimConditions.getAll(tokenId, options);
       }
       if (erc721) {
-        return erc721.claimConditions.getAll();
+        return erc721.claimConditions.getAll(options);
       }
       if (erc20) {
-        return erc20.claimConditions.getAll();
+        return erc20.claimConditions.getAll(options);
       }
       throw new Error("Contract must be ERC721, ERC1155 or ERC20");
     },
@@ -184,7 +281,7 @@ export function useClaimIneligibilityReasons(
     ),
     () => {
       if (erc1155) {
-        invariant(
+        requiredParamInvariant(
           tokenId,
           "tokenId is required for ERC1155 claim ineligibility reasons",
         );
@@ -222,6 +319,136 @@ export function useClaimIneligibilityReasons(
   );
 }
 
+/**
+ * Use this to check the claim condition for a given wallet address (including checking for overrides that may exist for that given wallet address).
+ *
+ * @param contract - an instance of a contract that extends the  ERC20, ERC721 or ERC1155 spec and implements the `claimConditions` extension.
+ * @param walletAddress - the wallet address to check the active claim condition for
+ * @param tokenId - the id of the token to fetch the claim conditions for (if the contract is an ERC1155 contract)
+ * @returns the active claim conditon for the wallet address or null if there is no active claim condition
+ *
+ * @beta
+ */
+export function useActiveClaimConditionForWallet(
+  contract: RequiredParam<DropContract>,
+  walletAddress: RequiredParam<WalletAddress>,
+  tokenId?: BigNumberish,
+) {
+  const sdk = useSDK();
+  const contractAddress = contract?.getAddress();
+  const { erc1155, erc721, erc20 } = getErcs(contract);
+  return useQueryWithNetwork<ClaimCondition | null>(
+    cacheKeys.extensions.claimConditions.useActiveClaimConditionForWallet(
+      contractAddress,
+      walletAddress || "_NO_WALLET_",
+      tokenId,
+    ),
+    async () => {
+      // if we do not have a walletAddress just do the same logic as basic useClaimCondition
+      if (!walletAddress) {
+        if (erc1155) {
+          requiredParamInvariant(
+            tokenId,
+            "tokenId is required for ERC1155 claim conditions",
+          );
+          return erc1155.claimConditions.getActive(tokenId);
+        }
+        if (erc721) {
+          return erc721.claimConditions.getActive();
+        }
+        if (erc20) {
+          return erc20.claimConditions.getActive();
+        }
+        throw new Error("Contract must be ERC721, ERC1155 or ERC20");
+      }
+      invariant(sdk, "sdk is required");
+      let activeGeneralClaimCondition: ClaimCondition | null = null;
+      let claimerProofForWallet: SnapshotEntryWithProof | null = null;
+
+      if (erc1155) {
+        requiredParamInvariant(tokenId, "tokenId is required for ERC1155");
+        const [cc, cp] = await Promise.all([
+          erc1155.claimConditions.getActive(tokenId),
+          erc1155.claimConditions.getClaimerProofs(tokenId, walletAddress),
+        ]);
+        activeGeneralClaimCondition = cc;
+        claimerProofForWallet = cp;
+      }
+      if (erc721) {
+        const [cc, cp] = await Promise.all([
+          erc721.claimConditions.getActive(),
+          erc721.claimConditions.getClaimerProofs(walletAddress),
+        ]);
+        activeGeneralClaimCondition = cc;
+        claimerProofForWallet = cp;
+      }
+      if (erc20) {
+        const [cc, cp] = await Promise.all([
+          erc20.claimConditions.getActive(),
+          erc20.claimConditions.getClaimerProofs(walletAddress),
+        ]);
+        activeGeneralClaimCondition = cc;
+        claimerProofForWallet = cp;
+      }
+      // if there is no active claim condition nothing matters, return null
+      if (!activeGeneralClaimCondition) {
+        return null;
+      }
+
+      // if there is no claimer proof then just fall back to the active general claim condition
+      if (!claimerProofForWallet) {
+        return activeGeneralClaimCondition;
+      }
+
+      const { maxClaimable, currencyAddress, price } = claimerProofForWallet;
+
+      const currencyWithOverride =
+        currencyAddress || activeGeneralClaimCondition.currencyAddress;
+
+      const currencyMetadata = await fetchCurrencyMetadata(
+        sdk.getProvider(),
+        currencyWithOverride,
+      );
+
+      const normalizedPrize = price
+        ? price === "unlimited"
+          ? constants.MaxUint256
+          : utils.parseUnits(price, currencyMetadata.decimals)
+        : null;
+
+      const priceWithOverride =
+        normalizedPrize || activeGeneralClaimCondition.price;
+
+      const maxClaimableWithOverride =
+        // have to transform this the same way that claim conditions do it in SDK
+        convertToReadableQuantity(maxClaimable, currencyMetadata.decimals) ||
+        activeGeneralClaimCondition.maxClaimablePerWallet;
+
+      const currencyValueWithOverride = await fetchCurrencyValue(
+        sdk.getProvider(),
+        currencyWithOverride,
+        priceWithOverride,
+      );
+      return {
+        // inherit the entire claim condition
+        ...activeGeneralClaimCondition,
+        // overwrite all keys that could be changed based on overwrites
+        maxClaimablePerWallet: maxClaimableWithOverride,
+        price: priceWithOverride,
+        currency: currencyWithOverride,
+        currencyAddress: currencyWithOverride,
+        currencyMetadata: currencyValueWithOverride,
+      };
+    },
+    {
+      // Checks that happen here:
+      // 1. if the contract is based on ERC1155 contract => tokenId cannot be `undefined`
+      // 2. if the contract is NOT based on ERC1155 => we have to have either an ERC721 or ERC20 contract
+      enabled: erc1155 ? tokenId !== undefined : !!erc721 || !!erc20,
+    },
+  );
+}
+
 /** **********************/
 /**     WRITE HOOKS     **/
 /** **********************/
@@ -270,11 +497,14 @@ export function useSetClaimConditions(
 
   return useMutation(
     async (data: SetClaimConditionsParams) => {
-      invariant(contract, "No Contract instance provided");
+      requiredParamInvariant(contract, "No Contract instance provided");
       const { phases, reset = false } = data;
       invariant(phases, 'No "phases" provided');
       if (erc1155) {
-        invariant(tokenId, "tokenId is required for ERC1155 claim conditions");
+        requiredParamInvariant(
+          tokenId,
+          "tokenId is required for ERC1155 claim conditions",
+        );
         return erc1155.claimConditions.set(tokenId, phases, reset);
       }
       if (erc721) {
@@ -341,35 +571,42 @@ export function useResetClaimConditions(
 
   return useMutation(
     async () => {
-      const cleanConditions = (conditions: ClaimCondition[]) => {
+      const cleanConditions = async (conditions: ClaimCondition[]) => {
         return conditions.map((c) => ({
           ...c,
           price: c.currencyMetadata.displayValue,
-          maxQuantity: c.maxQuantity.toString(),
-          quantityLimitPerTransaction: c.quantityLimitPerTransaction.toString(),
         }));
       };
 
       if (erc1155) {
-        invariant(tokenId, "tokenId is required for ERC1155 claim conditions");
-        const claimConditions = await erc1155.claimConditions.getAll(tokenId);
+        requiredParamInvariant(
+          tokenId,
+          "tokenId is required for ERC1155 claim conditions",
+        );
+        const claimConditions = await erc1155.claimConditions.getAll(tokenId, {
+          withAllowList: true,
+        });
         return erc1155.claimConditions.set(
           tokenId,
-          cleanConditions(claimConditions || []),
+          await cleanConditions(claimConditions || []),
           true,
         );
       }
       if (erc721) {
-        const claimConditions = await erc721.claimConditions.getAll();
+        const claimConditions = await erc721.claimConditions.getAll({
+          withAllowList: true,
+        });
         return await erc721.claimConditions.set(
-          cleanConditions(claimConditions || []),
+          await cleanConditions(claimConditions || []),
           true,
         );
       }
       if (erc20) {
-        const claimConditions = await erc20.claimConditions.getAll();
+        const claimConditions = await erc20.claimConditions.getAll({
+          withAllowList: true,
+        });
         return await erc20.claimConditions.set(
-          cleanConditions(claimConditions || []),
+          await cleanConditions(claimConditions || []),
           true,
         );
       }

packages/react/src/evm/hooks/async/contract-settings.ts

@@ -1,4 +1,7 @@
-import { RequiredParam } from "../../../core/types/shared";
+import {
+  RequiredParam,
+  requiredParamInvariant,
+} from "../../../core/query-utils/required-param";
 import { useSDKChainId } from "../../providers/base";
 import { WalletAddress } from "../../types";
 import {
@@ -35,7 +38,7 @@ export function usePrimarySaleRecipient(
   return useQueryWithNetwork(
     cacheKeys.extensions.sales.getRecipient(contractAddress),
     () => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "sales" in contract && contract.sales,
         "Contract does not support primarySale",
@@ -86,7 +89,7 @@ export function useUpdatePrimarySaleRecipient(
   const activeChainId = useSDKChainId();
   return useMutation(
     (newRecipient: WalletAddress) => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "sales" in contract && contract.sales,
         "Contract does not support primarySale",
@@ -128,7 +131,7 @@ export function useRoyaltySettings(
   return useQueryWithNetwork(
     cacheKeys.extensions.royalties.getDefaultRoyaltyInfo(contractAddress),
     () => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "royalties" in contract && contract.royalties,
         "Contract does not support royalties",
@@ -182,7 +185,7 @@ export function useUpdateRoyaltySettings(
       seller_fee_basis_points?: number;
       fee_recipient?: WalletAddress;
     }) => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "royalties" in contract && contract.royalties,
         "Contract does not support royalties",
@@ -224,7 +227,7 @@ export function usePlatformFees(
   return useQueryWithNetwork(
     cacheKeys.extensions.platformFees.get(contractAddress),
     () => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "platformFees" in contract && contract.platformFees,
         "Contract does not support platformFees",
@@ -277,7 +280,7 @@ export function useUpdatePlatformFees(
       platform_fee_basis_points?: number;
       fee_recipient?: WalletAddress;
     }) => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "platformFees" in contract && contract.platformFees,
         "Contract does not support platformFees",
@@ -317,7 +320,7 @@ export function useMetadata(contract: RequiredParam<ValidContractInstance>) {
   return useQueryWithNetwork(
     cacheKeys.extensions.metadata.get(contractAddress),
     () => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "metadata" in contract && contract.metadata,
         "Contract does not support metadata",
@@ -366,7 +369,7 @@ export function useUpdateMetadata(
   const activeChainId = useSDKChainId();
   return useMutation(
     (updatePayload: CustomContractMetadata) => {
-      invariant(contract, "No contract provided");
+      requiredParamInvariant(contract, "No contract provided");
       invariant(
         "metadata" in contract && contract.metadata,
         "Contract does not support metadata",

packages/react/src/evm/hooks/async/contracts.ts

@@ -1,5 +1,8 @@
 import { neverPersist } from "../../../core/query-utils/query-key";
-import { RequiredParam } from "../../../core/types/shared";
+import {
+  RequiredParam,
+  requiredParamInvariant,
+} from "../../../core/query-utils/required-param";
 import { useSDK, useSDKChainId } from "../../providers/base";
 import { ContractAddress } from "../../types";
 import {
@@ -20,7 +23,7 @@ import {
   ContractEvent,
   ContractForPrebuiltContractType,
   ContractType,
-  EventQueryFilter,
+  EventQueryOptions,
   PrebuiltContractType,
   SUPPORTED_CHAIN_ID,
   ThirdwebSDK,
@@ -216,7 +219,7 @@ export function useContract(
       { wallet, walletChainId, sdkTimestamp },
     ]),
     async () => {
-      invariant(contractAddress, "contract address is required");
+      requiredParamInvariant(contractAddress, "contract address is required");
       invariant(sdk, "SDK not initialized");
       invariant(activeChainId, "active chain id is required");
 
@@ -235,7 +238,7 @@ export function useContract(
             await queryClient.fetchQuery(
               compilerMetadata.cacheKey(contractAddress, activeChainId),
               () => compilerMetadata.fetchQuery(contractAddress, sdk),
-              { cacheTime: Infinity, staleTime: Infinity },
+              { cacheTime: Infinity, staleTime: Infinity, retry: 0 },
             )
           )?.abi;
         }
@@ -255,6 +258,8 @@ export function useContract(
       cacheTime: Infinity,
       staleTime: Infinity,
       enabled: !!contractAddress && !!sdk && !!activeChainId,
+      // never retry
+      retry: 0,
     },
   );
 
@@ -290,7 +295,7 @@ export function useContractMetadata<TContract extends ValidContractInstance>(
   >(
     cacheKeys.contract.metadata(contract?.getAddress()),
     async () => {
-      invariant(contract, "contract is required");
+      requiredParamInvariant(contract, "contract is required");
       return await contract.metadata.get();
     },
     {
@@ -311,7 +316,7 @@ export function useContractMetadataUpdate(
 
   return useMutation(
     async (metadata: CommonContractSchemaInput) => {
-      invariant(contract, "contract must be defined");
+      requiredParamInvariant(contract, "contract must be defined");
 
       return contract.metadata.update(metadata);
     },
@@ -343,7 +348,7 @@ export function useContractMetadataUpdate(
 export function useContractEvents(
   contract: RequiredParam<ValidContractInstance>,
   eventName?: string,
-  options: { queryFilter?: EventQueryFilter; subscribe?: boolean } = {
+  options: { queryFilter?: EventQueryOptions; subscribe?: boolean } = {
     subscribe: true,
   },
 ) {
@@ -406,7 +411,7 @@ export function useContractEvents(
   return useQuery(
     cacheKey,
     () => {
-      invariant(contract, "contract must be defined");
+      requiredParamInvariant(contract, "contract must be defined");
       if (eventName) {
         return contract.events.getEvents(eventName, options.queryFilter);
       }
@@ -447,8 +452,8 @@ export function useContractRead(
   return useQueryWithNetwork(
     cacheKeys.contract.call(contractAddress, functionName, args),
     () => {
-      invariant(contract, "contract must be defined");
-      invariant(functionName, "function name must be provided");
+      requiredParamInvariant(contract, "contract must be defined");
+      requiredParamInvariant(functionName, "function name must be provided");
       return contract.call(functionName, ...args);
     },
     {
@@ -485,8 +490,8 @@ export function useContractWrite(
 
   return useMutation(
     async (callParams?: unknown[] | [...unknown[], CallOverrides]) => {
-      invariant(contract, "contract must be defined");
-      invariant(functionName, "function name must be provided");
+      requiredParamInvariant(contract, "contract must be defined");
+      requiredParamInvariant(functionName, "function name must be provided");
       if (!callParams?.length) {
         return contract.call(functionName);
       }