Version Packages (#477 )

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
[SDK] Add intermediate event for contract deploy transactions before confirmation (#502 )
2023-01-18 21:03:46 -08:00 · 2023-01-18 20:54:21 -08:00 · 2023-01-18 15:18:42 -08:00 · 2023-01-18 22:57:07 +00:00 · 2023-01-15 20:34:39 -08:00 · 2023-01-13 19:32:50 -08:00
956 changed files with 38608 additions and 159175 deletions
@@ -2,14 +2,15 @@
  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
  "changelog": ["@changesets/changelog-github", { "repo": "thirdweb-dev/js" }],
  "commit": false,
-  "fixed": [],
+  "fixed": [["@thirdweb-dev/sdk", "@thirdweb-dev/react"]],
  "linked": [],
  "access": "public",
  "baseBranch": "main",
  "updateInternalDependencies": "patch",
-  "ignore": [],
+  "ignore": ["e2e-cra-5", "e2e-next-12", "e2e-vite-3"],
  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
-    "updateInternalDependents": "always"
+    "updateInternalDependents": "always",
+    "onlyUpdatePeerDependentsWhenOutOfRange": true
  },
  "snapshot": {
    "useCalculatedVersion": true,
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
@@ -13,8 +13,8 @@ concurrency:
 jobs:
  build:
    name: Build and Test
-    # timeout-minutes: 15
-    runs-on: ubuntu-latest
+    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 }}
@@ -24,13 +24,11 @@ jobs:
      - name: Check out code
        uses: actions/checkout@v3
        with:
-          fetch-depth: 2
+          fetch-depth: 0

      - name: Install
        uses: ./.github/composite-actions/install

-      - name: Build
-        run: yarn build
-
-      - name: Test
+        # this already builds anything that changed...
+      - name: Build & Test
        run: yarn test
@@ -12,8 +12,8 @@ concurrency:

 jobs:
  integration-tests:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
    steps:
      - uses: actions/checkout@v3

@@ -27,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
@@ -0,0 +1,33 @@
+name: Lint
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    types: [opened, synchronize]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    name: Lint
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    # To use Remote Caching, uncomment the next lines and follow the steps below.
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: Lint
+        run: yarn lint
@@ -8,6 +8,7 @@ on:

 jobs:
  deploy-check:
+    # this just checks if ur allowed to do the action so does not need to run on a fast machine
    runs-on: ubuntu-latest
    steps:
      - name: acknowledge deployment request to commenter
@@ -39,7 +40,8 @@ jobs:
      comment_body: ${{ github.event.comment.body }}

  deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-32
+    timeout-minutes: 30
    needs: deploy-check
    if: needs.deploy-check.outputs.triggered == 'true'
    steps:
@@ -14,7 +14,8 @@ concurrency:
 jobs:
  release:
    name: Release
-    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    runs-on: ubuntu-latest-32
    steps:
      - name: Checkout branch
        uses: actions/checkout@v3
@@ -0,0 +1,20 @@
+name: Compressed Size
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest-32
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - uses: preactjs/compressed-size-action@v2
+        with:
+          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/**}"
@@ -12,4 +12,9 @@ server/dist
 public/dist
 .turbo
 ./packages/contracts-js/abis
-.idea/
+.idea/
+.yalc/
+yalc.lock
+build/
+playwright-report/
+.vscode/
@@ -1,4 +1,3 @@
-lib
 node_modules
 dist
 contracts-js
@@ -27,7 +27,6 @@
 | [/auth](./packages/auth)       | Best in class wallet authentication for Node backends                | <a href="https://www.npmjs.com/package/@thirdweb-dev/auth"><img src="https://img.shields.io/npm/v/@thirdweb-dev/auth?color=red&label=npm&logo=npm" alt="npm version"/></a>       |
 | [/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>                           |
-| [/solana](./packages/solana)   | Solana SDK for Browser, Node and React Native                        | <a href="https://www.npmjs.com/package/@thirdweb-dev/solana"><img src="https://img.shields.io/npm/v/@thirdweb-dev/solana?color=red&label=npm&logo=npm" alt="npm version"/></a>   |

 ## Documentation

@@ -8,14 +8,15 @@
  "private": true,
  "workspaces": {
    "packages": [
-      "packages/*"
+      "packages/*",
+      "test/**/*"
    ]
  },
  "scripts": {
-    "test": "turbo run test",
+    "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,16 +36,14 @@
    "@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",
-    "turbo": "^1.4.6"
+    "turbo": "^1.4.6",
+    "yalc": "^1.0.0-pre.53"
  },
  "manypkg": {
    "defaultBranch": "main"
-  },
-  "devDependencies": {
-    "yalc": "^1.0.0-pre.53"
  }
 }
@@ -1,5 +1,85 @@
 # @thirdweb-dev/auth

+## 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
+
+### Patch Changes
+
+- [#274](https://github.com/thirdweb-dev/js/pull/274) [`ad06c5b`](https://github.com/thirdweb-dev/js/commit/ad06c5b28902422f9b416d65255c64c937a5e046) Thanks [@adam-maj](https://github.com/adam-maj)! - Add solana auth support and plugins for react and auth package
+
+## 2.0.13
+
+## 2.0.12
+
+## 2.0.11
+
+## 2.0.10
+
+## 2.0.9
+
 ## 2.0.8

 ### Patch Changes
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-auth-next-evm.cjs.js",
+  "module": "dist/thirdweb-dev-auth-next-evm.esm.js"
+}
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-auth-next-solana.cjs.js",
+  "module": "dist/thirdweb-dev-auth-next-solana.esm.js"
+}
@@ -1,20 +1,28 @@
 {
  "name": "@thirdweb-dev/auth",
-  "version": "2.0.8",
+  "version": "2.0.40",
  "exports": {
-    "./package.json": "./package.json",
+    "./next": {
+      "module": "./next/dist/thirdweb-dev-auth-next.esm.js",
+      "default": "./next/dist/thirdweb-dev-auth-next.cjs.js"
+    },
    "./express": {
      "module": "./express/dist/thirdweb-dev-auth-express.esm.js",
      "default": "./express/dist/thirdweb-dev-auth-express.cjs.js"
    },
-    "./next": {
-      "module": "./next/dist/thirdweb-dev-auth-next.esm.js",
-      "default": "./next/dist/thirdweb-dev-auth-express.cjs.js"
+    "./next/evm": {
+      "module": "./next/evm/dist/thirdweb-dev-auth-next-evm.esm.js",
+      "default": "./next/evm/dist/thirdweb-dev-auth-next-evm.cjs.js"
    },
    "./next-auth": {
      "module": "./next-auth/dist/thirdweb-dev-auth-next-auth.esm.js",
      "default": "./next-auth/dist/thirdweb-dev-auth-next-auth.cjs.js"
-    }
+    },
+    "./next/solana": {
+      "module": "./next/solana/dist/thirdweb-dev-auth-next-solana.esm.js",
+      "default": "./next/solana/dist/thirdweb-dev-auth-next-solana.cjs.js"
+    },
+    "./package.json": "./package.json"
  },
  "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/auth",
  "author": "thirdweb eng <[email protected]>",
@@ -35,11 +43,18 @@
  "preconstruct": {
    "entrypoints": [
      "next/index.ts",
+      "next/evm/index.ts",
+      "next/solana/index.ts",
      "express/index.ts",
      "next-auth/index.ts"
-    ]
+    ],
+    "___experimentalFlags_WILL_CHANGE_IN_PATCH": {
+      "exports": true
+    },
+    "exports": true
  },
  "devDependencies": {
+    "@babel/core": "^7.19.3",
    "@babel/preset-env": "^7.18.10",
    "@babel/preset-typescript": "^7.18.6",
    "@microsoft/api-documenter": "^7.19.4",
@@ -58,11 +73,13 @@
    "eslint-plugin-inclusive-language": "^2.2.0",
    "eslint-plugin-prettier": "^4.2.1",
    "eslint-plugin-tsdoc": "^0.2.16",
-    "ethers": "^5.7.0",
+    "ethers": "^5.7.2",
    "express": "^4.18.1",
    "next": "^12.2.0",
    "next-auth": "^4.10.3",
    "prettier": "^2.7.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
    "typescript": "^4.7.4"
  },
  "peerDependencies": {
@@ -0,0 +1,68 @@
+import loginHandler from "./routes/login";
+import logoutHandler from "./routes/logout";
+import userHandler from "./routes/user";
+import {
+  ThirdwebAuthConfig,
+  ThirdwebAuthRoute,
+  ThirdwebAuthUser,
+} from "./types";
+import { ThirdwebSDK } from "@thirdweb-dev/sdk";
+import cookieParser from "cookie-parser";
+import { Express, NextFunction, Request, Response } from "express";
+
+export * from "./types";
+
+export function getUser(req: Request): ThirdwebAuthUser | null {
+  return req.user;
+}
+
+export function ThirdwebAuth(app: Express, cfg: ThirdwebAuthConfig) {
+  const ctx = {
+    ...cfg,
+    sdk: ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet"),
+  };
+
+  const authUrl = cfg.authUrl?.replace(/\/$/, "") || "/auth";
+
+  app.use(cookieParser());
+
+  app.use(async (req: Request, _: Response, next: NextFunction) => {
+    const { sdk, domain } = ctx;
+    let user = null;
+    const token = req.cookies.thirdweb_auth_token;
+
+    if (token) {
+      try {
+        const address = await sdk.auth.authenticate(domain, token);
+
+        if (ctx.callbacks?.user) {
+          user = await ctx.callbacks.user(address);
+        }
+
+        user = { ...user, address };
+      } catch {
+        // No-op
+      }
+    }
+
+    req.user = user as ThirdwebAuthUser | null;
+    next();
+  });
+
+  app.get(`${authUrl}/:route`, (req: Request, res: Response) => {
+    const action = req.params.route as ThirdwebAuthRoute;
+
+    switch (action) {
+      case "login":
+        return loginHandler(req, res, ctx);
+      case "user":
+        return userHandler(req, res);
+      case "logout":
+        return logoutHandler(req, res);
+      default:
+        return res.status(400).json({
+          message: "Invalid route for authentication.",
+        });
+    }
+  });
+}
@@ -43,7 +43,7 @@ export default async function handler(
      path: "/",
      httpOnly: true,
      secure: true,
-      sameSite: "strict",
+      sameSite: "none",
    }),
  );

@@ -1,68 +1 @@
-import loginHandler from "./routes/login";
-import logoutHandler from "./routes/logout";
-import userHandler from "./routes/user";
-import {
-  ThirdwebAuthConfig,
-  ThirdwebAuthRoute,
-  ThirdwebAuthUser,
-} from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import cookieParser from "cookie-parser";
-import { Express, NextFunction, Request, Response } from "express";
-
-export * from "./types";
-
-export function getUser(req: Request): ThirdwebAuthUser | null {
-  return req.user;
-}
-
-export function ThirdwebAuth(app: Express, cfg: ThirdwebAuthConfig) {
-  const ctx = {
-    ...cfg,
-    sdk: ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet"),
-  };
-
-  const authUrl = cfg.authUrl?.replace(/\/$/, "") || "/auth";
-
-  app.use(cookieParser());
-
-  app.use(async (req: Request, _: Response, next: NextFunction) => {
-    const { sdk, domain } = ctx;
-    let user = null;
-    const token = req.cookies.thirdweb_auth_token;
-
-    if (token) {
-      try {
-        const address = await sdk.auth.authenticate(domain, token);
-
-        if (ctx.callbacks?.user) {
-          user = await ctx.callbacks.user(address);
-        }
-
-        user = { ...user, address };
-      } catch {
-        // No-op
-      }
-    }
-
-    req.user = user as ThirdwebAuthUser | null;
-    next();
-  });
-
-  app.get(`${authUrl}/:route`, (req: Request, res: Response) => {
-    const action = req.params.route as ThirdwebAuthRoute;
-
-    switch (action) {
-      case "login":
-        return loginHandler(req, res, ctx);
-      case "user":
-        return userHandler(req, res);
-      case "logout":
-        return logoutHandler(req, res);
-      default:
-        return res.status(400).json({
-          message: "Invalid route for authentication.",
-        });
-    }
-  });
-}
+export * from "./evm";
@@ -0,0 +1,145 @@
+import { ThirdwebNextAuthConfig } from "./types";
+import { ThirdwebSDK } from "@thirdweb-dev/sdk";
+import { serialize } from "cookie";
+import {
+  GetServerSidePropsContext,
+  NextApiRequest,
+  NextApiResponse,
+} from "next";
+import NextAuth, {
+  NextAuthOptions,
+  Session,
+  unstable_getServerSession,
+} from "next-auth";
+import CredentialsProvider from "next-auth/providers/credentials";
+
+export function ThirdwebNextAuth(cfg: ThirdwebNextAuthConfig) {
+  const sdk = ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet");
+
+  function ThirdwebProvider(res: GetServerSidePropsContext["res"]) {
+    return CredentialsProvider({
+      name: "ThirdwebAuth",
+      credentials: {
+        payload: {
+          label: "Payload",
+          type: "text",
+          placeholder: "",
+        },
+      },
+      async authorize({ payload }: any) {
+        try {
+          const parsed = JSON.parse(payload);
+          const token = await sdk.auth.generateAuthToken(cfg.domain, parsed);
+          const address = await sdk.auth.authenticate(cfg.domain, token);
+
+          // Securely set httpOnly cookie on request to prevent XSS on frontend
+          // And set path to / to enable thirdweb_auth_token usage on all endpoints
+          res.setHeader(
+            "Set-Cookie",
+            serialize("thirdweb_auth_token", token, {
+              path: "/",
+              httpOnly: true,
+              secure: true,
+              sameSite: "none",
+            }),
+          );
+
+          return { id: address, address };
+        } catch (err) {
+          return null;
+        }
+      },
+    });
+  }
+
+  function nextOptions(
+    req: GetServerSidePropsContext["req"],
+    res: GetServerSidePropsContext["res"],
+  ): NextAuthOptions {
+    async function session({
+      session: _session,
+    }: {
+      session: Session;
+    }): Promise<Session> {
+      const token = req.cookies.thirdweb_auth_token || "";
+      try {
+        const address = await sdk.auth.authenticate(cfg.domain, token);
+        _session.user = { ..._session.user, address } as Session["user"];
+        return _session;
+      } catch {
+        return _session;
+      }
+    }
+
+    function signOut() {
+      res.setHeader(
+        "Set-Cookie",
+        serialize("thirdweb_auth_token", "", {
+          path: "/",
+          expires: new Date(Date.now() + 5 * 1000),
+        }),
+      );
+    }
+
+    const providers: NextAuthOptions["providers"] = [
+      ...cfg.nextOptions.providers,
+      ThirdwebProvider(res),
+    ];
+
+    const configSession = cfg.nextOptions.callbacks?.session;
+    const callbacks: NextAuthOptions["callbacks"] = {
+      ...cfg.nextOptions.callbacks,
+      session: configSession
+        ? async (params) => {
+            params.session = await session(params);
+            return configSession(params);
+          }
+        : session,
+    };
+
+    const configSignOut = cfg.nextOptions.events?.signOut;
+    const events: NextAuthOptions["events"] = {
+      ...cfg.nextOptions.events,
+      signOut: configSignOut
+        ? async (params) => {
+            signOut();
+            return configSignOut(params);
+          }
+        : signOut,
+    };
+
+    return {
+      ...cfg.nextOptions,
+      providers,
+      callbacks,
+      events,
+    };
+  }
+
+  async function getUser(
+    ...args:
+      | [NextApiRequest, NextApiResponse]
+      | [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]
+  ) {
+    return unstable_getServerSession(
+      args[0],
+      args[1],
+      nextOptions(args[0], args[1]),
+    );
+  }
+
+  function NextAuthHandler(...args: [] | [NextApiRequest, NextApiResponse]) {
+    if (args.length === 0) {
+      return (req: NextApiRequest, res: NextApiResponse) => {
+        return NextAuth(req, res, nextOptions(req, res));
+      };
+    }
+
+    return NextAuth(args[0], args[1], nextOptions(args[0], args[1]));
+  }
+
+  return {
+    NextAuthHandler,
+    getUser,
+  };
+}
@@ -1,145 +1 @@
-import { ThirdwebNextAuthConfig } from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import { serialize } from "cookie";
-import {
-  GetServerSidePropsContext,
-  NextApiRequest,
-  NextApiResponse,
-} from "next";
-import NextAuth, {
-  NextAuthOptions,
-  Session,
-  unstable_getServerSession,
-} from "next-auth";
-import CredentialsProvider from "next-auth/providers/credentials";
-
-export function ThirdwebNextAuth(cfg: ThirdwebNextAuthConfig) {
-  const sdk = ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet");
-
-  function ThirdwebProvider(res: GetServerSidePropsContext["res"]) {
-    return CredentialsProvider({
-      name: "ThirdwebAuth",
-      credentials: {
-        payload: {
-          label: "Payload",
-          type: "text",
-          placeholder: "",
-        },
-      },
-      async authorize({ payload }: any) {
-        try {
-          const parsed = JSON.parse(payload);
-          const token = await sdk.auth.generateAuthToken(cfg.domain, parsed);
-          const address = await sdk.auth.authenticate(cfg.domain, token);
-
-          // Securely set httpOnly cookie on request to prevent XSS on frontend
-          // And set path to / to enable thirdweb_auth_token usage on all endpoints
-          res.setHeader(
-            "Set-Cookie",
-            serialize("thirdweb_auth_token", token, {
-              path: "/",
-              httpOnly: true,
-              secure: true,
-              sameSite: "strict",
-            }),
-          );
-
-          return { address };
-        } catch (err) {
-          return null;
-        }
-      },
-    });
-  }
-
-  function nextOptions(
-    req: GetServerSidePropsContext["req"],
-    res: GetServerSidePropsContext["res"],
-  ): NextAuthOptions {
-    async function session({
-      session: _session,
-    }: {
-      session: Session;
-    }): Promise<Session> {
-      const token = req.cookies.thirdweb_auth_token || "";
-      try {
-        const address = await sdk.auth.authenticate(cfg.domain, token);
-        _session.user = { ..._session.user, address } as Session["user"];
-        return _session;
-      } catch {
-        return _session;
-      }
-    }
-
-    function signOut() {
-      res.setHeader(
-        "Set-Cookie",
-        serialize("thirdweb_auth_token", "", {
-          path: "/",
-          expires: new Date(Date.now() + 5 * 1000),
-        }),
-      );
-    }
-
-    const providers: NextAuthOptions["providers"] = [
-      ...cfg.nextOptions.providers,
-      ThirdwebProvider(res),
-    ];
-
-    const configSession = cfg.nextOptions.callbacks?.session;
-    const callbacks: NextAuthOptions["callbacks"] = {
-      ...cfg.nextOptions.callbacks,
-      session: configSession
-        ? async (params) => {
-            params.session = await session(params);
-            return configSession(params);
-          }
-        : session,
-    };
-
-    const configSignOut = cfg.nextOptions.events?.signOut;
-    const events: NextAuthOptions["events"] = {
-      ...cfg.nextOptions.events,
-      signOut: configSignOut
-        ? async (params) => {
-            signOut();
-            return configSignOut(params);
-          }
-        : signOut,
-    };
-
-    return {
-      ...cfg.nextOptions,
-      providers,
-      callbacks,
-      events,
-    };
-  }
-
-  async function getUser(
-    ...args:
-      | [NextApiRequest, NextApiResponse]
-      | [GetServerSidePropsContext["req"], GetServerSidePropsContext["res"]]
-  ) {
-    return unstable_getServerSession(
-      args[0],
-      args[1],
-      nextOptions(args[0], args[1]),
-    );
-  }
-
-  function NextAuthHandler(...args: [] | [NextApiRequest, NextApiResponse]) {
-    if (args.length === 0) {
-      return (req: NextApiRequest, res: NextApiResponse) => {
-        return NextAuth(req, res, nextOptions(req, res));
-      };
-    }
-
-    return NextAuth(args[0], args[1], nextOptions(args[0], args[1]));
-  }
-
-  return {
-    NextAuthHandler,
-    getUser,
-  };
-}
+export * from "./evm";
@@ -0,0 +1,89 @@
+import loginHandler from "./routes/login";
+import logoutHandler from "./routes/logout";
+import userHandler from "./routes/user";
+import {
+  ThirdwebAuthConfig,
+  ThirdwebAuthContext,
+  ThirdwebAuthRoute,
+  ThirdwebAuthUser,
+} from "./types";
+import { ThirdwebSDK } from "@thirdweb-dev/sdk";
+import { NextRequest } from "next/server";
+import {
+  GetServerSidePropsContext,
+  NextApiRequest,
+  NextApiResponse,
+} from "next/types";
+
+export * from "./types";
+
+async function ThirdwebAuthRouter(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  // Catch-all route must be named with [...thirdweb]
+  const { thirdweb } = req.query;
+  const action = thirdweb?.[0] as ThirdwebAuthRoute;
+
+  switch (action) {
+    case "login":
+      return await loginHandler(req, res, ctx);
+    case "user":
+      return await userHandler(req, res, ctx);
+    case "logout":
+      return await logoutHandler(req, res);
+    default:
+      return res.status(400).json({
+        message: "Invalid route for authentication.",
+      });
+  }
+}
+
+export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
+  const ctx = {
+    ...cfg,
+    sdk: ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet"),
+  };
+
+  function ThirdwebAuthHandler(
+    ...args: [] | [NextApiRequest, NextApiResponse]
+  ) {
+    if (args.length === 0) {
+      return async (req: NextApiRequest, res: NextApiResponse) =>
+        await ThirdwebAuthRouter(req, res, ctx);
+    }
+
+    return ThirdwebAuthRouter(args[0], args[1], ctx);
+  }
+
+  async function getUser(
+    req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
+  ) {
+    const { sdk, domain } = ctx;
+    let user: ThirdwebAuthUser | null = null;
+    const token =
+      typeof req.cookies.get === "function"
+        ? (req.cookies as any).get("thirdweb_auth_token")
+        : (req.cookies as any).thirdweb_auth_token;
+
+    if (token) {
+      try {
+        const address = await sdk.auth.authenticate(domain, token);
+
+        let data = {};
+        if (ctx.callbacks?.user) {
+          data = await ctx.callbacks.user(address);
+        }
+
+        user = { ...data, address };
+      } catch {
+        // No-op
+      }
+    }
+
+    return user;
+  }
+
+  return { ThirdwebAuthHandler, getUser };
+}
@@ -47,7 +47,7 @@ export default async function handler(
      path: "/",
      httpOnly: true,
      secure: true,
-      sameSite: "strict",
+      sameSite: "none",
    }),
  );

@@ -1,83 +1 @@
-import loginHandler from "./routes/login";
-import logoutHandler from "./routes/logout";
-import userHandler from "./routes/user";
-import {
-  ThirdwebAuthConfig,
-  ThirdwebAuthContext,
-  ThirdwebAuthRoute,
-  ThirdwebAuthUser,
-} from "./types";
-import { ThirdwebSDK } from "@thirdweb-dev/sdk";
-import { NextRequest } from "next/server";
-import {
-  GetServerSidePropsContext,
-  NextApiRequest,
-  NextApiResponse,
-} from "next/types";
-
-export * from "./types";
-
-async function ThirdwebAuthRouter(
-  req: NextApiRequest,
-  res: NextApiResponse,
-  ctx: ThirdwebAuthContext,
-) {
-  // Catch-all route must be named with [...thirdweb]
-  const { thirdweb } = req.query;
-  const action = thirdweb?.[0] as ThirdwebAuthRoute;
-
-  switch (action) {
-    case "login":
-      return await loginHandler(req, res, ctx);
-    case "user":
-      return await userHandler(req, res, ctx);
-    case "logout":
-      return await logoutHandler(req, res);
-    default:
-      return res.status(400).json({
-        message: "Invalid route for authentication.",
-      });
-  }
-}
-
-export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
-  const ctx = {
-    ...cfg,
-    sdk: ThirdwebSDK.fromPrivateKey(cfg.privateKey, "mainnet"),
-  };
-
-  function ThirdwebAuthHandler(
-    ...args: [] | [NextApiRequest, NextApiResponse]
-  ) {
-    if (args.length === 0) {
-      return async (req: NextApiRequest, res: NextApiResponse) =>
-        await ThirdwebAuthRouter(req, res, ctx);
-    }
-
-    return ThirdwebAuthRouter(args[0], args[1], ctx);
-  }
-
-  async function getUser(
-    req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
-  ) {
-    const { sdk, domain } = ctx;
-    let user: ThirdwebAuthUser | null = null;
-    const token =
-      typeof req.cookies.get === "function"
-        ? (req.cookies as any).get("thirdweb_auth_token")
-        : (req.cookies as any).thirdweb_auth_token;
-
-    if (token) {
-      try {
-        const address = await sdk.auth.authenticate(domain, token);
-        user = { address };
-      } catch {
-        // No-op
-      }
-    }
-
-    return user;
-  }
-
-  return { ThirdwebAuthHandler, getUser };
-}
+export * from "./evm";
@@ -0,0 +1,89 @@
+import loginHandler from "./routes/login";
+import logoutHandler from "./routes/logout";
+import userHandler from "./routes/user";
+import {
+  ThirdwebAuthConfig,
+  ThirdwebAuthContext,
+  ThirdwebAuthRoute,
+  ThirdwebAuthUser,
+} from "./types";
+import { ThirdwebSDK } from "@thirdweb-dev/sdk/solana";
+import { NextRequest } from "next/server";
+import {
+  GetServerSidePropsContext,
+  NextApiRequest,
+  NextApiResponse,
+} from "next/types";
+
+export * from "./types";
+
+async function ThirdwebAuthRouter(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  // Catch-all route must be named with [...thirdweb]
+  const { thirdweb } = req.query;
+  const action = thirdweb?.[0] as ThirdwebAuthRoute;
+
+  switch (action) {
+    case "login":
+      return await loginHandler(req, res, ctx);
+    case "user":
+      return await userHandler(req, res, ctx);
+    case "logout":
+      return await logoutHandler(req, res);
+    default:
+      return res.status(400).json({
+        message: "Invalid route for authentication.",
+      });
+  }
+}
+
+export function ThirdwebAuth(cfg: ThirdwebAuthConfig) {
+  const ctx = {
+    ...cfg,
+    sdk: ThirdwebSDK.fromPrivateKey("mainnet-beta", cfg.privateKey),
+  };
+
+  function ThirdwebAuthHandler(
+    ...args: [] | [NextApiRequest, NextApiResponse]
+  ) {
+    if (args.length === 0) {
+      return async (req: NextApiRequest, res: NextApiResponse) =>
+        await ThirdwebAuthRouter(req, res, ctx);
+    }
+
+    return ThirdwebAuthRouter(args[0], args[1], ctx);
+  }
+
+  async function getUser(
+    req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
+  ) {
+    const { sdk, domain } = ctx;
+    let user: ThirdwebAuthUser | null = null;
+    const token =
+      typeof req.cookies.get === "function"
+        ? (req.cookies as any).get("thirdweb_auth_token")
+        : (req.cookies as any).thirdweb_auth_token;
+
+    if (token) {
+      try {
+        const address = await sdk.auth.authenticate(domain, token);
+
+        let data = {};
+        if (ctx.callbacks?.user) {
+          data = await ctx.callbacks.user(address);
+        }
+
+        user = { ...data, address };
+      } catch {
+        // No-op
+      }
+    }
+
+    return user;
+  }
+
+  return { ThirdwebAuthHandler, getUser };
+}
@@ -0,0 +1,60 @@
+import { ThirdwebAuthContext } from "../types";
+import { LoginPayload } from "@thirdweb-dev/sdk";
+import { serialize } from "cookie";
+import { NextApiRequest, NextApiResponse } from "next";
+
+function redirectWithError(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  error: string,
+) {
+  const encodedError = encodeURIComponent(error);
+  const url = new URL(req.headers.referer as string);
+  url.searchParams.set("error", encodedError);
+  return res.redirect(url.toString());
+}
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "GET") {
+    return redirectWithError(req, res, "INVALID_METHOD");
+  }
+
+  const { sdk, domain } = ctx;
+
+  // Get signed login payload from the frontend
+  const payload = JSON.parse(atob(req.query.payload as string)) as LoginPayload;
+  if (!payload) {
+    redirectWithError(req, res, "MISSING_LOGIN_PAYLOAD");
+  }
+
+  let token;
+  try {
+    // Generate an access token with the SDK using the signed payload
+    token = await sdk.auth.generateAuthToken(domain, payload);
+  } catch {
+    return redirectWithError(req, res, "INVALID_LOGIN_PAYLOAD");
+  }
+
+  // Securely set httpOnly cookie on request to prevent XSS on frontend
+  // And set path to / to enable thirdweb_auth_token usage on all endpoints
+  res.setHeader(
+    "Set-Cookie",
+    serialize("thirdweb_auth_token", token, {
+      path: "/",
+      httpOnly: true,
+      secure: true,
+      sameSite: "none",
+    }),
+  );
+
+  if (ctx.callbacks?.login) {
+    const address = sdk.auth.verify(domain, payload);
+    await ctx.callbacks.login(address);
+  }
+
+  return res.status(301).redirect(req.query.redirect as string);
+}
@@ -0,0 +1,24 @@
+import { serialize } from "cookie";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+) {
+  if (req.method !== "GET") {
+    return res.status(400).json({
+      error: "Invalid method. Only GET supported.",
+    });
+  }
+
+  // Set the access token to 'none' and expire in 5 seconds
+  res.setHeader(
+    "Set-Cookie",
+    serialize("thirdweb_auth_token", "", {
+      path: "/",
+      expires: new Date(Date.now() + 5 * 1000),
+    }),
+  );
+
+  return res.status(301).redirect(req.headers.referer as string);
+}
@@ -0,0 +1,34 @@
+import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse,
+  ctx: ThirdwebAuthContext,
+) {
+  if (req.method !== "GET") {
+    return res.status(400).json({
+      error: "Invalid method. Only GET supported.",
+    });
+  }
+
+  const { sdk, domain } = ctx;
+  let user = null;
+  const token = req.cookies.thirdweb_auth_token;
+
+  if (token) {
+    try {
+      const address = await sdk.auth.authenticate(domain, token);
+
+      if (ctx.callbacks?.user) {
+        user = await ctx.callbacks.user(address);
+      }
+
+      user = { ...user, address };
+    } catch {
+      // No-op
+    }
+  }
+
+  return res.status(200).json(user as ThirdwebAuthUser | null);
+}
@@ -0,0 +1,34 @@
+import { ThirdwebSDK } from "@thirdweb-dev/sdk/solana";
+
+export type ThirdwebAuthRoute = "login" | "logout" | "user";
+
+export type ThirdwebAuthConfig = {
+  privateKey: string;
+  domain: string;
+  callbacks?: {
+    login?: (address: string) => Promise<void> | void;
+    user?: (
+      address: string,
+    ) =>
+      | Promise<Omit<ThirdwebAuthUser, "address">>
+      | Omit<ThirdwebAuthUser, "address">;
+  };
+};
+
+export type ThirdwebAuthContext = {
+  sdk: ThirdwebSDK;
+  domain: string;
+  callbacks?: {
+    login?: (address: string) => Promise<void> | void;
+    user?: (
+      address: string,
+    ) =>
+      | Promise<Omit<ThirdwebAuthUser, "address">>
+      | Omit<ThirdwebAuthUser, "address">;
+  };
+};
+
+export type ThirdwebAuthUser = {
+  address: string;
+  [key: string]: any;
+};
@@ -1,5 +1,289 @@
 # thirdweb

+## 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
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.2.3
+
+## 0.8.0
+
+### Minor Changes
+
+- [#276](https://github.com/thirdweb-dev/js/pull/276) [`24514a6`](https://github.com/thirdweb-dev/js/commit/24514a6e9fc1316622c1494e5be225e53f88d26e) Thanks [@furqanrydhan](https://github.com/furqanrydhan)! - build is now default compile command, reorganized the help list
+
+- [#279](https://github.com/thirdweb-dev/js/pull/279) [`1918495`](https://github.com/thirdweb-dev/js/commit/1918495f2ee7f50d94083d9577dab0bf1c828c94) Thanks [@furqanrydhan](https://github.com/furqanrydhan)! - Updating command list order, helper text and changed detect -> build
+
+### Patch Changes
+
+- [#277](https://github.com/thirdweb-dev/js/pull/277) [`9de3f8c`](https://github.com/thirdweb-dev/js/commit/9de3f8c8e954733bfc3eb6e8e0e786ff5b296f0c) Thanks [@adam-maj](https://github.com/adam-maj)! - Add recursive folder upload support
+
+- [#268](https://github.com/thirdweb-dev/js/pull/268) [`57b9c67`](https://github.com/thirdweb-dev/js/commit/57b9c671aaf7fce0076dd332c171ba6944752e7a) Thanks [@adam-maj](https://github.com/adam-maj)! - Update storage upload cLI
+
+- Updated dependencies [[`521a49c`](https://github.com/thirdweb-dev/js/commit/521a49c6ec6a73068adcfbc1d94d2f3f17afae86), [`8b3b97c`](https://github.com/thirdweb-dev/js/commit/8b3b97c8f7b3710ce62ed86cfeb4f6de3c23d559), [`25a4773`](https://github.com/thirdweb-dev/js/commit/25a4773bba406f4e270ac86e68c5266d24c08330), [`b2cadf1`](https://github.com/thirdweb-dev/js/commit/b2cadf164cfe9fb27081df7530356baf70ec2b3a), [`d6bb61b`](https://github.com/thirdweb-dev/js/commit/d6bb61b7fac759fff7d6293edd46f693f5a7889c), [`78d6d3c`](https://github.com/thirdweb-dev/js/commit/78d6d3c15968a449924b3f24354e151a90e4b20d), [`89d87a5`](https://github.com/thirdweb-dev/js/commit/89d87a5eb31e78e68e097718e9ae6e4c4d101868), [`41507d3`](https://github.com/thirdweb-dev/js/commit/41507d32a78c556f50c88de81c4d6109b1783c78), [`8096c78`](https://github.com/thirdweb-dev/js/commit/8096c78b466a7f5f9c2aac6e2c56a06f9d3a25d6), [`b1fa171`](https://github.com/thirdweb-dev/js/commit/b1fa17158dcac00265bc8f4d64f1f9708482cdb5), [`18381fa`](https://github.com/thirdweb-dev/js/commit/18381fac73741826934212ac6441842ed42a64a0), [`df048af`](https://github.com/thirdweb-dev/js/commit/df048af605f449279b01d7352b604e7856ac223c), [`d6bb61b`](https://github.com/thirdweb-dev/js/commit/d6bb61b7fac759fff7d6293edd46f693f5a7889c), [`cf88795`](https://github.com/thirdweb-dev/js/commit/cf88795376d3110f9d3aa839928d22276904b15a), [`89b5c6f`](https://github.com/thirdweb-dev/js/commit/89b5c6fe079e4df2cf12cb557aa9784f88c5d159)]:
+  - @thirdweb-dev/sdk@3.2.2
+
+## 0.7.24
+
+### Patch Changes
+
+- [#259](https://github.com/thirdweb-dev/js/pull/259) [`6f95a52`](https://github.com/thirdweb-dev/js/commit/6f95a520e6cc69e08f734705e8adc71431b091cc) Thanks [@adam-maj](https://github.com/adam-maj)! - Add npx thirdweb upload command
+
+- Updated dependencies []:
+  - @thirdweb-dev/sdk@3.2.1
+
+## 0.7.23
+
+### Patch Changes
+
+- [#246](https://github.com/thirdweb-dev/js/pull/246) [`ef0bac7`](https://github.com/thirdweb-dev/js/commit/ef0bac7f44b93939bfc9e2706b39edaa22992eec) Thanks [@simonlim94](https://github.com/simonlim94)! - Renamed initial commit message during thirdweb cli createApp
+
+- Updated dependencies [[`ba6f450`](https://github.com/thirdweb-dev/js/commit/ba6f45027a6ec11aebb4a1918ab2ba4f88894ede), [`c8261b7`](https://github.com/thirdweb-dev/js/commit/c8261b74b5828ac66ea3a6d7636aa57e40ea1a14), [`20745f8`](https://github.com/thirdweb-dev/js/commit/20745f8cd603235eb5039e61a39c0959c5860bca), [`2ea3f00`](https://github.com/thirdweb-dev/js/commit/2ea3f00c41b5e70d9bb634cd86790890520fc4d6), [`9412d41`](https://github.com/thirdweb-dev/js/commit/9412d416832c87ab2c858cb120c6c5de03459c50), [`d677e9d`](https://github.com/thirdweb-dev/js/commit/d677e9d6341252013762882d25408ea8f93791e5), [`e662408`](https://github.com/thirdweb-dev/js/commit/e662408e1936983485936609552f80a56cbed082), [`e4b10bc`](https://github.com/thirdweb-dev/js/commit/e4b10bc5bd12178cba8856b60255732123cb7ae5), [`caf9795`](https://github.com/thirdweb-dev/js/commit/caf979537b5acb1610f182c94afa5d95c208ec3f), [`028cb78`](https://github.com/thirdweb-dev/js/commit/028cb781252b0050943b14cfdf38132c18753a4b), [`1972f3e`](https://github.com/thirdweb-dev/js/commit/1972f3ec0d511fbc17642b2a30852a177092a09e), [`6647f70`](https://github.com/thirdweb-dev/js/commit/6647f707bdd050725264a8a74220c11912f68e57), [`cac373b`](https://github.com/thirdweb-dev/js/commit/cac373b010ce3be3615a36671b66815a27785061)]:
+  - @thirdweb-dev/sdk@3.2.0
+
+## 0.7.22
+
+### Patch Changes
+
+- [#103](https://github.com/thirdweb-dev/js/pull/103) [`e1bcc67`](https://github.com/thirdweb-dev/js/commit/e1bcc67cebfc95fce615439ff03871b4fef0eed9) Thanks [@b4s36t4](https://github.com/b4s36t4)! - automatically re-name the created example repo to the user provided app name
+
+- Updated dependencies [[`8239763`](https://github.com/thirdweb-dev/js/commit/82397636f41faa2b44cfe70e75212f0f42291092), [`27a30e3`](https://github.com/thirdweb-dev/js/commit/27a30e3ffb56dd7fa8412a066bc3ac0977aca8e2), [`f2a6211`](https://github.com/thirdweb-dev/js/commit/f2a62110c43e7b8f35c86a197730e732f8fcc786), [`d26b768`](https://github.com/thirdweb-dev/js/commit/d26b76872a6c85651ee06aa0732ee2967f70db27), [`ba7dcbb`](https://github.com/thirdweb-dev/js/commit/ba7dcbbad8db2b73baf1435f4175d19933cb7d4f), [`9c8a3fb`](https://github.com/thirdweb-dev/js/commit/9c8a3fb6d4520dd6cdf2d1c17f33b764e871599e)]:
+  - @thirdweb-dev/sdk@3.1.2
+
+## 0.7.21
+
+### Patch Changes
+
+- Updated dependencies [[`666ff5f`](https://github.com/thirdweb-dev/js/commit/666ff5f694f1e146150ddb9fa3233f00533b6d60), [`0dade96`](https://github.com/thirdweb-dev/js/commit/0dade96d0d2553d25b386d822e534eb7ed0aefa9), [`c295a47`](https://github.com/thirdweb-dev/js/commit/c295a47144cd722c6f8861c1ec567b53a05ea0bf)]:
+  - @thirdweb-dev/sdk@3.1.1
+
+## 0.7.20
+
+### Patch Changes
+
+- Updated dependencies [[`3c8f620`](https://github.com/thirdweb-dev/js/commit/3c8f6205e9b49ae9fea1f9629678210c6c9c36e6), [`e187d21`](https://github.com/thirdweb-dev/js/commit/e187d21e123a506fac0459da18f2d4fc94abae29), [`acbabc8`](https://github.com/thirdweb-dev/js/commit/acbabc8999b2b7b6e0eb89cae97e2f1ef7143501), [`b030a86`](https://github.com/thirdweb-dev/js/commit/b030a866080953bbf4e504ddc41d7050b250d2d7)]:
+  - @thirdweb-dev/sdk@3.1.0
+
 ## 0.7.19

 ### Patch Changes
@@ -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.

 ---

@@ -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",
 };
@@ -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");
@@ -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/",
    );

@@ -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");
@@ -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/",
    );

@@ -1,7 +1,7 @@
 {
  "name": "thirdweb",
  "main": "dist/cli/index.js",
-  "version": "0.7.19",
+  "version": "0.9.9",
  "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"
@@ -1,37 +1,38 @@
 #!/usr/bin/env node
-import { installGithubAction } from "../common/ci-installer";
 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")
@@ -39,101 +40,45 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
    .version(cliVersion, "-v, --version");

  program
-    .command("create")
+    .command("create [projectType] [projectPath]")
    .description(
-      "Create a thirdweb app from any of our official templates. Checkout some examples you can use here: https://github.com/thirdweb-example/",
+      "Create a web3 app from any of our official templates: https://github.com/thirdweb-example/",
    )
-    .option("--app", `Create a thirdweb app.`)
-    .option("--contract", `Create a thirdweb contracts 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.`,
-    )
-    .action(async (options) => {
-      await twCreate(options);
-    });
-
-  program
-    .command("deploy")
-    .description(
-      "Deploy contracts through your thirdweb dashboard, without dealing with private keys.",
-    )
-    .option("-p, --path <project-path>", "path to project", ".")
-    .option("--dry-run", "dry run (skip actually publishing)")
-    .option("-d, --debug", "show debug logs")
-    .option("--ci", "Continuous Integration mode")
-    .option(
-      "-n, --name [name]",
-      "Name of the pre-built or released contract (such as nft-drop)",
+      "A template to start your project from. You can use an template repository name from the official thirdweb-example org.",
    )
    .option(
-      "-cv, --contract-version [version]",
-      "Version of the released contract",
+      "-c, --contract-name [name]",
+      "Name of the new smart contract to create",
    )
-    .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 processProject(options, "deploy");
-      info(`Open this link to deploy your contracts:`);
-      logger.info(chalk.blueBright(url.toString()));
-      open(url.toString());
+    .action(async (type, path, options) => {
+      await twCreate(type, path, options);
    });

  program
-    .command("release")
-    .description(
-      "Release contracts, making them available for others to deploy and unlocking SDKs, Dashboards and Analytics.",
-    )
-    .option("-p, --path <project-path>", "path to project", ".")
-    .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()));
-      open(url.toString());
-    });
-
-  program
-    .command("detect")
-    .description(
-      "Compile contracts and detect implemented thirdweb contract extensions",
-    )
+    .command("build")
+    .description("Compile contract and detect thirdweb contract extensions")
    .option("-p, --path <project-path>", "path to project", ".")
    .option("-d, --debug", "show debug logs")
    .option("-a, --all", "run detection on all contracts")
@@ -142,14 +87,245 @@ $$$$$$\\   $$$$$$$\\  $$\\  $$$$$$\\   $$$$$$$ |$$\\  $$\\  $$\\  $$$$$$\\  $$$$
    });

  program
-    .command("install-ci")
-    .description(
-      "(alpha) Set up continuous integration for your contracts. This adds a github action to deploy the project on pull requests and pushes to branches. Publishes on push the the main branch.",
+    .command("deploy")
+    .description("Deploy your (or team) contracts securely to blockchains")
+    .option("-p, --path <project-path>", "path to project", ".")
+    .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) => {
-      await installGithubAction(options);
+      const url = await deploy(options);
+      if (url) {
+        open(url);
+      }
    });

+  program
+    .command("release")
+    .description(
+      "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: ${chalk.blueBright(
+          url.toString(),
+        )}`,
+      );
+      open(url.toString());
+    });
+
+  program
+    .command("upload")
+    .description("Upload any file or directory to decentralized storage (IPFS)")
+    .argument("[upload]", "path to file or directory to upload")
+    .action(async (path) => {
+      const storage = new ThirdwebStorage();
+      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: ${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
+    .command("detect")
+    .description(
+      "(deprecated) Compile contracts and detect implemented thirdweb contract extensions",
+    )
+    .option("-p, --path <project-path>", "path to project", ".")
+    .option("-d, --debug", "show debug logs")
+    .option("-a, --all", "run detection on all contracts")
+    .action(async (options) => {
+      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();
 };

@@ -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()}`,
        }),
      );

@@ -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,
        });
      }),
@@ -55,6 +55,7 @@ export class BrownieBuilder extends BaseBuilder {
            metadata: {},
            bytecode,
            sources: [], // TODO
+            fileName: "", // TODO
            name: contractName,
          });
          break;
@@ -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(
@@ -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,
        });
      }
@@ -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,
            });
          }
@@ -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,
        });
      }
@@ -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,
        });
      }
@@ -5,7 +5,7 @@ import { Detector } from "./detector";
 import FoundryDetector from "./foundry";
 import HardhatDetector from "./hardhat";
 import TruffleDetector from "./truffle";
-import fs, { exists, existsSync } from "fs";
+import fs, { existsSync } from "fs";
 import inquirer from "inquirer";
 import { parse } from "path";

@@ -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) {
@@ -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");
+  }
+}
@@ -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")
+    );
+  }
+}
@@ -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");
+  }
+}
@@ -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())
-  );
-}
@@ -17,6 +17,11 @@ export interface ContractPayload {
   */
  metadata: any;

+  /**
+   * The file name of the original compiled file
+   */
+  fileName: string;
+
  /**
   * The source file paths
   */
@@ -4,4 +4,10 @@ export type ProjectType =
  | "hardhat"
  | "truffle"
  | "solc"
+  | "vite"
+  | "next"
+  | "cra"
+  | "spa-webapp"
+  | "yarn"
+  | "npm"
  | "none";
@@ -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) {
@@ -10,6 +10,8 @@ import { makeDir } from "./make-dir";
 import { downloadAndExtractRepo, hasTemplate } from "./templates";
 import retry from "async-retry";
 import chalk from "chalk";
+import fs from "fs";
+import os from "os";
 import path from "path";

 export class DownloadError extends Error {}
@@ -20,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 = "";

@@ -41,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) {
@@ -113,6 +119,20 @@ export async function createApp({
      );
    }

+    const jsonFile = path.join(root, "package.json");
+    const packageString = fs.readFileSync(jsonFile);
+    try {
+      const packageJson = JSON.parse(packageString.toString());
+      if (packageJson) {
+        packageJson.name = appName;
+      }
+
+      fs.writeFileSync(jsonFile, JSON.stringify(packageJson, null, 2) + os.EOL);
+    } catch (e) {
+      console.log("Failed to re-name package.json, continuing...");
+      console.log();
+    }
+
    console.log("Installing packages. This might take a couple of minutes.");
    console.log();

@@ -141,6 +161,21 @@ export async function createApp({
      );
    }

+    const jsonFile = path.join(root, "package.json");
+    const packageString = fs.readFileSync(jsonFile);
+    try {
+      const packageJson = JSON.parse(packageString.toString());
+      if (packageJson) {
+        packageJson.name = appName;
+      }
+
+      fs.writeFileSync(jsonFile, JSON.stringify(packageJson, null, 2) + os.EOL);
+    } catch (e) {
+      console.log("Failed to re-name package.json, continuing...");
+
+      console.log();
+    }
+
    console.log("Installing packages. This might take a couple of minutes.");
    console.log();

@@ -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`,
+        );
+      }
+    }
+  }
 }
@@ -33,7 +33,7 @@ export function tryGitInit(root: string): boolean {
    execSync("git checkout -b main", { stdio: "ignore" });

    execSync("git add -A", { stdio: "ignore" });
-    execSync('git commit -m "Initial commit from Create thirdweb app"', {
+    execSync('git commit -m "Initial commit from npx thirdweb create"', {
      stdio: "ignore",
    });
    return true;
@@ -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);
+    });
+  });
+}
@@ -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}` });
@@ -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",
@@ -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");
+  }
+}
@@ -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();
+}
@@ -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);
+    });
+  });
+}
@@ -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}`;
  }
 }
@@ -0,0 +1,72 @@
+import { spinner } from "../core/helpers/logger";
+import { BufferOrStringWithName, ThirdwebStorage } from "@thirdweb-dev/storage";
+import fs from "fs";
+import path from "path";
+
+function recurseFiles(
+  uploadPath: string,
+  basePath: string,
+): BufferOrStringWithName[] {
+  const files = [];
+
+  const fileType = fs.lstatSync(uploadPath);
+  if (fileType.isFile()) {
+    const fileName = path.relative(basePath, uploadPath);
+    const fileData = fs.readFileSync(uploadPath);
+    files.push({ name: fileName, data: fileData });
+  } else if (fileType.isDirectory()) {
+    const paths = fs.readdirSync(uploadPath);
+    paths.forEach((subPath) => {
+      const fullSubPath = path.join(uploadPath, subPath);
+      const subFiles = recurseFiles(fullSubPath, basePath);
+      subFiles.forEach((file) => files.push(file));
+    });
+  }
+
+  return files;
+}
+
+export async function upload(
+  storage: ThirdwebStorage,
+  uploadPath: string,
+): Promise<string> {
+  if (!uploadPath) {
+    return Promise.reject("No path provided");
+  }
+
+  const pathExists = fs.existsSync(uploadPath);
+  if (!pathExists) {
+    return Promise.reject("Invalid path provided");
+  }
+
+  let uri = "";
+  const fileType = fs.lstatSync(uploadPath);
+  if (fileType.isDirectory()) {
+    const files = recurseFiles(uploadPath, uploadPath);
+
+    if (files.length === 0) {
+      return Promise.reject("No files detected in specified directory");
+    }
+
+    const spin = spinner(
+      "Uploading directory to IPFS. This may take a while depending on file sizes.",
+    );
+    const uris = await storage.uploadBatch(files);
+    spin.succeed("Successfully uploaded directory to IPFS");
+    uri = uris[0].substring(0, uris[0].lastIndexOf("/"));
+  } else if (fileType.isFile()) {
+    const fileName = path.parse(uploadPath).base;
+    const fileData = fs.readFileSync(uploadPath);
+    const file = { name: fileName, data: fileData };
+
+    const spin = spinner(
+      "Uploading file to IPFS. This may take a while depending on file sizes.",
+    );
+    uri = await storage.upload(file, { uploadWithoutDirectory: true });
+    spin.succeed("Succesfully uploaded file to IPFS.");
+  } else {
+    return Promise.reject("Invalid path provided");
+  }
+
+  return uri;
+}
@@ -0,0 +1 @@
+src/
@@ -1,5 +1,41 @@
 # @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
+
+- [#226](https://github.com/thirdweb-dev/js/pull/226) [`f2a6211`](https://github.com/thirdweb-dev/js/commit/f2a62110c43e7b8f35c86a197730e732f8fcc786) Thanks [@jnsdls](https://github.com/jnsdls)! - expose some factories as separate exports
+
 ## 1.1.8

 ### Patch Changes
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWFactory__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWFactory__factory.esm.js"
+}
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWFee__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWFee__factory.esm.js"
+}
@@ -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"
+}
@@ -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"
+}
@@ -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"
+}
@@ -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"
+}
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWProxy__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWProxy__factory.esm.js"
+}
@@ -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"
+}
@@ -0,0 +1,4 @@
+{
+  "main": "dist/thirdweb-dev-contracts-js-factories-TWRegistry__factory.cjs.js",
+  "module": "dist/thirdweb-dev-contracts-js-factories-TWRegistry__factory.esm.js"
+}
@@ -1,18 +1,19 @@
 {
  "name": "@thirdweb-dev/contracts-js",
-  "version": "1.1.8",
+  "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",
-    "ethers": "^5.7.0",
+    "@typechain/ethers-v5": "10.0.0",
+    "ethers": "^5.7.2",
    "typechain": "^8.1.0",
    "typescript": "^4.7.4"
  },
@@ -20,12 +21,16 @@
    "ethers": "^5.7.0"
  },
  "files": [
-    "dist/"
+    "dist/",
+    "factories/"
  ],
+  "preconstruct": {
+    "entrypoints": [
+      "index.ts",
+      "./factories/TW*.ts"
+    ]
+  },
  "scripts": {
-    "format": "prettier --write 'src/**/*'",
-    "lint": "eslint src/",
-    "fix": "eslint src/ --fix",
    "clean": "rm -rf dist/",
    "typechain": "rm -rf ./src && typechain --target ethers-v5 --out-dir src '../../node_modules/@thirdweb-dev/contracts/abi/*.json'",
    "extract-abi": "node ./scripts/extract-abis.mjs",
@@ -1,135 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export interface AppURIInterface extends utils.Interface {
-  functions: {
-    "appURI()": FunctionFragment;
-    "setAppURI(string)": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "appURI" | "setAppURI"): FunctionFragment;
-
-  encodeFunctionData(functionFragment: "appURI", values?: undefined): string;
-  encodeFunctionData(functionFragment: "setAppURI", values: [string]): string;
-
-  decodeFunctionResult(functionFragment: "appURI", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "setAppURI", data: BytesLike): Result;
-
-  events: {
-    "AppURIUpdated(string,string)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "AppURIUpdated"): EventFragment;
-}
-
-export interface AppURIUpdatedEventObject {
-  prevURI: string;
-  newURI: string;
-}
-export type AppURIUpdatedEvent = TypedEvent<
-  [string, string],
-  AppURIUpdatedEventObject
->;
-
-export type AppURIUpdatedEventFilter = TypedEventFilter<AppURIUpdatedEvent>;
-
-export interface AppURI extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: AppURIInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    appURI(overrides?: CallOverrides): Promise<[string]>;
-
-    setAppURI(
-      _uri: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  appURI(overrides?: CallOverrides): Promise<string>;
-
-  setAppURI(
-    _uri: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    appURI(overrides?: CallOverrides): Promise<string>;
-
-    setAppURI(_uri: string, overrides?: CallOverrides): Promise<void>;
-  };
-
-  filters: {
-    "AppURIUpdated(string,string)"(
-      prevURI?: null,
-      newURI?: null
-    ): AppURIUpdatedEventFilter;
-    AppURIUpdated(prevURI?: null, newURI?: null): AppURIUpdatedEventFilter;
-  };
-
-  estimateGas: {
-    appURI(overrides?: CallOverrides): Promise<BigNumber>;
-
-    setAppURI(
-      _uri: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    appURI(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    setAppURI(
-      _uri: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,126 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export interface BatchMintMetadataInterface extends utils.Interface {
-  functions: {
-    "getBaseURICount()": FunctionFragment;
-    "getBatchIdAtIndex(uint256)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic: "getBaseURICount" | "getBatchIdAtIndex"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "getBaseURICount",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getBatchIdAtIndex",
-    values: [BigNumberish]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "getBaseURICount",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getBatchIdAtIndex",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export interface BatchMintMetadata extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: BatchMintMetadataInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    getBaseURICount(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    getBatchIdAtIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-  };
-
-  getBaseURICount(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getBatchIdAtIndex(
-    _index: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  callStatic: {
-    getBaseURICount(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getBatchIdAtIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    getBaseURICount(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getBatchIdAtIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    getBaseURICount(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getBatchIdAtIndex(
-      _index: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,153 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export interface ContractMetadataInterface extends utils.Interface {
-  functions: {
-    "contractURI()": FunctionFragment;
-    "setContractURI(string)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic: "contractURI" | "setContractURI"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "contractURI",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setContractURI",
-    values: [string]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "contractURI",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setContractURI",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "ContractURIUpdated(string,string)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ContractURIUpdated"): EventFragment;
-}
-
-export interface ContractURIUpdatedEventObject {
-  prevURI: string;
-  newURI: string;
-}
-export type ContractURIUpdatedEvent = TypedEvent<
-  [string, string],
-  ContractURIUpdatedEventObject
->;
-
-export type ContractURIUpdatedEventFilter =
-  TypedEventFilter<ContractURIUpdatedEvent>;
-
-export interface ContractMetadata extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: ContractMetadataInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    contractURI(overrides?: CallOverrides): Promise<[string]>;
-
-    setContractURI(
-      _uri: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  contractURI(overrides?: CallOverrides): Promise<string>;
-
-  setContractURI(
-    _uri: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    contractURI(overrides?: CallOverrides): Promise<string>;
-
-    setContractURI(_uri: string, overrides?: CallOverrides): Promise<void>;
-  };
-
-  filters: {
-    "ContractURIUpdated(string,string)"(
-      prevURI?: null,
-      newURI?: null
-    ): ContractURIUpdatedEventFilter;
-    ContractURIUpdated(
-      prevURI?: null,
-      newURI?: null
-    ): ContractURIUpdatedEventFilter;
-  };
-
-  estimateGas: {
-    contractURI(overrides?: CallOverrides): Promise<BigNumber>;
-
-    setContractURI(
-      _uri: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    contractURI(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    setContractURI(
-      _uri: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,89 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export interface CurrencyTransferLibInterface extends utils.Interface {
-  functions: {
-    "NATIVE_TOKEN()": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "NATIVE_TOKEN"): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "NATIVE_TOKEN",
-    values?: undefined
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "NATIVE_TOKEN",
-    data: BytesLike
-  ): Result;
-
-  events: {};
-}
-
-export interface CurrencyTransferLib extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: CurrencyTransferLibInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    NATIVE_TOKEN(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  NATIVE_TOKEN(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    NATIVE_TOKEN(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    NATIVE_TOKEN(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    NATIVE_TOKEN(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,288 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export interface DelayedRevealInterface extends utils.Interface {
-  functions: {
-    "encryptDecrypt(bytes,bytes)": FunctionFragment;
-    "encryptedData(uint256)": FunctionFragment;
-    "getRevealURI(uint256,bytes)": FunctionFragment;
-    "isEncryptedBatch(uint256)": FunctionFragment;
-    "reveal(uint256,bytes)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "encryptDecrypt"
-      | "encryptedData"
-      | "getRevealURI"
-      | "isEncryptedBatch"
-      | "reveal"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "encryptDecrypt",
-    values: [BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "encryptedData",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getRevealURI",
-    values: [BigNumberish, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isEncryptedBatch",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "reveal",
-    values: [BigNumberish, BytesLike]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "encryptDecrypt",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "encryptedData",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getRevealURI",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isEncryptedBatch",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "reveal", data: BytesLike): Result;
-
-  events: {
-    "TokenURIRevealed(uint256,string)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "TokenURIRevealed"): EventFragment;
-}
-
-export interface TokenURIRevealedEventObject {
-  index: BigNumber;
-  revealedURI: string;
-}
-export type TokenURIRevealedEvent = TypedEvent<
-  [BigNumber, string],
-  TokenURIRevealedEventObject
->;
-
-export type TokenURIRevealedEventFilter =
-  TypedEventFilter<TokenURIRevealedEvent>;
-
-export interface DelayedReveal extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: DelayedRevealInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    encryptDecrypt(
-      data: BytesLike,
-      key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string] & { result: string }>;
-
-    encryptedData(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    getRevealURI(
-      _batchId: BigNumberish,
-      _key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string] & { revealedURI: string }>;
-
-    isEncryptedBatch(
-      _batchId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    reveal(
-      identifier: BigNumberish,
-      key: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-  };
-
-  encryptDecrypt(
-    data: BytesLike,
-    key: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  encryptedData(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  getRevealURI(
-    _batchId: BigNumberish,
-    _key: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  isEncryptedBatch(
-    _batchId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  reveal(
-    identifier: BigNumberish,
-    key: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    encryptDecrypt(
-      data: BytesLike,
-      key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    encryptedData(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    getRevealURI(
-      _batchId: BigNumberish,
-      _key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    isEncryptedBatch(
-      _batchId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    reveal(
-      identifier: BigNumberish,
-      key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-  };
-
-  filters: {
-    "TokenURIRevealed(uint256,string)"(
-      index?: BigNumberish | null,
-      revealedURI?: null
-    ): TokenURIRevealedEventFilter;
-    TokenURIRevealed(
-      index?: BigNumberish | null,
-      revealedURI?: null
-    ): TokenURIRevealedEventFilter;
-  };
-
-  estimateGas: {
-    encryptDecrypt(
-      data: BytesLike,
-      key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    encryptedData(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getRevealURI(
-      _batchId: BigNumberish,
-      _key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isEncryptedBatch(
-      _batchId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    reveal(
-      identifier: BigNumberish,
-      key: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    encryptDecrypt(
-      data: BytesLike,
-      key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    encryptedData(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getRevealURI(
-      _batchId: BigNumberish,
-      _key: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isEncryptedBatch(
-      _batchId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    reveal(
-      identifier: BigNumberish,
-      key: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,558 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export declare namespace IClaimCondition {
-  export type ClaimConditionStruct = {
-    startTimestamp: BigNumberish;
-    maxClaimableSupply: BigNumberish;
-    supplyClaimed: BigNumberish;
-    quantityLimitPerTransaction: BigNumberish;
-    waitTimeInSecondsBetweenClaims: BigNumberish;
-    merkleRoot: BytesLike;
-    pricePerToken: BigNumberish;
-    currency: string;
-  };
-
-  export type ClaimConditionStructOutput = [
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber,
-    string
-  ] & {
-    startTimestamp: BigNumber;
-    maxClaimableSupply: BigNumber;
-    supplyClaimed: BigNumber;
-    quantityLimitPerTransaction: BigNumber;
-    waitTimeInSecondsBetweenClaims: BigNumber;
-    merkleRoot: string;
-    pricePerToken: BigNumber;
-    currency: string;
-  };
-}
-
-export declare namespace IDrop {
-  export type AllowlistProofStruct = {
-    proof: BytesLike[];
-    maxQuantityInAllowlist: BigNumberish;
-  };
-
-  export type AllowlistProofStructOutput = [string[], BigNumber] & {
-    proof: string[];
-    maxQuantityInAllowlist: BigNumber;
-  };
-}
-
-export interface DropInterface extends utils.Interface {
-  functions: {
-    "claim(address,uint256,address,uint256,(bytes32[],uint256),bytes)": FunctionFragment;
-    "claimCondition()": FunctionFragment;
-    "getActiveClaimConditionId()": FunctionFragment;
-    "getClaimConditionById(uint256)": FunctionFragment;
-    "getClaimTimestamp(uint256,address)": FunctionFragment;
-    "setClaimConditions((uint256,uint256,uint256,uint256,uint256,bytes32,uint256,address)[],bool)": FunctionFragment;
-    "verifyClaim(uint256,address,uint256,address,uint256,bool)": FunctionFragment;
-    "verifyClaimMerkleProof(uint256,address,uint256,(bytes32[],uint256))": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "claim"
-      | "claimCondition"
-      | "getActiveClaimConditionId"
-      | "getClaimConditionById"
-      | "getClaimTimestamp"
-      | "setClaimConditions"
-      | "verifyClaim"
-      | "verifyClaimMerkleProof"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "claim",
-    values: [
-      string,
-      BigNumberish,
-      string,
-      BigNumberish,
-      IDrop.AllowlistProofStruct,
-      BytesLike
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "claimCondition",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getActiveClaimConditionId",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getClaimConditionById",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getClaimTimestamp",
-    values: [BigNumberish, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setClaimConditions",
-    values: [IClaimCondition.ClaimConditionStruct[], boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "verifyClaim",
-    values: [BigNumberish, string, BigNumberish, string, BigNumberish, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "verifyClaimMerkleProof",
-    values: [BigNumberish, string, BigNumberish, IDrop.AllowlistProofStruct]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "claim", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "claimCondition",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getActiveClaimConditionId",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getClaimConditionById",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getClaimTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setClaimConditions",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "verifyClaim",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "verifyClaimMerkleProof",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "ClaimConditionsUpdated(tuple[],bool)": EventFragment;
-    "TokensClaimed(uint256,address,address,uint256,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ClaimConditionsUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TokensClaimed"): EventFragment;
-}
-
-export interface ClaimConditionsUpdatedEventObject {
-  claimConditions: IClaimCondition.ClaimConditionStructOutput[];
-  resetEligibility: boolean;
-}
-export type ClaimConditionsUpdatedEvent = TypedEvent<
-  [IClaimCondition.ClaimConditionStructOutput[], boolean],
-  ClaimConditionsUpdatedEventObject
->;
-
-export type ClaimConditionsUpdatedEventFilter =
-  TypedEventFilter<ClaimConditionsUpdatedEvent>;
-
-export interface TokensClaimedEventObject {
-  claimConditionIndex: BigNumber;
-  claimer: string;
-  receiver: string;
-  startTokenId: BigNumber;
-  quantityClaimed: BigNumber;
-}
-export type TokensClaimedEvent = TypedEvent<
-  [BigNumber, string, string, BigNumber, BigNumber],
-  TokensClaimedEventObject
->;
-
-export type TokensClaimedEventFilter = TypedEventFilter<TokensClaimedEvent>;
-
-export interface Drop extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: DropInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    claimCondition(
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { currentStartId: BigNumber; count: BigNumber }
-    >;
-
-    getActiveClaimConditionId(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    getClaimConditionById(
-      _conditionId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [IClaimCondition.ClaimConditionStructOutput] & {
-        condition: IClaimCondition.ClaimConditionStructOutput;
-      }
-    >;
-
-    getClaimTimestamp(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        lastClaimTimestamp: BigNumber;
-        nextValidClaimTimestamp: BigNumber;
-      }
-    >;
-
-    setClaimConditions(
-      _conditions: IClaimCondition.ClaimConditionStruct[],
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    verifyClaim(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<[void]>;
-
-    verifyClaimMerkleProof(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, BigNumber] & {
-        validMerkleProof: boolean;
-        merkleProofIndex: BigNumber;
-      }
-    >;
-  };
-
-  claim(
-    _receiver: string,
-    _quantity: BigNumberish,
-    _currency: string,
-    _pricePerToken: BigNumberish,
-    _allowlistProof: IDrop.AllowlistProofStruct,
-    _data: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  claimCondition(
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber] & { currentStartId: BigNumber; count: BigNumber }
-  >;
-
-  getActiveClaimConditionId(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getClaimConditionById(
-    _conditionId: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<IClaimCondition.ClaimConditionStructOutput>;
-
-  getClaimTimestamp(
-    _conditionId: BigNumberish,
-    _claimer: string,
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber] & {
-      lastClaimTimestamp: BigNumber;
-      nextValidClaimTimestamp: BigNumber;
-    }
-  >;
-
-  setClaimConditions(
-    _conditions: IClaimCondition.ClaimConditionStruct[],
-    _resetClaimEligibility: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  verifyClaim(
-    _conditionId: BigNumberish,
-    _claimer: string,
-    _quantity: BigNumberish,
-    _currency: string,
-    _pricePerToken: BigNumberish,
-    verifyMaxQuantityPerTransaction: boolean,
-    overrides?: CallOverrides
-  ): Promise<void>;
-
-  verifyClaimMerkleProof(
-    _conditionId: BigNumberish,
-    _claimer: string,
-    _quantity: BigNumberish,
-    _allowlistProof: IDrop.AllowlistProofStruct,
-    overrides?: CallOverrides
-  ): Promise<
-    [boolean, BigNumber] & {
-      validMerkleProof: boolean;
-      merkleProofIndex: BigNumber;
-    }
-  >;
-
-  callStatic: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    claimCondition(
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & { currentStartId: BigNumber; count: BigNumber }
-    >;
-
-    getActiveClaimConditionId(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getClaimConditionById(
-      _conditionId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<IClaimCondition.ClaimConditionStructOutput>;
-
-    getClaimTimestamp(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        lastClaimTimestamp: BigNumber;
-        nextValidClaimTimestamp: BigNumber;
-      }
-    >;
-
-    setClaimConditions(
-      _conditions: IClaimCondition.ClaimConditionStruct[],
-      _resetClaimEligibility: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifyClaim(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifyClaimMerkleProof(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, BigNumber] & {
-        validMerkleProof: boolean;
-        merkleProofIndex: BigNumber;
-      }
-    >;
-  };
-
-  filters: {
-    "ClaimConditionsUpdated(tuple[],bool)"(
-      claimConditions?: null,
-      resetEligibility?: null
-    ): ClaimConditionsUpdatedEventFilter;
-    ClaimConditionsUpdated(
-      claimConditions?: null,
-      resetEligibility?: null
-    ): ClaimConditionsUpdatedEventFilter;
-
-    "TokensClaimed(uint256,address,address,uint256,uint256)"(
-      claimConditionIndex?: BigNumberish | null,
-      claimer?: string | null,
-      receiver?: string | null,
-      startTokenId?: null,
-      quantityClaimed?: null
-    ): TokensClaimedEventFilter;
-    TokensClaimed(
-      claimConditionIndex?: BigNumberish | null,
-      claimer?: string | null,
-      receiver?: string | null,
-      startTokenId?: null,
-      quantityClaimed?: null
-    ): TokensClaimedEventFilter;
-  };
-
-  estimateGas: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    claimCondition(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getActiveClaimConditionId(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getClaimConditionById(
-      _conditionId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getClaimTimestamp(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    setClaimConditions(
-      _conditions: IClaimCondition.ClaimConditionStruct[],
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    verifyClaim(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    verifyClaimMerkleProof(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    claimCondition(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getActiveClaimConditionId(
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getClaimConditionById(
-      _conditionId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getClaimTimestamp(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setClaimConditions(
-      _conditions: IClaimCondition.ClaimConditionStruct[],
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    verifyClaim(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    verifyClaimMerkleProof(
-      _conditionId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDrop.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,533 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export declare namespace IClaimCondition {
-  export type ClaimConditionStruct = {
-    startTimestamp: BigNumberish;
-    maxClaimableSupply: BigNumberish;
-    supplyClaimed: BigNumberish;
-    quantityLimitPerTransaction: BigNumberish;
-    waitTimeInSecondsBetweenClaims: BigNumberish;
-    merkleRoot: BytesLike;
-    pricePerToken: BigNumberish;
-    currency: string;
-  };
-
-  export type ClaimConditionStructOutput = [
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber,
-    string
-  ] & {
-    startTimestamp: BigNumber;
-    maxClaimableSupply: BigNumber;
-    supplyClaimed: BigNumber;
-    quantityLimitPerTransaction: BigNumber;
-    waitTimeInSecondsBetweenClaims: BigNumber;
-    merkleRoot: string;
-    pricePerToken: BigNumber;
-    currency: string;
-  };
-}
-
-export declare namespace IDropSinglePhase {
-  export type AllowlistProofStruct = {
-    proof: BytesLike[];
-    maxQuantityInAllowlist: BigNumberish;
-  };
-
-  export type AllowlistProofStructOutput = [string[], BigNumber] & {
-    proof: string[];
-    maxQuantityInAllowlist: BigNumber;
-  };
-}
-
-export interface DropSinglePhaseInterface extends utils.Interface {
-  functions: {
-    "claim(address,uint256,address,uint256,(bytes32[],uint256),bytes)": FunctionFragment;
-    "claimCondition()": FunctionFragment;
-    "getClaimTimestamp(address)": FunctionFragment;
-    "setClaimConditions((uint256,uint256,uint256,uint256,uint256,bytes32,uint256,address),bool)": FunctionFragment;
-    "verifyClaim(address,uint256,address,uint256,bool)": FunctionFragment;
-    "verifyClaimMerkleProof(address,uint256,(bytes32[],uint256))": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "claim"
-      | "claimCondition"
-      | "getClaimTimestamp"
-      | "setClaimConditions"
-      | "verifyClaim"
-      | "verifyClaimMerkleProof"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "claim",
-    values: [
-      string,
-      BigNumberish,
-      string,
-      BigNumberish,
-      IDropSinglePhase.AllowlistProofStruct,
-      BytesLike
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "claimCondition",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getClaimTimestamp",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setClaimConditions",
-    values: [IClaimCondition.ClaimConditionStruct, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "verifyClaim",
-    values: [string, BigNumberish, string, BigNumberish, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "verifyClaimMerkleProof",
-    values: [string, BigNumberish, IDropSinglePhase.AllowlistProofStruct]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "claim", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "claimCondition",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getClaimTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setClaimConditions",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "verifyClaim",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "verifyClaimMerkleProof",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "ClaimConditionUpdated(tuple,bool)": EventFragment;
-    "TokensClaimed(address,address,uint256,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ClaimConditionUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TokensClaimed"): EventFragment;
-}
-
-export interface ClaimConditionUpdatedEventObject {
-  condition: IClaimCondition.ClaimConditionStructOutput;
-  resetEligibility: boolean;
-}
-export type ClaimConditionUpdatedEvent = TypedEvent<
-  [IClaimCondition.ClaimConditionStructOutput, boolean],
-  ClaimConditionUpdatedEventObject
->;
-
-export type ClaimConditionUpdatedEventFilter =
-  TypedEventFilter<ClaimConditionUpdatedEvent>;
-
-export interface TokensClaimedEventObject {
-  claimer: string;
-  receiver: string;
-  startTokenId: BigNumber;
-  quantityClaimed: BigNumber;
-}
-export type TokensClaimedEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
-  TokensClaimedEventObject
->;
-
-export type TokensClaimedEventFilter = TypedEventFilter<TokensClaimedEvent>;
-
-export interface DropSinglePhase extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: DropSinglePhaseInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    claimCondition(
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        string,
-        BigNumber,
-        string
-      ] & {
-        startTimestamp: BigNumber;
-        maxClaimableSupply: BigNumber;
-        supplyClaimed: BigNumber;
-        quantityLimitPerTransaction: BigNumber;
-        waitTimeInSecondsBetweenClaims: BigNumber;
-        merkleRoot: string;
-        pricePerToken: BigNumber;
-        currency: string;
-      }
-    >;
-
-    getClaimTimestamp(
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        lastClaimedAt: BigNumber;
-        nextValidClaimTimestamp: BigNumber;
-      }
-    >;
-
-    setClaimConditions(
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    verifyClaim(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<[void]>;
-
-    verifyClaimMerkleProof(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, BigNumber] & {
-        validMerkleProof: boolean;
-        merkleProofIndex: BigNumber;
-      }
-    >;
-  };
-
-  claim(
-    _receiver: string,
-    _quantity: BigNumberish,
-    _currency: string,
-    _pricePerToken: BigNumberish,
-    _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-    _data: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  claimCondition(
-    overrides?: CallOverrides
-  ): Promise<
-    [
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      string,
-      BigNumber,
-      string
-    ] & {
-      startTimestamp: BigNumber;
-      maxClaimableSupply: BigNumber;
-      supplyClaimed: BigNumber;
-      quantityLimitPerTransaction: BigNumber;
-      waitTimeInSecondsBetweenClaims: BigNumber;
-      merkleRoot: string;
-      pricePerToken: BigNumber;
-      currency: string;
-    }
-  >;
-
-  getClaimTimestamp(
-    _claimer: string,
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber] & {
-      lastClaimedAt: BigNumber;
-      nextValidClaimTimestamp: BigNumber;
-    }
-  >;
-
-  setClaimConditions(
-    _condition: IClaimCondition.ClaimConditionStruct,
-    _resetClaimEligibility: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  verifyClaim(
-    _claimer: string,
-    _quantity: BigNumberish,
-    _currency: string,
-    _pricePerToken: BigNumberish,
-    verifyMaxQuantityPerTransaction: boolean,
-    overrides?: CallOverrides
-  ): Promise<void>;
-
-  verifyClaimMerkleProof(
-    _claimer: string,
-    _quantity: BigNumberish,
-    _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-    overrides?: CallOverrides
-  ): Promise<
-    [boolean, BigNumber] & {
-      validMerkleProof: boolean;
-      merkleProofIndex: BigNumber;
-    }
-  >;
-
-  callStatic: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    claimCondition(
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        string,
-        BigNumber,
-        string
-      ] & {
-        startTimestamp: BigNumber;
-        maxClaimableSupply: BigNumber;
-        supplyClaimed: BigNumber;
-        quantityLimitPerTransaction: BigNumber;
-        waitTimeInSecondsBetweenClaims: BigNumber;
-        merkleRoot: string;
-        pricePerToken: BigNumber;
-        currency: string;
-      }
-    >;
-
-    getClaimTimestamp(
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        lastClaimedAt: BigNumber;
-        nextValidClaimTimestamp: BigNumber;
-      }
-    >;
-
-    setClaimConditions(
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifyClaim(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifyClaimMerkleProof(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, BigNumber] & {
-        validMerkleProof: boolean;
-        merkleProofIndex: BigNumber;
-      }
-    >;
-  };
-
-  filters: {
-    "ClaimConditionUpdated(tuple,bool)"(
-      condition?: null,
-      resetEligibility?: null
-    ): ClaimConditionUpdatedEventFilter;
-    ClaimConditionUpdated(
-      condition?: null,
-      resetEligibility?: null
-    ): ClaimConditionUpdatedEventFilter;
-
-    "TokensClaimed(address,address,uint256,uint256)"(
-      claimer?: string | null,
-      receiver?: string | null,
-      startTokenId?: BigNumberish | null,
-      quantityClaimed?: null
-    ): TokensClaimedEventFilter;
-    TokensClaimed(
-      claimer?: string | null,
-      receiver?: string | null,
-      startTokenId?: BigNumberish | null,
-      quantityClaimed?: null
-    ): TokensClaimedEventFilter;
-  };
-
-  estimateGas: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    claimCondition(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getClaimTimestamp(
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    setClaimConditions(
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    verifyClaim(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    verifyClaimMerkleProof(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    claim(
-      _receiver: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    claimCondition(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getClaimTimestamp(
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setClaimConditions(
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    verifyClaim(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    verifyClaimMerkleProof(
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,576 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export declare namespace IClaimCondition {
-  export type ClaimConditionStruct = {
-    startTimestamp: BigNumberish;
-    maxClaimableSupply: BigNumberish;
-    supplyClaimed: BigNumberish;
-    quantityLimitPerTransaction: BigNumberish;
-    waitTimeInSecondsBetweenClaims: BigNumberish;
-    merkleRoot: BytesLike;
-    pricePerToken: BigNumberish;
-    currency: string;
-  };
-
-  export type ClaimConditionStructOutput = [
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    BigNumber,
-    string,
-    BigNumber,
-    string
-  ] & {
-    startTimestamp: BigNumber;
-    maxClaimableSupply: BigNumber;
-    supplyClaimed: BigNumber;
-    quantityLimitPerTransaction: BigNumber;
-    waitTimeInSecondsBetweenClaims: BigNumber;
-    merkleRoot: string;
-    pricePerToken: BigNumber;
-    currency: string;
-  };
-}
-
-export declare namespace IDropSinglePhase1155 {
-  export type AllowlistProofStruct = {
-    proof: BytesLike[];
-    maxQuantityInAllowlist: BigNumberish;
-  };
-
-  export type AllowlistProofStructOutput = [string[], BigNumber] & {
-    proof: string[];
-    maxQuantityInAllowlist: BigNumber;
-  };
-}
-
-export interface DropSinglePhase1155Interface extends utils.Interface {
-  functions: {
-    "claim(address,uint256,uint256,address,uint256,(bytes32[],uint256),bytes)": FunctionFragment;
-    "claimCondition(uint256)": FunctionFragment;
-    "getClaimTimestamp(uint256,address)": FunctionFragment;
-    "setClaimConditions(uint256,(uint256,uint256,uint256,uint256,uint256,bytes32,uint256,address),bool)": FunctionFragment;
-    "verifyClaim(uint256,address,uint256,address,uint256,bool)": FunctionFragment;
-    "verifyClaimMerkleProof(uint256,address,uint256,(bytes32[],uint256))": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "claim"
-      | "claimCondition"
-      | "getClaimTimestamp"
-      | "setClaimConditions"
-      | "verifyClaim"
-      | "verifyClaimMerkleProof"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "claim",
-    values: [
-      string,
-      BigNumberish,
-      BigNumberish,
-      string,
-      BigNumberish,
-      IDropSinglePhase1155.AllowlistProofStruct,
-      BytesLike
-    ]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "claimCondition",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getClaimTimestamp",
-    values: [BigNumberish, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setClaimConditions",
-    values: [BigNumberish, IClaimCondition.ClaimConditionStruct, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "verifyClaim",
-    values: [BigNumberish, string, BigNumberish, string, BigNumberish, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "verifyClaimMerkleProof",
-    values: [
-      BigNumberish,
-      string,
-      BigNumberish,
-      IDropSinglePhase1155.AllowlistProofStruct
-    ]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "claim", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "claimCondition",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "getClaimTimestamp",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setClaimConditions",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "verifyClaim",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "verifyClaimMerkleProof",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "ClaimConditionUpdated(uint256,tuple,bool)": EventFragment;
-    "TokensClaimed(address,address,uint256,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ClaimConditionUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TokensClaimed"): EventFragment;
-}
-
-export interface ClaimConditionUpdatedEventObject {
-  tokenId: BigNumber;
-  condition: IClaimCondition.ClaimConditionStructOutput;
-  resetEligibility: boolean;
-}
-export type ClaimConditionUpdatedEvent = TypedEvent<
-  [BigNumber, IClaimCondition.ClaimConditionStructOutput, boolean],
-  ClaimConditionUpdatedEventObject
->;
-
-export type ClaimConditionUpdatedEventFilter =
-  TypedEventFilter<ClaimConditionUpdatedEvent>;
-
-export interface TokensClaimedEventObject {
-  claimer: string;
-  receiver: string;
-  tokenId: BigNumber;
-  quantityClaimed: BigNumber;
-}
-export type TokensClaimedEvent = TypedEvent<
-  [string, string, BigNumber, BigNumber],
-  TokensClaimedEventObject
->;
-
-export type TokensClaimedEventFilter = TypedEventFilter<TokensClaimedEvent>;
-
-export interface DropSinglePhase1155 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: DropSinglePhase1155Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    claim(
-      _receiver: string,
-      _tokenId: BigNumberish,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    claimCondition(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        string,
-        BigNumber,
-        string
-      ] & {
-        startTimestamp: BigNumber;
-        maxClaimableSupply: BigNumber;
-        supplyClaimed: BigNumber;
-        quantityLimitPerTransaction: BigNumber;
-        waitTimeInSecondsBetweenClaims: BigNumber;
-        merkleRoot: string;
-        pricePerToken: BigNumber;
-        currency: string;
-      }
-    >;
-
-    getClaimTimestamp(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        lastClaimedAt: BigNumber;
-        nextValidClaimTimestamp: BigNumber;
-      }
-    >;
-
-    setClaimConditions(
-      _tokenId: BigNumberish,
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    verifyClaim(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<[void]>;
-
-    verifyClaimMerkleProof(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, BigNumber] & {
-        validMerkleProof: boolean;
-        merkleProofIndex: BigNumber;
-      }
-    >;
-  };
-
-  claim(
-    _receiver: string,
-    _tokenId: BigNumberish,
-    _quantity: BigNumberish,
-    _currency: string,
-    _pricePerToken: BigNumberish,
-    _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-    _data: BytesLike,
-    overrides?: PayableOverrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  claimCondition(
-    arg0: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<
-    [
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      BigNumber,
-      string,
-      BigNumber,
-      string
-    ] & {
-      startTimestamp: BigNumber;
-      maxClaimableSupply: BigNumber;
-      supplyClaimed: BigNumber;
-      quantityLimitPerTransaction: BigNumber;
-      waitTimeInSecondsBetweenClaims: BigNumber;
-      merkleRoot: string;
-      pricePerToken: BigNumber;
-      currency: string;
-    }
-  >;
-
-  getClaimTimestamp(
-    _tokenId: BigNumberish,
-    _claimer: string,
-    overrides?: CallOverrides
-  ): Promise<
-    [BigNumber, BigNumber] & {
-      lastClaimedAt: BigNumber;
-      nextValidClaimTimestamp: BigNumber;
-    }
-  >;
-
-  setClaimConditions(
-    _tokenId: BigNumberish,
-    _condition: IClaimCondition.ClaimConditionStruct,
-    _resetClaimEligibility: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  verifyClaim(
-    _tokenId: BigNumberish,
-    _claimer: string,
-    _quantity: BigNumberish,
-    _currency: string,
-    _pricePerToken: BigNumberish,
-    verifyMaxQuantityPerTransaction: boolean,
-    overrides?: CallOverrides
-  ): Promise<void>;
-
-  verifyClaimMerkleProof(
-    _tokenId: BigNumberish,
-    _claimer: string,
-    _quantity: BigNumberish,
-    _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-    overrides?: CallOverrides
-  ): Promise<
-    [boolean, BigNumber] & {
-      validMerkleProof: boolean;
-      merkleProofIndex: BigNumber;
-    }
-  >;
-
-  callStatic: {
-    claim(
-      _receiver: string,
-      _tokenId: BigNumberish,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    claimCondition(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<
-      [
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        BigNumber,
-        string,
-        BigNumber,
-        string
-      ] & {
-        startTimestamp: BigNumber;
-        maxClaimableSupply: BigNumber;
-        supplyClaimed: BigNumber;
-        quantityLimitPerTransaction: BigNumber;
-        waitTimeInSecondsBetweenClaims: BigNumber;
-        merkleRoot: string;
-        pricePerToken: BigNumber;
-        currency: string;
-      }
-    >;
-
-    getClaimTimestamp(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<
-      [BigNumber, BigNumber] & {
-        lastClaimedAt: BigNumber;
-        nextValidClaimTimestamp: BigNumber;
-      }
-    >;
-
-    setClaimConditions(
-      _tokenId: BigNumberish,
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifyClaim(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifyClaimMerkleProof(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<
-      [boolean, BigNumber] & {
-        validMerkleProof: boolean;
-        merkleProofIndex: BigNumber;
-      }
-    >;
-  };
-
-  filters: {
-    "ClaimConditionUpdated(uint256,tuple,bool)"(
-      tokenId?: BigNumberish | null,
-      condition?: null,
-      resetEligibility?: null
-    ): ClaimConditionUpdatedEventFilter;
-    ClaimConditionUpdated(
-      tokenId?: BigNumberish | null,
-      condition?: null,
-      resetEligibility?: null
-    ): ClaimConditionUpdatedEventFilter;
-
-    "TokensClaimed(address,address,uint256,uint256)"(
-      claimer?: string | null,
-      receiver?: string | null,
-      tokenId?: BigNumberish | null,
-      quantityClaimed?: null
-    ): TokensClaimedEventFilter;
-    TokensClaimed(
-      claimer?: string | null,
-      receiver?: string | null,
-      tokenId?: BigNumberish | null,
-      quantityClaimed?: null
-    ): TokensClaimedEventFilter;
-  };
-
-  estimateGas: {
-    claim(
-      _receiver: string,
-      _tokenId: BigNumberish,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    claimCondition(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getClaimTimestamp(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    setClaimConditions(
-      _tokenId: BigNumberish,
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    verifyClaim(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    verifyClaimMerkleProof(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    claim(
-      _receiver: string,
-      _tokenId: BigNumberish,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      _data: BytesLike,
-      overrides?: PayableOverrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    claimCondition(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getClaimTimestamp(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    setClaimConditions(
-      _tokenId: BigNumberish,
-      _condition: IClaimCondition.ClaimConditionStruct,
-      _resetClaimEligibility: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    verifyClaim(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _currency: string,
-      _pricePerToken: BigNumberish,
-      verifyMaxQuantityPerTransaction: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    verifyClaimMerkleProof(
-      _tokenId: BigNumberish,
-      _claimer: string,
-      _quantity: BigNumberish,
-      _allowlistProof: IDropSinglePhase1155.AllowlistProofStruct,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
@@ -1,531 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-
-/* tslint:disable */
-
-/* eslint-disable */
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-
-export interface ERC1155Interface extends utils.Interface {
-  functions: {
-    "balanceOf(address,uint256)": FunctionFragment;
-    "balanceOfBatch(address[],uint256[])": FunctionFragment;
-    "isApprovedForAll(address,address)": FunctionFragment;
-    "name()": FunctionFragment;
-    "safeBatchTransferFrom(address,address,uint256[],uint256[],bytes)": FunctionFragment;
-    "safeTransferFrom(address,address,uint256,uint256,bytes)": FunctionFragment;
-    "setApprovalForAll(address,bool)": FunctionFragment;
-    "supportsInterface(bytes4)": FunctionFragment;
-    "symbol()": FunctionFragment;
-    "uri(uint256)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "balanceOf"
-      | "balanceOfBatch"
-      | "isApprovedForAll"
-      | "name"
-      | "safeBatchTransferFrom"
-      | "safeTransferFrom"
-      | "setApprovalForAll"
-      | "supportsInterface"
-      | "symbol"
-      | "uri"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "balanceOf",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "balanceOfBatch",
-    values: [string[], BigNumberish[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "isApprovedForAll",
-    values: [string, string]
-  ): string;
-  encodeFunctionData(functionFragment: "name", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "safeBatchTransferFrom",
-    values: [string, string, BigNumberish[], BigNumberish[], BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "safeTransferFrom",
-    values: [string, string, BigNumberish, BigNumberish, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setApprovalForAll",
-    values: [string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "supportsInterface",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(functionFragment: "symbol", values?: undefined): string;
-  encodeFunctionData(functionFragment: "uri", values: [BigNumberish]): string;
-
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "balanceOfBatch",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "isApprovedForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "safeBatchTransferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "safeTransferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setApprovalForAll",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "supportsInterface",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "uri", data: BytesLike): Result;
-
-  events: {
-    "ApprovalForAll(address,address,bool)": EventFragment;
-    "TransferBatch(address,address,address,uint256[],uint256[])": EventFragment;
-    "TransferSingle(address,address,address,uint256,uint256)": EventFragment;
-    "URI(string,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ApprovalForAll"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TransferBatch"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "TransferSingle"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "URI"): EventFragment;
-}
-
-export interface ApprovalForAllEventObject {
-  _owner: string;
-  _operator: string;
-  _approved: boolean;
-}
-export type ApprovalForAllEvent = TypedEvent<
-  [string, string, boolean],
-  ApprovalForAllEventObject
->;
-
-export type ApprovalForAllEventFilter = TypedEventFilter<ApprovalForAllEvent>;
-
-export interface TransferBatchEventObject {
-  _operator: string;
-  _from: string;
-  _to: string;
-  _ids: BigNumber[];
-  _values: BigNumber[];
-}
-export type TransferBatchEvent = TypedEvent<
-  [string, string, string, BigNumber[], BigNumber[]],
-  TransferBatchEventObject
->;
-
-export type TransferBatchEventFilter = TypedEventFilter<TransferBatchEvent>;
-
-export interface TransferSingleEventObject {
-  _operator: string;
-  _from: string;
-  _to: string;
-  _id: BigNumber;
-  _value: BigNumber;
-}
-export type TransferSingleEvent = TypedEvent<
-  [string, string, string, BigNumber, BigNumber],
-  TransferSingleEventObject
->;
-
-export type TransferSingleEventFilter = TypedEventFilter<TransferSingleEvent>;
-
-export interface URIEventObject {
-  _value: string;
-  _id: BigNumber;
-}
-export type URIEvent = TypedEvent<[string, BigNumber], URIEventObject>;
-
-export type URIEventFilter = TypedEventFilter<URIEvent>;
-
-export interface ERC1155 extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: ERC1155Interface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    balanceOf(
-      arg0: string,
-      arg1: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    balanceOfBatch(
-      accounts: string[],
-      ids: BigNumberish[],
-      overrides?: CallOverrides
-    ): Promise<[BigNumber[]]>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    name(overrides?: CallOverrides): Promise<[string]>;
-
-    safeBatchTransferFrom(
-      from: string,
-      to: string,
-      ids: BigNumberish[],
-      amounts: BigNumberish[],
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    safeTransferFrom(
-      from: string,
-      to: string,
-      id: BigNumberish,
-      amount: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    supportsInterface(
-      interfaceId: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    symbol(overrides?: CallOverrides): Promise<[string]>;
-
-    uri(tokenId: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  balanceOf(
-    arg0: string,
-    arg1: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  balanceOfBatch(
-    accounts: string[],
-    ids: BigNumberish[],
-    overrides?: CallOverrides
-  ): Promise<BigNumber[]>;
-
-  isApprovedForAll(
-    arg0: string,
-    arg1: string,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  name(overrides?: CallOverrides): Promise<string>;
-
-  safeBatchTransferFrom(
-    from: string,
-    to: string,
-    ids: BigNumberish[],
-    amounts: BigNumberish[],
-    data: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  safeTransferFrom(
-    from: string,
-    to: string,
-    id: BigNumberish,
-    amount: BigNumberish,
-    data: BytesLike,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  setApprovalForAll(
-    operator: string,
-    approved: boolean,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  supportsInterface(
-    interfaceId: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  symbol(overrides?: CallOverrides): Promise<string>;
-
-  uri(tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    balanceOf(
-      arg0: string,
-      arg1: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    balanceOfBatch(
-      accounts: string[],
-      ids: BigNumberish[],
-      overrides?: CallOverrides
-    ): Promise<BigNumber[]>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    name(overrides?: CallOverrides): Promise<string>;
-
-    safeBatchTransferFrom(
-      from: string,
-      to: string,
-      ids: BigNumberish[],
-      amounts: BigNumberish[],
-      data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    safeTransferFrom(
-      from: string,
-      to: string,
-      id: BigNumberish,
-      amount: BigNumberish,
-      data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    supportsInterface(
-      interfaceId: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    symbol(overrides?: CallOverrides): Promise<string>;
-
-    uri(tokenId: BigNumberish, overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {
-    "ApprovalForAll(address,address,bool)"(
-      _owner?: string | null,
-      _operator?: string | null,
-      _approved?: null
-    ): ApprovalForAllEventFilter;
-    ApprovalForAll(
-      _owner?: string | null,
-      _operator?: string | null,
-      _approved?: null
-    ): ApprovalForAllEventFilter;
-
-    "TransferBatch(address,address,address,uint256[],uint256[])"(
-      _operator?: string | null,
-      _from?: string | null,
-      _to?: string | null,
-      _ids?: null,
-      _values?: null
-    ): TransferBatchEventFilter;
-    TransferBatch(
-      _operator?: string | null,
-      _from?: string | null,
-      _to?: string | null,
-      _ids?: null,
-      _values?: null
-    ): TransferBatchEventFilter;
-
-    "TransferSingle(address,address,address,uint256,uint256)"(
-      _operator?: string | null,
-      _from?: string | null,
-      _to?: string | null,
-      _id?: null,
-      _value?: null
-    ): TransferSingleEventFilter;
-    TransferSingle(
-      _operator?: string | null,
-      _from?: string | null,
-      _to?: string | null,
-      _id?: null,
-      _value?: null
-    ): TransferSingleEventFilter;
-
-    "URI(string,uint256)"(
-      _value?: null,
-      _id?: BigNumberish | null
-    ): URIEventFilter;
-    URI(_value?: null, _id?: BigNumberish | null): URIEventFilter;
-  };
-
-  estimateGas: {
-    balanceOf(
-      arg0: string,
-      arg1: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    balanceOfBatch(
-      accounts: string[],
-      ids: BigNumberish[],
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    name(overrides?: CallOverrides): Promise<BigNumber>;
-
-    safeBatchTransferFrom(
-      from: string,
-      to: string,
-      ids: BigNumberish[],
-      amounts: BigNumberish[],
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    safeTransferFrom(
-      from: string,
-      to: string,
-      id: BigNumberish,
-      amount: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    supportsInterface(
-      interfaceId: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    symbol(overrides?: CallOverrides): Promise<BigNumber>;
-
-    uri(tokenId: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    balanceOf(
-      arg0: string,
-      arg1: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    balanceOfBatch(
-      accounts: string[],
-      ids: BigNumberish[],
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    isApprovedForAll(
-      arg0: string,
-      arg1: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    safeBatchTransferFrom(
-      from: string,
-      to: string,
-      ids: BigNumberish[],
-      amounts: BigNumberish[],
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    safeTransferFrom(
-      from: string,
-      to: string,
-      id: BigNumberish,
-      amount: BigNumberish,
-      data: BytesLike,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    setApprovalForAll(
-      operator: string,
-      approved: boolean,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    supportsInterface(
-      interfaceId: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    symbol(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    uri(
-      tokenId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}
--- a/Show More
+++ b/Show More