Version Packages (#60)

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

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

@@ -0,0 +1,18 @@
+name: "Install"
+description: "Sets up Node.js and runs install"
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: 16
+        registry-url: "https://registry.npmjs.org"
+        cache: "yarn"
+
+    - name: Install dependencies
+      shell: bash
+      run: yarn install --frozen-lockfile
+      env:
+        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"

.github/workflows/CI.yml

@@ -22,18 +22,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-          cache: "yarn"
-
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+      - name: Install
+        uses: ./.github/composite-actions/install
 
       - name: Build
         run: yarn build

.github/workflows/Release.yml

@@ -1,39 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches:
-      - main
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    name: Release
-    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: Checkout Repo
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-          cache: "yarn"
-
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Create Release Pull Request or Publish to npm
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          # This expects you to have a script called release which does a build for your packages and calls changeset publish
-          publish: yarn release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/e2e.yml

@@ -15,17 +15,12 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-          cache: "yarn"
+      - name: Install
+        uses: ./.github/composite-actions/install
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Install Playwright Browsers
+      - name: Install Playwright
         run: npx playwright install --with-deps
 
       - name: Run e2e tests

.github/workflows/nightly.yml

@@ -1,40 +0,0 @@
-name: Release Nightly
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  release:
-    name: Release Nightly
-    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: Checkout Repo
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-          cache: "yarn"
-
-      - name: Install Dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Create an .npmrc for nightly release
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          cat << EOF > "$HOME/.npmrc"
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-
-      - name: Publish Nightly version to NPM
-        run: yarn release:nightly
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-pr.yml

@@ -0,0 +1,80 @@
+# pulled from: https://github.com/changesets/changesets/pull/909
+
+name: release-pr
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  deploy-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: acknowledge deployment request to commenter
+        id: check
+        uses: khan/pull-request-comment-trigger@master
+        with:
+          trigger: "/release-pr"
+          reaction: rocket
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - name: validate user
+        id: validate_user
+        if: ${{ steps.check.outputs.triggered == 'true' }}
+        run: |
+          if [[ "${AUTHOR_ASSOCIATION}" != 'MEMBER' && "${AUTHOR_ASSOCIATION}" != 'OWNER' ]]
+          then
+            echo "User authorization failed"
+            exit 1
+          else
+            echo "User authorization successful"
+          fi
+        env:
+          AUTHOR_ASSOCIATION: ${{ github.event.comment.author_association }}
+      - name: check outputs
+        run: echo ${{ steps.check.outputs.triggered }}
+
+    outputs:
+      triggered: ${{ steps.check.outputs.triggered }}
+      comment_body: ${{ github.event.comment.body }}
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: deploy-check
+    if: needs.deploy-check.outputs.triggered == 'true'
+    steps:
+      - name: get pull request ref
+        id: get_pull_request_ref
+        uses: octokit/[email protected]
+        with:
+          route: GET /repos/{owner}/{repository}/pulls/{issue_id}
+          owner: ${{ github.repository_owner }}
+          repository: ${{ github.event.repository.name }}
+          issue_id: ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: pull the repo.
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: true
+          repository: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.repo.full_name }}
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: Build
+        run: yarn build:release
+
+      - name: Configure npm
+        run: |
+          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Deploy pre-release
+        run: |
+          yarn changeset version --snapshot pr${{ github.event.issue.number }}
+          yarn changeset publish --tag pr${{ github.event.issue.number }} --no-git-tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,49 @@
+name: Release Nightly & Stable
+
+on:
+  push:
+    paths:
+      - ".changeset/**"
+      - "packages/**"
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install
+        uses: ./.github/composite-actions/install
+
+      - name: Build
+        run: yarn build:release
+
+      - name: Create release Pull Request or publish to NPM
+        id: changesets
+        uses: changesets/action@v1
+        with:
+          publish: yarn release
+          version: yarn version-packages
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create @nightly release
+        if: steps.changesets.outputs.published != 'true'
+        run: |
+          git checkout main
+          yarn version-packages:nightly
+          yarn release:nightly
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -16,14 +16,11 @@
     "@changesets/cli": "^2.24.3",
     "@trivago/prettier-plugin-sort-imports": "^3.3.0",
     "eslint": "^8.23.0",
-    "eslint-config-thirdweb": "*",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.7.1",
-    "turbo": "latest",
-    "yarn-deduplicate": "^5.0.2"
+    "turbo": "latest"
   },
   "scripts": {
-    "postinstall": "yarn-deduplicate yarn.lock",
     "test": "turbo run test",
     "e2e": "turbo run e2e",
     "build": "turbo run build",
@@ -33,8 +30,10 @@
     "clean": "turbo run clean && rm -rf node_modules",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "changeset": "changeset",
-    "release": "yarn build:release && changeset publish",
-    "release:nightly": "yarn build:release && changeset version --snapshot nightly && changeset publish --tag nightly --no-git-tag"
+    "version-packages": "changeset version",
+    "release": "changeset publish",
+    "version-packages:nightly": "changeset version --snapshot nightly",
+    "release:nightly": "changeset publish --tag nightly"
   },
   "preconstruct": {
     "packages": [

packages/auth/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @thirdweb-dev/auth
 
+## 1.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`6ba9cad`](https://github.com/thirdweb-dev/js/commit/6ba9cad8d8b933256599dc3b147601cd4828c89b)]:
+  - @thirdweb-dev/sdk@2.4.7
+
+## 1.0.5
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+- Updated dependencies [[`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117)]:
+  - @thirdweb-dev/sdk@2.4.6
+
+## 1.0.4
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
+- Updated dependencies [[`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c)]:
+  - @thirdweb-dev/sdk@2.4.5
+
 ## 1.0.3
 
 ### Patch Changes

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/auth",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "exports": {
     "./package.json": "./package.json",
     "./express": {

packages/cli/CHANGELOG.md

@@ -1,5 +1,30 @@
 # thirdweb
 
+## 0.7.8
+
+### Patch Changes
+
+- Updated dependencies [[`6ba9cad`](https://github.com/thirdweb-dev/js/commit/6ba9cad8d8b933256599dc3b147601cd4828c89b)]:
+  - @thirdweb-dev/sdk@2.4.7
+
+## 0.7.7
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+- Updated dependencies [[`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117)]:
+  - @thirdweb-dev/sdk@2.4.6
+
+## 0.7.6
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
+- Updated dependencies [[`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c)]:
+  - @thirdweb-dev/sdk@2.4.5
+
 ## 0.7.5
 
 ### Patch Changes

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thirdweb",
   "main": "dist/cli/index.js",
-  "version": "0.7.5",
+  "version": "0.7.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com:thirdweb-dev/js.git",

packages/contracts-js/.gitignore

@@ -1 +0,0 @@
-abis

packages/contracts-js/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @thirdweb-dev/contracts-js
 
+## 1.1.6
+
+### Patch Changes
+
+- [#59](https://github.com/thirdweb-dev/js/pull/59) [`6ba9cad`](https://github.com/thirdweb-dev/js/commit/6ba9cad8d8b933256599dc3b147601cd4828c89b) Thanks [@jnsdls](https://github.com/jnsdls)! - move `abis` from top level into `dist` in contracts-js
+
+## 1.1.5
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+## 1.1.4
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
 ## 1.1.3
 
 ### Patch Changes

packages/contracts-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/contracts-js",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "main": "dist/thirdweb-dev-contracts-js.cjs.js",
   "module": "dist/thirdweb-dev-contracts-js.esm.js",
   "license": "Apache-2.0",
@@ -24,17 +24,11 @@
     "ethers": "^5.7.0"
   },
   "files": [
-    "abis/",
     "dist/"
   ],
-  "preconstruct": {
-    "entrypoints": [
-      "index.ts"
-    ]
-  },
   "scripts": {
     "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",
-    "build": "yarn typechain && yarn extract-abi && tsc && yarn preconstruct build"
+    "build": "yarn typechain && tsc && yarn preconstruct build && yarn extract-abi"
   }
 }

packages/contracts-js/scripts/extract-abis.mjs

@@ -14,7 +14,7 @@ const main = () => {
     "node_modules",
     "@thirdweb-dev/contracts/abi",
   );
-  const destinationFolder = "./abis";
+  const destinationFolder = "./dist/abis";
   if (existsSync(destinationFolder)) {
     rmSync(destinationFolder, { recursive: true });
   }

packages/eslint-config-thirdweb/CHANGELOG.md

@@ -1,5 +1,17 @@
 # eslint-config-thirdweb
 
+## 0.1.2
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+## 0.1.1
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
 ## 0.1.0
 
 ### Minor Changes

packages/eslint-config-thirdweb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-thirdweb",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "index.js",
   "license": "Apache-2.0",
   "dependencies": {

packages/react/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @thirdweb-dev/react
 
+## 2.9.5
+
+### Patch Changes
+
+- Updated dependencies [[`6ba9cad`](https://github.com/thirdweb-dev/js/commit/6ba9cad8d8b933256599dc3b147601cd4828c89b)]:
+  - @thirdweb-dev/sdk@2.4.7
+
+## 2.9.4
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+- Updated dependencies [[`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117)]:
+  - @thirdweb-dev/sdk@2.4.6
+  - @thirdweb-dev/storage@0.2.6
+
+## 2.9.3
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
+- Updated dependencies [[`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c)]:
+  - @thirdweb-dev/sdk@2.4.5
+  - @thirdweb-dev/storage@0.2.5
+
 ## 2.9.2
 
 ### Patch Changes

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react",
-  "version": "2.9.2",
+  "version": "2.9.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com:thirdweb-dev/js.git",

packages/sdk/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @thirdweb-dev/sdk
 
+## 2.4.7
+
+### Patch Changes
+
+- [#59](https://github.com/thirdweb-dev/js/pull/59) [`6ba9cad`](https://github.com/thirdweb-dev/js/commit/6ba9cad8d8b933256599dc3b147601cd4828c89b) Thanks [@jnsdls](https://github.com/jnsdls)! - move `abis` from top level into `dist` in contracts-js
+
+- Updated dependencies [[`6ba9cad`](https://github.com/thirdweb-dev/js/commit/6ba9cad8d8b933256599dc3b147601cd4828c89b)]:
+  - @thirdweb-dev/contracts-js@1.1.6
+
+## 2.4.6
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+- Updated dependencies [[`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117)]:
+  - @thirdweb-dev/contracts-js@1.1.5
+  - @thirdweb-dev/storage@0.2.6
+
+## 2.4.5
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
+- Updated dependencies [[`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c)]:
+  - @thirdweb-dev/contracts-js@1.1.4
+  - @thirdweb-dev/storage@0.2.5
+
 ## 2.4.4
 
 ### Patch Changes

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/sdk",
-  "version": "2.4.4",
+  "version": "2.4.7",
   "description": "The main thirdweb SDK.",
   "repository": {
     "directory": "packages/sdk",

packages/sdk/src/common/currency.ts

@@ -1,4 +1,14 @@
+import {
+  getNativeTokenByChainId,
+  NATIVE_TOKEN_ADDRESS,
+} from "../constants/currency";
 import { ContractWrapper } from "../core/classes/contract-wrapper";
+import { AmountSchema } from "../schema/shared";
+import { Amount, Currency, CurrencyValue, Price } from "../types/currency";
+import { BaseERC20 } from "../types/eips";
+import { IERC20, IERC20Metadata } from "@thirdweb-dev/contracts-js";
+import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
+import ERC20MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC20Metadata.json";
 import {
   BigNumber,
   BigNumberish,
@@ -8,16 +18,6 @@ import {
   utils,
   ethers,
 } from "ethers";
-import {
-  getNativeTokenByChainId,
-  NATIVE_TOKEN_ADDRESS,
-} from "../constants/currency";
-import { Amount, Currency, CurrencyValue, Price } from "../types/currency";
-import { AmountSchema } from "../schema/shared";
-import ERC20Abi from "@thirdweb-dev/contracts-js/abis/IERC20.json";
-import ERC20MetadataAbi from "@thirdweb-dev/contracts-js/abis/IERC20Metadata.json";
-import { BaseERC20 } from "../types/eips";
-import { IERC20, IERC20Metadata } from "@thirdweb-dev/contracts-js";
 
 export function isNativeToken(tokenAddress: string): boolean {
   return (

packages/sdk/src/common/marketplace.ts

@@ -1,22 +1,22 @@
-import { BigNumber, BigNumberish, Contract, providers } from "ethers";
 import {
   InterfaceId_IERC1155,
   InterfaceId_IERC721,
 } from "../constants/contract";
-import { ContractWrapper } from "../core/classes/contract-wrapper";
 import { SignerOrProvider } from "../core";
+import { ContractWrapper } from "../core/classes/contract-wrapper";
+import { MAX_BPS } from "../schema/shared";
 import {
   NewAuctionListing,
   NewDirectListing,
   Offer,
 } from "../types/marketplace";
-import invariant from "tiny-invariant";
 import { fetchCurrencyValue } from "./currency";
-import { MAX_BPS } from "../schema/shared";
 import { IERC1155, IERC165, IERC721 } from "@thirdweb-dev/contracts-js";
-import ERC1155Abi from "@thirdweb-dev/contracts-js/abis/IERC1155.json";
-import ERC721Abi from "@thirdweb-dev/contracts-js/abis/IERC721.json";
-import ERC165Abi from "@thirdweb-dev/contracts-js/abis/IERC165.json";
+import ERC165Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC165.json";
+import ERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC721.json";
+import ERC1155Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155.json";
+import { BigNumber, BigNumberish, Contract, providers } from "ethers";
+import invariant from "tiny-invariant";
 
 /**
  * This method checks if the given token is approved for the transferrerContractAddress contract.

packages/sdk/src/common/nft.ts

@@ -1,4 +1,7 @@
-import { BigNumber, BigNumberish, Contract, ethers, providers } from "ethers";
+import {
+  InterfaceId_IERC1155,
+  InterfaceId_IERC721,
+} from "../constants/contract";
 import {
   CommonNFTInput,
   CommonNFTOutput,
@@ -6,17 +9,18 @@ import {
   NFTMetadataInput,
   NFTMetadataOrUri,
 } from "../schema/tokens/common";
-import type { IStorage } from "@thirdweb-dev/storage";
-import { IERC1155Metadata, IERC165, IERC721Metadata } from "@thirdweb-dev/contracts-js";
+import { UploadProgressEvent } from "../types/index";
 import { NotFoundError } from "./error";
 import {
-  InterfaceId_IERC1155,
-  InterfaceId_IERC721,
-} from "../constants/contract";
-import ERC721MetadataAbi from "@thirdweb-dev/contracts-js/abis/IERC721Metadata.json";
-import ERC1155MetadataAbi from "@thirdweb-dev/contracts-js/abis/IERC1155Metadata.json";
-import ERC165MetadataAbi from "@thirdweb-dev/contracts-js/abis/IERC165.json";
-import { UploadProgressEvent } from "../types/index";
+  IERC1155Metadata,
+  IERC165,
+  IERC721Metadata,
+} from "@thirdweb-dev/contracts-js";
+import ERC165MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC165.json";
+import ERC721MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC721Metadata.json";
+import ERC1155MetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155Metadata.json";
+import type { IStorage } from "@thirdweb-dev/storage";
+import { BigNumber, BigNumberish, Contract, ethers, providers } from "ethers";
 
 const FALLBACK_METADATA = {
   name: "Failed to load NFT metadata",

packages/sdk/src/constants/erc1155-features.ts

@@ -1,12 +1,12 @@
-import DelayedRevealAbi from "@thirdweb-dev/contracts-js/abis/DelayedReveal.json";
-import DropSinglePhase1155 from "@thirdweb-dev/contracts-js/abis/DropSinglePhase1155.json";
-import IBurnableERC1155Abi from "@thirdweb-dev/contracts-js/abis/IBurnableERC1155.json";
-import Erc1155Abi from "@thirdweb-dev/contracts-js/abis/IERC1155.json";
-import Erc1155EnumerableAbi from "@thirdweb-dev/contracts-js/abis/IERC1155Enumerable.json";
-import ILazyMintAbi from "@thirdweb-dev/contracts-js/abis/ILazyMint.json";
-import IMintableERC1155Abi from "@thirdweb-dev/contracts-js/abis/IMintableERC1155.json";
-import MulticallAbi from "@thirdweb-dev/contracts-js/abis/IMulticall.json";
-import ISignatureMintERC1155Abi from "@thirdweb-dev/contracts-js/abis/ISignatureMintERC1155.json";
+import DelayedRevealAbi from "@thirdweb-dev/contracts-js/dist/abis/DelayedReveal.json";
+import DropSinglePhase1155 from "@thirdweb-dev/contracts-js/dist/abis/DropSinglePhase1155.json";
+import IBurnableERC1155Abi from "@thirdweb-dev/contracts-js/dist/abis/IBurnableERC1155.json";
+import Erc1155Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155.json";
+import Erc1155EnumerableAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155Enumerable.json";
+import ILazyMintAbi from "@thirdweb-dev/contracts-js/dist/abis/ILazyMint.json";
+import IMintableERC1155Abi from "@thirdweb-dev/contracts-js/dist/abis/IMintableERC1155.json";
+import MulticallAbi from "@thirdweb-dev/contracts-js/dist/abis/IMulticall.json";
+import ISignatureMintERC1155Abi from "@thirdweb-dev/contracts-js/dist/abis/ISignatureMintERC1155.json";
 
 export const FEATURE_EDITION_BURNABLE = {
   name: "ERC1155Burnable",
@@ -114,6 +114,7 @@ export const FEATURE_EDITION = {
     [FEATURE_EDITION_MINTABLE.name]: FEATURE_EDITION_MINTABLE,
     [FEATURE_EDITION_DROPPABLE.name]: FEATURE_EDITION_DROPPABLE,
     [FEATURE_EDITION_REVEALABLE.name]: FEATURE_EDITION_REVEALABLE,
-    [FEATURE_EDITION_SIGNATURE_MINTABLE.name]: FEATURE_EDITION_SIGNATURE_MINTABLE,
+    [FEATURE_EDITION_SIGNATURE_MINTABLE.name]:
+      FEATURE_EDITION_SIGNATURE_MINTABLE,
   },
 } as const;

packages/sdk/src/constants/erc20-features.ts

@@ -1,9 +1,9 @@
-import IBurnableERC20Abi from "@thirdweb-dev/contracts-js/abis/IBurnableERC20.json";
-import IDropSinglePhase from "@thirdweb-dev/contracts-js/abis/IDropSinglePhase.json";
-import ERC20Abi from "@thirdweb-dev/contracts-js/abis/IERC20.json";
-import IMintableERC20Abi from "@thirdweb-dev/contracts-js/abis/IMintableERC20.json";
-import MulticallAbi from "@thirdweb-dev/contracts-js/abis/IMulticall.json";
-import ISignatureMintERC20Abi from "@thirdweb-dev/contracts-js/abis/ISignatureMintERC20.json";
+import IBurnableERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IBurnableERC20.json";
+import IDropSinglePhase from "@thirdweb-dev/contracts-js/dist/abis/IDropSinglePhase.json";
+import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
+import IMintableERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IMintableERC20.json";
+import MulticallAbi from "@thirdweb-dev/contracts-js/dist/abis/IMulticall.json";
+import ISignatureMintERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/ISignatureMintERC20.json";
 
 export const FEATURE_TOKEN_DROPPABLE = {
   name: "ERC20Droppable",

packages/sdk/src/constants/erc721-features.ts

@@ -1,13 +1,13 @@
-import Erc721Abi from "@thirdweb-dev/contracts-js/abis/IERC721.json";
-import Erc721EnumerableAbi from "@thirdweb-dev/contracts-js/abis/IERC721Enumerable.json";
-import Erc721SupplyAbi from "@thirdweb-dev/contracts-js/abis/IERC721Supply.json";
-import IMintableERC721Abi from "@thirdweb-dev/contracts-js/abis/IMintableERC721.json";
-import MulticallAbi from "@thirdweb-dev/contracts-js/abis/IMulticall.json";
-import DelayedRevealAbi from "@thirdweb-dev/contracts-js/abis/IDelayedReveal.json";
-import ILazyMintAbi from "@thirdweb-dev/contracts-js/abis/ILazyMint.json";
-import IDropSinglePhase from "@thirdweb-dev/contracts-js/abis/IDropSinglePhase.json";
-import SignatureMintERC721Abi from "@thirdweb-dev/contracts-js/abis/SignatureMintERC721.json";
-import IBurnableERC721Abi from "@thirdweb-dev/contracts-js/abis/IBurnableERC721.json";
+import IBurnableERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IBurnableERC721.json";
+import DelayedRevealAbi from "@thirdweb-dev/contracts-js/dist/abis/IDelayedReveal.json";
+import IDropSinglePhase from "@thirdweb-dev/contracts-js/dist/abis/IDropSinglePhase.json";
+import Erc721Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC721.json";
+import Erc721EnumerableAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC721Enumerable.json";
+import Erc721SupplyAbi from "@thirdweb-dev/contracts-js/dist/abis/IERC721Supply.json";
+import ILazyMintAbi from "@thirdweb-dev/contracts-js/dist/abis/ILazyMint.json";
+import IMintableERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IMintableERC721.json";
+import MulticallAbi from "@thirdweb-dev/contracts-js/dist/abis/IMulticall.json";
+import SignatureMintERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/SignatureMintERC721.json";
 
 export const FEATURE_NFT_BURNABLE = {
   name: "ERC721Burnable",

packages/sdk/src/constants/thirdweb-features.ts

@@ -1,8 +1,8 @@
-import IContractMetadataAbi from "@thirdweb-dev/contracts-js/abis/IContractMetadata.json";
-import IPermissionsAbi from "@thirdweb-dev/contracts-js/abis/IPermissions.json";
-import IThirdwebPlatformFeeAbi from "@thirdweb-dev/contracts-js/abis/IPlatformFee.json";
-import IThirdwebPrimarySaleAbi from "@thirdweb-dev/contracts-js/abis/IPrimarySale.json";
-import IThirdwebRoyaltyAbi from "@thirdweb-dev/contracts-js/abis/IRoyalty.json";
+import IContractMetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IContractMetadata.json";
+import IPermissionsAbi from "@thirdweb-dev/contracts-js/dist/abis/IPermissions.json";
+import IThirdwebPlatformFeeAbi from "@thirdweb-dev/contracts-js/dist/abis/IPlatformFee.json";
+import IThirdwebPrimarySaleAbi from "@thirdweb-dev/contracts-js/dist/abis/IPrimarySale.json";
+import IThirdwebRoyaltyAbi from "@thirdweb-dev/contracts-js/dist/abis/IRoyalty.json";
 
 export const FEATURE_ROYALTY = {
   name: "Royalty",

packages/sdk/src/contracts/edition-drop.ts

@@ -28,7 +28,7 @@ import { SDKOptions } from "../schema/sdk-options";
 import { NFTMetadata, NFTMetadataOrUri } from "../schema/tokens/common";
 import { QueryAllParams, UploadProgressEvent } from "../types";
 import { DropERC1155 } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/DropERC1155.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/DropERC1155.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, constants } from "ethers";
 

packages/sdk/src/contracts/edition.ts

@@ -29,7 +29,7 @@ import {
 } from "../schema/tokens/edition";
 import { QueryAllParams } from "../types";
 import { TokenERC1155 } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/TokenERC1155.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/TokenERC1155.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, constants } from "ethers";
 

packages/sdk/src/contracts/marketplace.ts

@@ -19,7 +19,7 @@ import { DEFAULT_QUERY_ALL_COUNT } from "../types/QueryParams";
 import { AuctionListing, DirectListing } from "../types/marketplace";
 import { MarketplaceFilter } from "../types/marketplace/MarketPlaceFilter";
 import { Marketplace as MarketplaceContract } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/Marketplace.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/Marketplace.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, constants } from "ethers";
 import invariant from "tiny-invariant";

packages/sdk/src/contracts/multiwrap.ts

@@ -30,7 +30,7 @@ import {
   WrappedTokens,
 } from "../types/multiwrap";
 import { Multiwrap as MultiwrapContract } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/Multiwrap.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/Multiwrap.json";
 import {
   ITokenBundle,
   TokensWrappedEvent,

packages/sdk/src/contracts/nft-collection.ts

@@ -26,7 +26,7 @@ import { TokenErc721ContractSchema } from "../schema/contracts/token-erc721";
 import { SDKOptions } from "../schema/sdk-options";
 import { QueryAllParams } from "../types";
 import { TokenERC721 } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/TokenERC721.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/TokenERC721.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, constants } from "ethers";
 

packages/sdk/src/contracts/nft-drop.ts

@@ -35,7 +35,7 @@ import { ClaimVerification } from "../types";
 import { DEFAULT_QUERY_ALL_COUNT, QueryAllParams } from "../types/QueryParams";
 import { UploadProgressEvent } from "../types/events";
 import { DropERC721 } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/DropERC721.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/DropERC721.json";
 import {
   TokensClaimedEvent,
   TokensLazyMintedEvent,

packages/sdk/src/contracts/pack.ts

@@ -32,7 +32,7 @@ import {
 } from "../schema/tokens/pack";
 import { QueryAllParams } from "../types";
 import { Pack as PackContract } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/Pack.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/Pack.json";
 import {
   ITokenBundle,
   PackCreatedEvent,

packages/sdk/src/contracts/signature-drop.ts

@@ -37,7 +37,7 @@ import {
 import { UploadProgressEvent } from "../types";
 import { DEFAULT_QUERY_ALL_COUNT, QueryAllParams } from "../types/QueryParams";
 import { SignatureDrop as SignatureDropContract } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/SignatureDrop.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/SignatureDrop.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, constants } from "ethers";
 

packages/sdk/src/contracts/split.ts

@@ -12,8 +12,8 @@ import { SDKOptions } from "../schema/sdk-options";
 import { SplitRecipient } from "../types/SplitRecipient";
 import { CurrencyValue } from "../types/currency";
 import { IERC20, Split as SplitContract } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/abis/IERC20.json";
-import ABI from "@thirdweb-dev/contracts-js/abis/Split.json";
+import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/Split.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, Contract } from "ethers";
 

packages/sdk/src/contracts/token-drop.ts

@@ -16,7 +16,7 @@ import { DropErc20ContractSchema } from "../schema/contracts/drop-erc20";
 import { SDKOptions } from "../schema/sdk-options";
 import { Amount, CurrencyValue } from "../types";
 import { DropERC20 } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/DropERC20.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/DropERC20.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { constants } from "ethers";
 

packages/sdk/src/contracts/token.ts

@@ -19,7 +19,7 @@ import { SDKOptions } from "../schema/sdk-options";
 import { TokenMintInput } from "../schema/tokens/token";
 import { Amount, CurrencyValue } from "../types";
 import { TokenERC20 } from "@thirdweb-dev/contracts-js";
-import ABI from "@thirdweb-dev/contracts-js/abis/TokenERC20.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/TokenERC20.json";
 import { IStorage } from "@thirdweb-dev/storage";
 import { constants } from "ethers";
 

packages/sdk/src/contracts/vote.ts

@@ -22,8 +22,8 @@ import {
   VoteSettings,
 } from "../types/vote";
 import { IERC20, VoteERC20 } from "@thirdweb-dev/contracts-js";
-import ERC20Abi from "@thirdweb-dev/contracts-js/abis/IERC20.json";
-import ABI from "@thirdweb-dev/contracts-js/abis/VoteERC20.json";
+import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
+import ABI from "@thirdweb-dev/contracts-js/dist/abis/VoteERC20.json";
 import { ProposalCreatedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/VoteERC20";
 import { IStorage } from "@thirdweb-dev/storage";
 import { BigNumber, BigNumberish, Contract, ethers } from "ethers";

packages/sdk/src/core/classes/contract-publisher.ts

@@ -32,7 +32,7 @@ import {
   ContractPublisher as OnChainContractPublisher,
   IContractPublisher,
 } from "@thirdweb-dev/contracts-js";
-import ContractPublisherAbi from "@thirdweb-dev/contracts-js/abis/ContractPublisher.json";
+import ContractPublisherAbi from "@thirdweb-dev/contracts-js/dist/abis/ContractPublisher.json";
 import { ContractPublishedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/ContractPublisher";
 import { IStorage } from "@thirdweb-dev/storage";
 import { constants, utils } from "ethers";

packages/sdk/src/core/classes/delayed-reveal.ts

@@ -1,24 +1,28 @@
-import { BigNumber, BigNumberish, ethers } from "ethers";
-import { ContractWrapper } from "./contract-wrapper";
-import { DropERC721, IThirdwebContract, SignatureDrop } from "@thirdweb-dev/contracts-js";
+import { hasFunction } from "../../common";
+import { fetchTokenMetadataForContract } from "../../common/nft";
+import { FeatureName } from "../../constants/contract-features";
 import {
   CommonNFTInput,
   NFTMetadata,
   NFTMetadataInput,
 } from "../../schema/tokens/common";
-import { TransactionResult, TransactionResultWithId } from "../index";
-import { IStorage } from "@thirdweb-dev/storage";
-import { fetchTokenMetadataForContract } from "../../common/nft";
 import { BatchToReveal } from "../../types/delayed-reveal";
-import { UploadProgressEvent } from "../../types/events";
 import {
   BaseDelayedRevealERC1155,
   BaseDelayedRevealERC721,
 } from "../../types/eips";
-import { hasFunction } from "../../common";
-import DeprecatedAbi from "@thirdweb-dev/contracts-js/abis/IDelayedRevealDeprecated.json";
-import { FeatureName } from "../../constants/contract-features";
+import { UploadProgressEvent } from "../../types/events";
+import { TransactionResult, TransactionResultWithId } from "../index";
+import { ContractWrapper } from "./contract-wrapper";
+import {
+  DropERC721,
+  IThirdwebContract,
+  SignatureDrop,
+} from "@thirdweb-dev/contracts-js";
+import DeprecatedAbi from "@thirdweb-dev/contracts-js/dist/abis/IDelayedRevealDeprecated.json";
 import { TokensLazyMintedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/DropERC721";
+import { IStorage } from "@thirdweb-dev/storage";
+import { BigNumber, BigNumberish, ethers } from "ethers";
 
 /**
  * Handles delayed reveal logic

packages/sdk/src/core/classes/drop-claim-conditions.ts

@@ -1,5 +1,30 @@
-import { IStorage } from "@thirdweb-dev/storage";
+import { includesErrorMessage } from "../../common";
+import {
+  getClaimerProofs,
+  prepareClaim,
+  processClaimConditionInputs,
+  transformResultToClaimCondition,
+  updateExistingClaimConditions,
+} from "../../common/claim-conditions";
+import { isNativeToken } from "../../common/currency";
+import {
+  detectContractFeature,
+  hasFunction,
+} from "../../common/feature-detection";
+import { isNode } from "../../common/utils";
+import { NATIVE_TOKEN_ADDRESS } from "../../constants/index";
+import { ClaimEligibility } from "../../enums";
+import { AmountSchema } from "../../schema";
+import {
+  Amount,
+  ClaimCondition,
+  ClaimConditionInput,
+  ClaimVerification,
+} from "../../types";
+import { BaseClaimConditionERC721, BaseDropERC20 } from "../../types/eips";
+import { TransactionResult } from "../types";
 import { ContractMetadata } from "./contract-metadata";
+import { ContractWrapper } from "./contract-wrapper";
 import {
   ContractMetadata as ContractMetadataContract,
   DropERC20,
@@ -9,36 +34,11 @@ import {
   IERC20Metadata,
   SignatureDrop,
 } from "@thirdweb-dev/contracts-js";
-import { BigNumber, BigNumberish, constants, ethers, utils } from "ethers";
-import { isNativeToken } from "../../common/currency";
-import { ContractWrapper } from "./contract-wrapper";
-import {
-  Amount,
-  ClaimCondition,
-  ClaimConditionInput,
-  ClaimVerification,
-} from "../../types";
-import { ClaimEligibility } from "../../enums";
-import { TransactionResult } from "../types";
-import {
-  getClaimerProofs,
-  prepareClaim,
-  processClaimConditionInputs,
-  transformResultToClaimCondition,
-  updateExistingClaimConditions,
-} from "../../common/claim-conditions";
-import {
-  detectContractFeature,
-  hasFunction,
-} from "../../common/feature-detection";
-import { AmountSchema } from "../../schema";
-import { includesErrorMessage } from "../../common";
-import ERC20Abi from "@thirdweb-dev/contracts-js/abis/IERC20.json";
-import { isNode } from "../../common/utils";
-import deepEqual from "fast-deep-equal";
-import { BaseClaimConditionERC721, BaseDropERC20 } from "../../types/eips";
-import { NATIVE_TOKEN_ADDRESS } from "../../constants/index";
+import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { IDropClaimCondition } from "@thirdweb-dev/contracts-js/dist/declarations/src/DropERC20";
+import { IStorage } from "@thirdweb-dev/storage";
+import { BigNumber, BigNumberish, constants, ethers, utils } from "ethers";
+import deepEqual from "fast-deep-equal";
 
 /**
  * Manages claim conditions for NFT Drop contracts

packages/sdk/src/core/classes/marketplace-direct.ts

@@ -1,3 +1,29 @@
+import { ListingNotFoundError, WrongListingTypeError } from "../../common";
+import {
+  fetchCurrencyValue,
+  isNativeToken,
+  normalizePriceValue,
+  setErc20Allowance,
+} from "../../common/currency";
+import {
+  handleTokenApproval,
+  isTokenApprovedForTransfer,
+  mapOffer,
+  validateNewListingParam,
+} from "../../common/marketplace";
+import { fetchTokenMetadataForContract } from "../../common/nft";
+import {
+  InterfaceId_IERC1155,
+  InterfaceId_IERC721,
+} from "../../constants/contract";
+import { ListingType } from "../../enums";
+import { Price } from "../../types/currency";
+import {
+  DirectListing,
+  NewDirectListing,
+  Offer,
+} from "../../types/marketplace";
+import { TransactionResult, TransactionResultWithId } from "../types";
 import { ContractWrapper } from "./contract-wrapper";
 import {
   IERC1155,
@@ -6,6 +32,11 @@ import {
   IMarketplace,
   Marketplace,
 } from "@thirdweb-dev/contracts-js";
+import ERC165Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC165.json";
+import ERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC721.json";
+import ERC1155Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC1155.json";
+import { ListingAddedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/Marketplace";
+import { IStorage } from "@thirdweb-dev/storage";
 import {
   BigNumber,
   BigNumberish,
@@ -14,38 +45,7 @@ import {
   constants,
   utils,
 } from "ethers";
-import {
-  DirectListing,
-  NewDirectListing,
-  Offer,
-} from "../../types/marketplace";
-import { ListingNotFoundError, WrongListingTypeError } from "../../common";
-import { ListingType } from "../../enums";
-import { TransactionResult, TransactionResultWithId } from "../types";
-import {
-  fetchCurrencyValue,
-  isNativeToken,
-  normalizePriceValue,
-  setErc20Allowance,
-} from "../../common/currency";
-import { Price } from "../../types/currency";
-import { fetchTokenMetadataForContract } from "../../common/nft";
-import {
-  InterfaceId_IERC1155,
-  InterfaceId_IERC721,
-} from "../../constants/contract";
-import {
-  handleTokenApproval,
-  isTokenApprovedForTransfer,
-  mapOffer,
-  validateNewListingParam,
-} from "../../common/marketplace";
-import { IStorage } from "@thirdweb-dev/storage";
 import invariant from "tiny-invariant";
-import ERC1155Abi from "@thirdweb-dev/contracts-js/abis/IERC1155.json";
-import ERC721Abi from "@thirdweb-dev/contracts-js/abis/IERC721.json";
-import ERC165Abi from "@thirdweb-dev/contracts-js/abis/IERC165.json";
-import { ListingAddedEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/Marketplace";
 
 /**
  * Handles direct listings

packages/sdk/src/core/wallet/UserWallet.ts

@@ -1,18 +1,18 @@
-import { RPCConnectionHandler } from "../classes/rpc-connection-handler";
-import { NetworkOrSignerOrProvider, TransactionResult } from "../types";
-import { SDKOptions } from "../../schema";
-import invariant from "tiny-invariant";
-import { Amount, CurrencyValue } from "../../types";
 import {
   fetchCurrencyValue,
   isNativeToken,
   normalizePriceValue,
 } from "../../common/currency";
 import { NATIVE_TOKEN_ADDRESS } from "../../constants";
-import ERC20Abi from "@thirdweb-dev/contracts-js/abis/IERC20.json";
+import { SDKOptions } from "../../schema";
+import { Amount, CurrencyValue } from "../../types";
 import { ContractWrapper } from "../classes/contract-wrapper";
+import { RPCConnectionHandler } from "../classes/rpc-connection-handler";
+import { NetworkOrSignerOrProvider, TransactionResult } from "../types";
 import { IERC20 } from "@thirdweb-dev/contracts-js";
+import ERC20Abi from "@thirdweb-dev/contracts-js/dist/abis/IERC20.json";
 import { ethers, BigNumber, providers } from "ethers";
+import invariant from "tiny-invariant";
 
 /**
  * Connect and Interact with a user wallet

packages/solana/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @thirdweb-dev/solana
 
+## 0.2.5
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+- Updated dependencies [[`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117)]:
+  - @thirdweb-dev/storage@0.2.6
+
+## 0.2.4
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
+- Updated dependencies [[`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c)]:
+  - @thirdweb-dev/storage@0.2.5
+
 ## 0.2.3
 
 ### Patch Changes

packages/solana/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/solana",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "thirdweb Solana SDK",
   "main": "dist/thirdweb-dev-solana.cjs.js",
   "module": "dist/thirdweb-dev-solana.esm.js",

packages/storage/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @thirdweb-dev/storage
 
+## 0.2.6
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+## 0.2.5
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
 ## 0.2.4
 
 ### Patch Changes

packages/storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/storage",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "main": "dist/thirdweb-dev-storage.cjs.js",
   "module": "dist/thirdweb-dev-storage.esm.js",
   "repository": {

packages/tw-tsconfig/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @thirdweb-dev/tsconfig
 
+## 0.1.3
+
+### Patch Changes
+
+- [`5644ccd`](https://github.com/thirdweb-dev/js/commit/5644ccd3ee2ff330e4e5840d3266033376750117) Thanks [@jnsdls](https://github.com/jnsdls)! - bump versions again
+
+## 0.1.2
+
+### Patch Changes
+
+- [`091f175`](https://github.com/thirdweb-dev/js/commit/091f1758604d40e825ea28a13c2699d67bc75d8c) Thanks [@jnsdls](https://github.com/jnsdls)! - release-all-packages
+
 ## 0.1.1
 
 ### Patch Changes

packages/tw-tsconfig/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/tsconfig",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "license": "Apache-2.0",
   "main": "index.js",
   "files": [

turbo.json

@@ -13,10 +13,6 @@
       "outputs": ["dist/**", "server/**"],
       "dependsOn": ["^build"]
     },
-    "contracts-js#build": {
-      "outputs": ["dist/**", "abis/**"],
-      "dependsOn": ["^build"]
-    },
     "test": {
       "outputs": [],
       "inputs": ["src/**", "test/**"],

yarn.lock

@@ -4249,11 +4249,6 @@
   dependencies:
     "@walletconnect/window-getters" "^1.0.0"
 
-"@yarnpkg/lockfile@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
-
 "@zag-js/[email protected]":
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/@zag-js/core/-/core-0.1.10.tgz#71ec3366fafd7eed1aba7989ef370b2a105cee3c"
@@ -5755,7 +5750,7 @@ commander@^8.1.0, commander@^8.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-commander@^9.1.0, commander@^9.4.0:
+commander@^9.1.0:
   version "9.4.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c"
   integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
@@ -14161,16 +14156,6 @@ yargs@^17.1.1, yargs@^17.3.0, yargs@^17.3.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
-yarn-deduplicate@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-5.0.2.tgz#b56484c94d8f1163a828bf20516607f89c078675"
-  integrity sha512-pxKa+dM7DMQ4X2vYLKqGCUgtEoTtdMVk9gNoIsxsMSP0rOV51IWFcKHfRIcZjAPNgHTrxz46sKB4xr7Nte7jdw==
-  dependencies:
-    "@yarnpkg/lockfile" "^1.1.0"
-    commander "^9.4.0"
-    semver "^7.3.7"
-    tslib "^2.4.0"
-
 [email protected]:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"