Compare commits

..
Author SHA1 Message Date
github-actions[bot]andgithub-actions[bot] f525e2cc23 Version Packages (#455)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-12-16 15:28:02 +13:00
Nacho Iacovino af85389dc0 [CLI] Fix deprecated links (#461) 2022-12-13 16:20:34 -08:00
Jonas DanielsandJoaquim Verges ccb4ce8d00 [Wallets] - magic wallet connector (#457)
Co-authored-by: Joaquim Verges <[email protected]>
2022-12-13 13:58:49 +13:00
Joaquim Verges 4cdd0bd634 [SDK] Fixes for latest wallet package integration (#458) 2022-12-08 22:13:16 +00:00
ea95c5f609 [SDK] add two new utilities toEther and toWei (#421)
Co-authored-by: Nacho Iacovino <[email protected]>
Co-authored-by: Jonas Daniels <[email protected]>
2022-12-08 12:46:41 -08:00
Joaquim Verges 699a2b16fb [SOL] Fix claiming drops with custom currencies (#456) 2022-12-08 09:32:47 +00:00
Joaquim Verges a8267f912d [SOL] Drop fixes for batch upload (#453) 2022-12-08 21:59:47 +13:00
Jonas Daniels c673e39f23 upgrade dependencies across the codebase (#454) 2022-12-08 08:19:16 +00:00
Yehia TarekandJonas Daniels 08d04fe4dc [React] add props for button title to change the text (#422)
Co-authored-by: Jonas Daniels <[email protected]>
2022-12-08 08:09:23 +00:00
github-actions[bot]andgithub-actions[bot] cbf5508bd5 Version Packages (#449)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-12-07 14:21:51 +13:00
Joaquim Verges 3731459d33 [SDK] Less strict prebuilt checks to support OSRF variants (#451) 2022-12-07 13:08:12 +13:00
Adam Majmudar 64f24f1bb1 CLI auto-updates on every run (#441) 2022-12-06 02:40:31 +00:00
Joaquim Verges cac6c30bca [SDK] Fix setting allowance or approvals gaslessly (#450) 2022-12-06 11:49:04 +13:00
Adam Majmudar e7740a59db Detect if forge isn't installed and display error (#447) 2022-12-05 16:54:13 -05:00
Jonas Daniels 7a37e564fd [SDK, React] - useContract fail fast (#448) 2022-12-05 21:41:58 +00:00
github-actions[bot]andgithub-actions[bot] e173636f4b Version Packages (#446)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-12-04 11:34:00 +13:00
Joaquim Verges 8c6cdaa288 [SDK] Fix creating listings with a magic.link wallet (#443) 2022-12-03 21:58:44 +00:00
github-actions[bot]andgithub-actions[bot] ad9b3febff Version Packages (#445)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-12-04 07:49:38 +13:00
Adam Majmudar 94f49b1294 Move framework check back to template (#444) 2022-12-03 18:40:46 +00:00
github-actions[bot]andgithub-actions[bot] 517e2a75e3 Version Packages (#442)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-12-02 16:26:33 -08:00
Jonas Daniels 72692689e9 initialize pay package (#433) 2022-12-02 22:52:04 +00:00
Jonas Daniels efc56fa580 [SDK] - improved batch provider (#440) 2022-12-02 22:39:11 +00:00
github-actions[bot]andgithub-actions[bot] 564b17e760 Version Packages (#419)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-12-03 11:25:35 +13:00
dependabot[bot] b4507db963 Bump decode-uri-component from 0.2.0 to 0.2.2 (#439)
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-02 14:10:31 -08:00
Joaquim Verges f451da6395 [SDK] Fix SigMint detection for OSRF NFT Collection contracts (#438) 2022-12-03 11:00:21 +13:00
Jonas Daniels ee47840767 fix #429 (#436) 2022-12-02 10:47:46 -08:00
Adam Majmudar bef97f72f4 [CLI] Make solc default backup compilation (#435) 2022-12-02 17:11:20 +00:00
Adam Majmudar 3e87dd3ccb [CLI] display file names when there are duplicate contract names (#432) 2022-12-02 03:21:40 +00:00
Joaquim Verges def42511ff [SOL] Remove workaround for getLargestAccount (#434) 2022-12-02 02:42:26 +00:00
Adam Majmudar c42545a647 [CLI] fix CLI on paths with spaces for windows (#431) 2022-12-01 19:03:54 -05:00
Adam Majmudar 6e20d1f21a [CLI] allow adding contracts to existing projects (#428) 2022-12-01 20:31:06 +00:00
Joaquim Verges e684d7e1ca [CLI] Fix metadata upload with special characters (#430) 2022-12-01 20:14:27 +00:00
Adam Majmudar f545a67e9f [Auth] include credentials when requesting user (#425) 2022-12-01 18:17:31 +00:00
Jake Loo 034a257442 [SDK] Support more types of Minimal Proxy (#429) 2022-12-01 20:30:09 +13:00
Joaquim VergesandJonas Daniels 1bfb91dbf3 [SDK] Improve error parsing for other wallets (#424)
Co-authored-by: Jonas Daniels <[email protected]>
2022-11-30 18:02:21 -08:00
Jonas Daniels 5d95cbcdb2 fix turbo (#427) 2022-12-01 00:52:06 +00:00
Jonas Daniels 639e535ed5 init unity-js-bridge package (#420) 2022-11-30 22:36:16 +00:00
Adam MajmudarandJonas Daniels af3acc6b10 [SDK] Add support for AWS KMS (#416)
Co-authored-by: Jonas Daniels <[email protected]>
2022-11-28 20:34:24 -08:00
Joaquim Verges eca47763cd [SDK] increase gas limit for opening packs (#418) 2022-11-29 03:30:15 +00:00
github-actions[bot]andgithub-actions[bot] 37b5bec897 Version Packages (#417)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-11-28 18:23:23 -08:00
Nacho Iacovino 48d91e4431 [CLI] Fix mappings for prebuilts (#415) 2022-11-28 18:13:00 -08:00
github-actions[bot]andgithub-actions[bot] a20be881e3 Version Packages (#406)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2022-11-29 12:09:38 +13:00
Joaquim Verges 47f8945325 [SDK] improve error parsing (#414) 2022-11-29 11:45:33 +13:00
Furqan Rydhan 1b0bf99da7 Improvements to the App Deploy Flow (#413) 2022-11-28 14:23:44 -08:00
Eason Chai Jun WeiandJoaquim Verges f03be398e0 [SDK] Update signTypedData domain to match contract (#412)
Co-authored-by: Joaquim Verges <[email protected]>
2022-11-28 03:00:50 +00:00
27996cb4bc [CLI] - feat: add solana support to cli (#403)
Co-authored-by: Jarrod Watts <[email protected]>
Co-authored-by: Jonas Daniels <[email protected]>
2022-11-24 01:01:00 +00:00
2eaa67acbe [CLI+SDK] app-uri (#283)
Co-authored-by: Furqan Rydhan <[email protected]>
Co-authored-by: Jonas Daniels <[email protected]>
2022-11-23 09:17:29 +00:00
Jonas Daniels aafd7968df bring the registry-url back apparently it was important 2022-11-23 01:05:43 -08:00
Jonas Daniels 48797c7cf0 [SDK] - add gasless feature detection (#408) 2022-11-23 00:53:59 -08:00
Jonas Daniels 4edcb37100 update prettier & format (#407) 2022-11-23 06:41:39 +00:00
Adam MajmudarandJonas Daniels 83dcaf7058 Expose sdk.fromWallet and wallet classes (#402)
Co-authored-by: Jonas Daniels <[email protected]>
2022-11-22 18:15:28 -05:00
162 changed files with 8262 additions and 2306 deletions
+1 -1
View File
@@ -13,6 +13,6 @@ runs:
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash
run: yarn install run: yarn install --frozen-lockfile
env: env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1" PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1"
-1
View File
@@ -28,7 +28,6 @@
| [/storage](./packages/storage) | Best in class decentralized storage SDK for Browser and Node | <a href="https://www.npmjs.com/package/@thirdweb-dev/storage"><img src="https://img.shields.io/npm/v/@thirdweb-dev/storage?color=red&label=npm&logo=npm" alt="npm version"/></a> | | [/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> | | [/cli](./packages/cli) | Publish and deploy smart contracts without dealing with private keys | <a href="https://www.npmjs.com/package/thirdweb"><img src="https://img.shields.io/npm/v/thirdweb?color=red&label=npm&logo=npm" alt="npm version"/></a> |
## Documentation ## Documentation
Visit [https://portal.thirdweb.com/](https://portal.thirdweb.com/) to view the full documentation. Visit [https://portal.thirdweb.com/](https://portal.thirdweb.com/) to view the full documentation.
+1 -1
View File
@@ -36,7 +36,7 @@
"@changesets/cli": "^2.24.3", "@changesets/cli": "^2.24.3",
"@manypkg/cli": "^0.19.1", "@manypkg/cli": "^0.19.1",
"@manypkg/get-packages": "^1.1.3", "@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", "eslint": "^8.21.0",
"postinstall-postinstall": "^2.1.0", "postinstall-postinstall": "^2.1.0",
"prettier": "^2.7.1", "prettier": "^2.7.1",
+16
View File
@@ -1,5 +1,21 @@
# @thirdweb-dev/auth # @thirdweb-dev/auth
## 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.32
## 2.0.31 ## 2.0.31
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@thirdweb-dev/auth", "name": "@thirdweb-dev/auth",
"version": "2.0.32", "version": "2.0.38",
"exports": { "exports": {
"./next": { "./next": {
"module": "./next/dist/thirdweb-dev-auth-next.esm.js", "module": "./next/dist/thirdweb-dev-auth-next.esm.js",
@@ -43,7 +43,7 @@ export default async function handler(
path: "/", path: "/",
httpOnly: true, httpOnly: true,
secure: true, secure: true,
sameSite: "strict", sameSite: "none",
}), }),
); );
+2 -2
View File
@@ -40,11 +40,11 @@ export function ThirdwebNextAuth(cfg: ThirdwebNextAuthConfig) {
path: "/", path: "/",
httpOnly: true, httpOnly: true,
secure: true, secure: true,
sameSite: "strict", sameSite: "none",
}), }),
); );
return { address }; return { id: address, address };
} catch (err) { } catch (err) {
return null; return null;
} }
+1 -1
View File
@@ -47,7 +47,7 @@ export default async function handler(
path: "/", path: "/",
httpOnly: true, httpOnly: true,
secure: true, secure: true,
sameSite: "strict", sameSite: "none",
}), }),
); );
@@ -47,7 +47,7 @@ export default async function handler(
path: "/", path: "/",
httpOnly: true, httpOnly: true,
secure: true, secure: true,
sameSite: "strict", sameSite: "none",
}), }),
); );
+80
View File
@@ -1,5 +1,85 @@
# thirdweb # thirdweb
## 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 ## 0.8.18
### Patch Changes ### Patch Changes
+1 -1
View File
@@ -62,7 +62,7 @@ Deploying released contracts give deployers access to automatic SDKs to integrat
npx thirdweb@latest detect 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.
--- ---
+3 -1
View File
@@ -1,6 +1,8 @@
export const CREATE_MESSAGES = { export const CREATE_MESSAGES = {
typeOfProject: "What type of project do you want to create?", typeOfProject: "What type of project do you want to create?",
projectName: "What is your project named?", 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?", framework: "What framework do you want to use?",
language: "What language do you want to use?", language: "What language do you want to use?",
contract: "What type of contract do you want to start from?", contract: "What type of contract do you want to start from?",
@@ -9,5 +11,5 @@ export const CREATE_MESSAGES = {
export const ERROR_MESSAGES = { export const ERROR_MESSAGES = {
noConfiguration: noConfiguration:
"Failed to find a supported project configuration file in current directory", "No contract project configuration file found in current directory",
}; };
+3 -1
View File
@@ -2,7 +2,7 @@ import { CREATE_MESSAGES } from "../constants/constants";
import { prepareEnvironment } from "@gmrchk/cli-testing-library"; import { prepareEnvironment } from "@gmrchk/cli-testing-library";
// this creates an app, can take some time that's fine // this creates an app, can take some time that's fine
jest.setTimeout(120_000); jest.setTimeout(150_000);
describe("npx thirdweb create", () => { describe("npx thirdweb create", () => {
it("should create app (CRA) successfully", async () => { it("should create app (CRA) successfully", async () => {
@@ -16,6 +16,8 @@ describe("npx thirdweb create", () => {
await pressKey("enter"); await pressKey("enter");
await waitForText(CREATE_MESSAGES.projectName); await waitForText(CREATE_MESSAGES.projectName);
await pressKey("enter"); await pressKey("enter");
await waitForText(CREATE_MESSAGES.chain);
await pressKey("enter");
await waitForText(CREATE_MESSAGES.framework); await waitForText(CREATE_MESSAGES.framework);
// select CRA // select CRA
await pressKey("arrowDown"); await pressKey("arrowDown");
+3 -3
View File
@@ -15,8 +15,8 @@ describe("npx thirdweb deploy", () => {
`${path}/BasicContract.sol`, `${path}/BasicContract.sol`,
); );
const { waitForText, waitForFinish, getExitCode, writeText, getStdout } = const { waitForText, waitForFinish, getExitCode, writeText, getStderr } =
await spawn("node", "./dist/cli/index.js deploy"); await spawn("node", "./dist/cli/index.js deploy --contract");
expect(await exists("BasicContract.sol")).toEqual(true); expect(await exists("BasicContract.sol")).toEqual(true);
@@ -26,7 +26,7 @@ describe("npx thirdweb deploy", () => {
// wait for program to finish // wait for program to finish
await waitForFinish(); await waitForFinish();
expect(getStdout().at(-1)).toContain( expect(getStderr().at(-1)).toContain(
"https://thirdweb.com/contracts/deploy/", "https://thirdweb.com/contracts/deploy/",
); );
+4
View File
@@ -19,6 +19,10 @@ describe("npx thirdweb detect", () => {
await create.waitForText(CREATE_MESSAGES.framework); await create.waitForText(CREATE_MESSAGES.framework);
// select hardhat // select hardhat
await create.pressKey("enter"); 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); await create.waitForText(CREATE_MESSAGES.contract);
// select ERC721 // select ERC721
await create.pressKey("arrowDown"); await create.pressKey("arrowDown");
+2 -2
View File
@@ -15,7 +15,7 @@ describe("npx thirdweb release", () => {
`${path}/BasicContract.sol`, `${path}/BasicContract.sol`,
); );
const { waitForText, waitForFinish, getExitCode, writeText, getStdout } = const { waitForText, waitForFinish, getExitCode, writeText, getStderr } =
await spawn("node", "./dist/cli/index.js release"); await spawn("node", "./dist/cli/index.js release");
expect(await exists("BasicContract.sol")).toEqual(true); expect(await exists("BasicContract.sol")).toEqual(true);
@@ -26,7 +26,7 @@ describe("npx thirdweb release", () => {
// wait for program to finish // wait for program to finish
await waitForFinish(); await waitForFinish();
expect(getStdout().at(-1)).toContain( expect(getStderr().at(-1)).toContain(
"https://thirdweb.com/contracts/release/", "https://thirdweb.com/contracts/release/",
); );
+5 -4
View File
@@ -1,7 +1,7 @@
{ {
"name": "thirdweb", "name": "thirdweb",
"main": "dist/cli/index.js", "main": "dist/cli/index.js",
"version": "0.8.18", "version": "0.9.7",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli", "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
"author": "thirdweb eng <[email protected]>", "author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0", "license": "Apache-2.0",
@@ -18,12 +18,12 @@
"@types/prompts": "^2.0.14", "@types/prompts": "^2.0.14",
"@types/rimraf": "^3.0.0", "@types/rimraf": "^3.0.0",
"@types/tar": "^6.1.2", "@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", "@types/validate-npm-package-name": "^4.0.0",
"hardhat": "^2.9.3", "hardhat": "^2.9.3",
"jest": "^28", "jest": "^29",
"prettier": "^2.7.1", "prettier": "^2.7.1",
"ts-jest": "^28.0.8", "ts-jest": "^29.0.3",
"ts-node": "^10.7.0", "ts-node": "^10.7.0",
"tsup": "^6.2.3", "tsup": "^6.2.3",
"typescript": "^4.7.4" "typescript": "^4.7.4"
@@ -32,6 +32,7 @@
"@thirdweb-dev/sdk": "*", "@thirdweb-dev/sdk": "*",
"async-retry": "^1.3.3", "async-retry": "^1.3.3",
"commander": "^9.1.0", "commander": "^9.1.0",
"detect-package-manager": "^2.0.1",
"enquirer": "^2.3.6", "enquirer": "^2.3.6",
"ethers": "^5.7.2", "ethers": "^5.7.2",
"got": "11.8.5", "got": "11.8.5",
+229 -68
View File
@@ -2,37 +2,37 @@
import { detectExtensions } from "../common/feature-detector"; import { detectExtensions } from "../common/feature-detector";
import { processProject } from "../common/processor"; import { processProject } from "../common/processor";
import { cliVersion, pkg } from "../constants/urls"; 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 { 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 { upload } from "../storage/command";
import { ThirdwebStorage } from "@thirdweb-dev/storage"; import { ThirdwebStorage } from "@thirdweb-dev/storage";
import chalk from "chalk"; import chalk from "chalk";
import { exec, spawn } from "child_process";
import { Command } from "commander"; import { Command } from "commander";
import open from "open"; import open from "open";
import prompts from "prompts";
const main = async () => { 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(); const program = new Command();
//yes this has to look like this, eliminates whitespace // yes this has to look like this, eliminates whitespace
console.info(` if (!skipIntro) {
$$\\ $$\\ $$\\ $$\\ $$\\ console.info(`
$$ | $$ | \\__| $$ | $$ | $$\\ $$\\ $$\\ $$\\ $$\\
$$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$$$$\\ $$ | $$ | \\__| $$ | $$ |
\\_$$ _| $$ __$$\\ $$ |$$ __$$\\ $$ __$$ |$$ | $$ | $$ |$$ __$$\\ $$ __$$\\ $$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$$$$\\
$$ | $$ | $$ |$$ |$$ | \\__|$$ / $$ |$$ | $$ | $$ |$$$$$$$$ |$$ | $$ | \\_$$ _| $$ __$$\\ $$ |$$ __$$\\ $$ __$$ |$$ | $$ | $$ |$$ __$$\\ $$ __$$\\
$$ |$$\\ $$ | $$ |$$ |$$ | $$ | $$ |$$ | $$ | $$ |$$ ____|$$ | $$ | $$ | $$ | $$ |$$ |$$ | \\__|$$ / $$ |$$ | $$ | $$ |$$$$$$$$ |$$ | $$ |
\\$$$$ |$$ | $$ |$$ |$$ | \\$$$$$$$ |\\$$$$$\\$$$$ |\\$$$$$$$\\ $$$$$$$ | $$ |$$\\ $$ | $$ |$$ |$$ | $$ | $$ |$$ | $$ | $$ |$$ ____|$$ | $$ |
\\____/ \\__| \\__|\\__|\\__| \\_______| \\_____\\____/ \\_______|\\_______/ `); \\$$$$ |$$ | $$ |$$ |$$ | \\$$$$$$$ |\\$$$$$\\$$$$ |\\$$$$$$$\\ $$$$$$$ |
console.info(`\n 💎 thirdweb-cli v${cliVersion} 💎\n`); \\____/ \\__| \\__|\\__|\\__| \\_______| \\_____\\____/ \\_______|\\_______/ `);
import("update-notifier").then(({ default: updateNotifier }) => { console.info(`\n 💎 thirdweb-cli v${cliVersion} 💎\n`);
updateNotifier({ }
pkg,
shouldNotifyInNpmScript: true,
// check every time while we're still building the CLI
updateCheckInterval: 0,
}).notify();
});
program program
.name("thirdweb-cli") .name("thirdweb-cli")
@@ -40,34 +40,40 @@ $$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$
.version(cliVersion, "-v, --version"); .version(cliVersion, "-v, --version");
program program
.command("create [projectPath]") .command("create [projectType] [projectPath]")
.description( .description(
"Create a web3 app from any of our official templates: https://github.com/thirdweb-example/", "Create a web3 app from any of our official templates: https://github.com/thirdweb-example/",
) )
.option("--app", `Create a web3 app.`) .option("--app", "Create a web3 app.")
.option("--contract", `Create a web3 contract project`) .option("--contract", "Create a web3 contract project")
.option("--ts, --typescript", `Initialize as a TypeScript project.`) .option("--ts, --typescript", "Initialize as a TypeScript project.")
.option("--js, --javascript", `Initialize as a JavaScript project.`) .option("--js, --javascript", "Initialize as a JavaScript project.")
.option("--forge", `Initialize as a Forge project.`) .option("--forge", "Initialize as a Forge project.")
.option("--hardhat", `Initialize as a Hardhat project.`) .option("--hardhat", "Initialize as a Hardhat project.")
.option("--cra", `Initialize as a Create React App project.`) .option("--cra", "Initialize as a Create React App project.")
.option("--next", `Initialize as a Next.js project.`) .option("--next", "Initialize as a Next.js project.")
.option("--vite", `Initialize as a Vite project.`) .option("--vite", "Initialize as a Vite project.")
.option( .option(
"--use-npm", "--use-npm",
`Explicitly tell the CLI to bootstrap the app using npm`, "Explicitly tell the CLI to bootstrap the app using npm",
) )
.option( .option(
"--use-pnpm", "--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( .option(
"-t, --template [name]", "-t, --template [name]",
`A template to start your project from. You can use an template repository name from the official thirdweb-example org.`, "A template to start your project from. You can use an template repository name from the official thirdweb-example org.",
) )
.action(async (path, options) => { .option(
await twCreate(path, options); "-c, --contract-name [name]",
"Name of the new smart contract to create",
)
.action(async (type, path, options) => {
await twCreate(type, path, options);
}); });
program program
@@ -87,39 +93,33 @@ $$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$
.option("--dry-run", "dry run (skip actually publishing)") .option("--dry-run", "dry run (skip actually publishing)")
.option("-d, --debug", "show debug logs") .option("-d, --debug", "show debug logs")
.option("--ci", "Continuous Integration mode") .option("--ci", "Continuous Integration mode")
.option(
"--dist-path [distPath]",
"Path to the dist folder where the HTML based App is",
)
.option( .option(
"-n, --name [name]", "-n, --name [name]",
"Name of the pre-built or released contract (such as nft-drop)", "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( .option(
"-cv, --contract-version [version]", "-cv, --contract-version [version]",
"Version of the released contract", "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) => { .action(async (options) => {
if (options.name) { const url = await deploy(options);
const url = generateDashboardUrl(options.name, options.contractVersion); if (url) {
open(url);
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());
}); });
program program
@@ -128,13 +128,24 @@ $$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$
"Release your protocol so other devs can deploy them and unlock SDKs, Dashboards and Analytics", "Release your protocol so other devs can deploy them and unlock SDKs, Dashboards and Analytics",
) )
.option("-p, --path <project-path>", "path to project", ".") .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("--dry-run", "dry run (skip actually publishing)")
.option("-d, --debug", "show debug logs") .option("-d, --debug", "show debug logs")
.option("--ci", "Continuous Integration mode") .option("--ci", "Continuous Integration mode")
.action(async (options) => { .action(async (options) => {
const url = await processProject(options, "release"); const url = await processProject(options, "release");
info(`Open this link to release your contracts:`); info(
logger.info(chalk.blueBright(url.toString())); `Open this link to release your contracts: ${chalk.blueBright(
url.toString(),
)}`,
);
open(url.toString()); open(url.toString());
}); });
@@ -144,13 +155,35 @@ $$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$
.argument("[upload]", "path to file or directory to upload") .argument("[upload]", "path to file or directory to upload")
.action(async (path) => { .action(async (path) => {
const storage = new ThirdwebStorage(); const storage = new ThirdwebStorage();
const uri = await upload(storage, path); try {
info(`Files stored at the following IPFS URI:`); const uri = await upload(storage, path);
logger.info(chalk.blueBright(uri.toString())); info(
`Files stored at the following IPFS URI: ${chalk.blueBright(
uri.toString(),
)}`,
);
const url = storage.resolveScheme(uri); const url = storage.resolveScheme(uri);
info(`Open this link to view your upload:`); info(
logger.info(chalk.blueBright(url.toString())); `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 program
@@ -165,6 +198,134 @@ $$$$$$\\ $$$$$$$\\ $$\\ $$$$$$\\ $$$$$$$ |$$\\ $$\\ $$\\ $$$$$$\\ $$$$
await detectExtensions(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(); await program.parseAsync();
}; };
+2 -2
View File
@@ -72,13 +72,13 @@ export async function detectExtensions(options: any) {
const enabledFeatures: Feature[] = features.enabledFeatures.map( const enabledFeatures: Feature[] = features.enabledFeatures.map(
(feature) => ({ (feature) => ({
name: feature.name, 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( const suggestedFeatures: Feature[] = features.suggestedFeatures.map(
(feature) => ({ (feature) => ({
name: feature.name, name: feature.name,
reference: `https://portal.thirdweb.com/extensions/${feature.name.toLowerCase()}`, reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
}), }),
); );
+43 -6
View File
@@ -76,7 +76,7 @@ export async function processProject(
} }
} }
let compiledResult; let compiledResult: { contracts: ContractPayload[] };
const compileLoader = spinner("Compiling project..."); const compileLoader = spinner("Compiling project...");
try { try {
compiledResult = await build(projectPath, projectType); compiledResult = await build(projectPath, projectType);
@@ -106,10 +106,47 @@ export async function processProject(
if (options.ci) { if (options.ci) {
selectedContracts = compiledResult.contracts; selectedContracts = compiledResult.contracts;
} else { } else {
const choices = compiledResult.contracts.map((c) => ({ const filtered = compiledResult.contracts
name: c.name, .filter((c) => {
value: 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( const prompt = createContractsPrompt(
choices, choices,
`Choose which contract(s) to ${command}`, `Choose which contract(s) to ${command}`,
@@ -164,7 +201,7 @@ export async function processProject(
const metadataURIs = await Promise.all( const metadataURIs = await Promise.all(
selectedContracts.map(async (c) => { selectedContracts.map(async (c) => {
logger.debug(`Uploading ${c.name}...`); 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, uploadWithoutDirectory: true,
}); });
}), }),
+1
View File
@@ -55,6 +55,7 @@ export class BrownieBuilder extends BaseBuilder {
metadata: {}, metadata: {},
bytecode, bytecode,
sources: [], // TODO sources: [], // TODO
fileName: "", // TODO
name: contractName, name: contractName,
}); });
break; break;
+20
View File
@@ -1,9 +1,11 @@
import { findFiles } from "../../common/file-helper"; import { findFiles } from "../../common/file-helper";
import { hasForge } from "../../create/helpers/has-forge";
import { execute } from "../helpers/exec"; import { execute } from "../helpers/exec";
import { logger } from "../helpers/logger"; import { logger } from "../helpers/logger";
import { CompileOptions } from "../interfaces/Builder"; import { CompileOptions } from "../interfaces/Builder";
import { ContractPayload } from "../interfaces/ContractPayload"; import { ContractPayload } from "../interfaces/ContractPayload";
import { BaseBuilder } from "./builder-base"; import { BaseBuilder } from "./builder-base";
import chalk from "chalk";
import { existsSync, readFileSync } from "fs"; import { existsSync, readFileSync } from "fs";
import { basename, join } from "path"; import { basename, join } from "path";
@@ -11,6 +13,18 @@ export class FoundryBuilder extends BaseBuilder {
public async compile(options: CompileOptions): Promise<{ public async compile(options: CompileOptions): Promise<{
contracts: ContractPayload[]; 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 clean", options.projectPath);
await execute("forge build --extra-output metadata", 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[]; .filter((path) => path !== undefined) as string[];
const fileNames = Object.keys(
parsedMetadata?.settings?.compilationTarget || {},
);
const fileName = fileNames.length > 0 ? fileNames[0] : "";
if ( if (
this.shouldProcessContract( this.shouldProcessContract(
contractInfo.abi, contractInfo.abi,
@@ -99,6 +118,7 @@ export class FoundryBuilder extends BaseBuilder {
name: contractName, name: contractName,
metadata, metadata,
bytecode, bytecode,
fileName,
sources, sources,
}); });
} }
+7 -1
View File
@@ -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 //the hardhat extractor **logs out** the runtime config of hardhat, we take that stdout and parse it
const stringifiedConfig = ( const stringifiedConfig = (
await execute( await execute(
`npx hardhat run ${configExtractorScriptPath} --no-compile`, `npx hardhat run "${configExtractorScriptPath}" --no-compile`,
options.projectPath, options.projectPath,
) )
).stdout; ).stdout;
@@ -123,11 +123,17 @@ export class HardhatBuilder extends BaseBuilder {
}) })
.filter((path) => path !== undefined) as string[]; .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)) { if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
contracts.push({ contracts.push({
metadata, metadata,
bytecode, bytecode,
name: contractName, name: contractName,
fileName,
sources, sources,
}); });
} }
+6
View File
@@ -140,11 +140,17 @@ export class SolcBuilder extends BaseBuilder {
}) })
.filter((path) => path !== undefined) as string[]; .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)) { if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
contracts.push({ contracts.push({
metadata, metadata,
bytecode, bytecode,
name: contractName, name: contractName,
fileName,
sources: _sources, sources: _sources,
}); });
} }
+7
View File
@@ -72,11 +72,18 @@ export class TruffleBuilder extends BaseBuilder {
return undefined; return undefined;
}) })
.filter((path) => path !== undefined) as string[]; .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)) { if (this.shouldProcessContract(abi, deployedBytecode, contractName)) {
contracts.push({ contracts.push({
metadata, metadata,
bytecode, bytecode,
name: contractName, name: contractName,
fileName,
sources, sources,
}); });
} }
@@ -36,6 +36,7 @@ export default async function detect(
name: "continue", name: "continue",
message: message:
"Do you want to continue and compile this project with solc instead?", "Do you want to continue and compile this project with solc instead?",
initial: true,
}); });
const shouldCompile = await prompt.run(); const shouldCompile = await prompt.run();
if (!shouldCompile) { if (!shouldCompile) {
+11
View File
@@ -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");
}
}
+14
View File
@@ -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")
);
}
}
+11
View File
@@ -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");
}
}
@@ -17,6 +17,11 @@ export interface ContractPayload {
*/ */
metadata: any; metadata: any;
/**
* The file name of the original compiled file
*/
fileName: string;
/** /**
* The source file paths * The source file paths
*/ */
@@ -4,4 +4,10 @@ export type ProjectType =
| "hardhat" | "hardhat"
| "truffle" | "truffle"
| "solc" | "solc"
| "vite"
| "next"
| "cra"
| "spa-webapp"
| "yarn"
| "npm"
| "none"; | "none";
+262 -131
View File
@@ -2,60 +2,82 @@
/* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable import/no-extraneous-dependencies */
import { CREATE_MESSAGES } from "../../constants/constants"; import { CREATE_MESSAGES } from "../../constants/constants";
import detect from "../core/detection/detect";
import { DownloadError, createApp } from "./helpers/create-app"; 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 { getPkgManager } from "./helpers/get-pkg-manager";
import { validateNpmName } from "./helpers/validate-pkg"; import { validateNpmName } from "./helpers/validate-pkg";
import chalk from "chalk"; import chalk from "chalk";
import fs from "fs";
import path from "path"; import path from "path";
import prompts from "prompts"; import prompts from "prompts";
let projectType: string = ""; let contractName: string = "";
let projectPath: string = ""; let projectPath: string = "";
let projectType: string = "";
let framework: string = ""; let framework: string = "";
let language: string = ""; let language: string = "";
let baseContract: string = ""; let baseContract: string = "";
let chain: string = "";
/* let createType: string = "app"; */ /* let createType: string = "app"; */
export async function twCreate(pPath: string = "", options: any) { export async function twCreate(
pType: string,
pPath: string = "",
options: any,
) {
if (typeof pPath === "string") { if (typeof pPath === "string") {
projectPath = pPath; projectPath = pPath;
} }
if (options.app) { if (typeof options.contractName === "string") {
projectType = "app"; contractName = options.contractName;
} }
if (options.contract) { if (pType === "app" || options.app) {
projectType = "app";
} else if (pType === "contract" || options.contract) {
projectType = "contract"; projectType = "contract";
} }
if (options.typescript) { if (projectType === "app") {
language = "typescript"; 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) { if (projectType === "contract") {
language = "javascript"; if (options.forge) {
} framework = "forge";
}
if (options.next) { if (options.hardhat) {
framework = "next"; framework = "hardhat";
} }
if (options.cra) {
framework = "cra";
}
if (options.vite) {
framework = "vite";
}
if (options.forge) {
framework = "forge";
}
if (options.hardhat) {
framework = "hardhat";
} }
if (options.framework) { if (options.framework) {
@@ -76,103 +98,216 @@ export async function twCreate(pPath: string = "", options: any) {
if (typeof res.projectType === "string") { if (typeof res.projectType === "string") {
projectType = res.projectType.trim(); 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. // 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. // We do this so old users can still use the --template flag to create an app.
projectType = "app"; projectType = "app";
} }
if (!projectPath) { // Whether to only create a new contract without the project
const defaultName = let onlyContract = false;
projectType === "contract" ? "thirdweb-contracts" : "thirdweb-app"; if (projectType === "contract") {
const res = await prompts({ const resolvedProjectPath = path.resolve(projectPath);
type: "text", const contractProjectType = await detect(resolvedProjectPath, {});
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();
}
}
if ( if (
projectType === "contract" && contractProjectType === "foundry" &&
framework !== "forge" && fs.existsSync(path.join(resolvedProjectPath, "src"))
framework !== "hardhat"
) { ) {
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({ const res = await prompts({
type: "select", type: "text",
name: "framework", name: "path",
message: CREATE_MESSAGES.framework, message: CREATE_MESSAGES.projectName,
choices: [ initial: options.template || defaultName,
{ title: "Hardhat", value: "hardhat" }, format: (name: string) => name.toLowerCase(),
{ title: "Forge", value: "forge" }, 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") { if (typeof res.path === "string") {
framework = res.framework.trim(); 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(pPath: string = "", options: any) {
name: "standard", name: "standard",
message: CREATE_MESSAGES.contract, message: CREATE_MESSAGES.contract,
choices: [ choices: [
{ title: "Empty Contract", value: "none" }, ...(!onlyContract
? [{ title: "Empty Contract", value: "none" }]
: []),
{ title: "ERC721", value: "erc721" }, { title: "ERC721", value: "erc721" },
{ title: "ERC20", value: "erc20" }, { title: "ERC20", value: "erc20" },
{ title: "ERC1155", value: "erc1155" }, { title: "ERC1155", value: "erc1155" },
@@ -238,20 +375,11 @@ export async function twCreate(pPath: string = "", options: any) {
} }
} }
} }
if (!framework) {
console.log("Please specify a framework");
process.exit(1);
}
if (!language) {
// Default = JavaScript
language = "javascript";
}
} }
const resolvedProjectPath = path.resolve(projectPath); // Resolve project path
const projectName = path.basename(resolvedProjectPath); projectPath = path.resolve(projectPath);
const projectName = path.basename(projectPath);
const { valid, problems } = validateNpmName(projectName); const { valid, problems } = validateNpmName(projectName);
if (!valid) { if (!valid) {
@@ -283,18 +411,21 @@ export async function twCreate(pPath: string = "", options: any) {
try { try {
if (projectType === "app") { if (projectType === "app") {
await createApp({ await createApp({
appPath: resolvedProjectPath, appPath: projectPath,
packageManager, packageManager,
framework, framework,
language, language,
template, template,
chain,
}); });
} else { } else {
await createContract({ await createContractProject({
contractPath: resolvedProjectPath, contractPath: projectPath,
packageManager, packageManager,
framework, framework,
contractName,
baseContract, baseContract,
onlyContract,
}); });
} }
} catch (reason) { } catch (reason) {
@@ -22,12 +22,14 @@ export async function createApp({
framework, framework,
language, language,
template, template,
chain,
}: { }: {
appPath: string; appPath: string;
packageManager: PackageManager; packageManager: PackageManager;
framework?: string; framework?: string;
language?: string; language?: string;
template?: string; template?: string;
chain?: string;
}): Promise<void> { }): Promise<void> {
let frameworkPath = ""; let frameworkPath = "";
@@ -43,7 +45,9 @@ export async function createApp({
process.exit(1); process.exit(1);
} }
} else if (framework) { } else if (framework) {
frameworkPath = `${framework}-${language || "javascript"}-starter`; frameworkPath = `${framework}-${language || "javascript"}-${
chain === "solana" ? "solana-" : ""
}starter`;
const found = await hasTemplate(frameworkPath); const found = await hasTemplate(frameworkPath);
if (!found) { if (!found) {
@@ -2,6 +2,7 @@ import { hasBaseContract, readBaseContract } from "./base-contracts";
import { DownloadError } from "./create-app"; import { DownloadError } from "./create-app";
import { PackageManager } from "./get-pkg-manager"; import { PackageManager } from "./get-pkg-manager";
import { tryGitInit } from "./git"; import { tryGitInit } from "./git";
import { hasForge } from "./has-forge";
import { install } from "./install"; import { install } from "./install";
import { isFolderEmpty } from "./is-folder-empty"; import { isFolderEmpty } from "./is-folder-empty";
import { getOnline } from "./is-online"; import { getOnline } from "./is-online";
@@ -11,22 +12,28 @@ import { submodules } from "./submodules";
import { downloadAndExtractRepo } from "./templates"; import { downloadAndExtractRepo } from "./templates";
import retry from "async-retry"; import retry from "async-retry";
import chalk from "chalk"; import chalk from "chalk";
import fs from "fs";
import { writeFile } from "fs/promises"; import { writeFile } from "fs/promises";
import path from "path"; import path from "path";
interface ICreateContract { interface ICreateContractProject {
contractPath: string; contractPath: string;
packageManager: PackageManager; packageManager: PackageManager;
contractName: string;
framework?: string; framework?: string;
baseContract?: string; baseContract?: string;
onlyContract: boolean;
} }
export async function createContract({ export async function createContractProject({
contractPath, contractPath,
packageManager, packageManager,
framework, framework,
contractName,
baseContract, baseContract,
}: ICreateContract) { onlyContract,
}: ICreateContractProject) {
// Check that the selected base contract is valid
if (baseContract) { if (baseContract) {
const found = hasBaseContract(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); const root = path.resolve(contractPath);
if (!(await isWriteable(path.dirname(root)))) { if (!(await isWriteable(path.dirname(root)))) {
console.error( console.error(
"The application path is not writable, please check folder permissions and try again.", "The application path is not writable, please check folder permissions and try again.",
@@ -52,117 +59,179 @@ export async function createContract({
process.exit(1); process.exit(1);
} }
const projectName = path.basename(root); // Check that the contract name is valid
if (!/(^[a-z0-9A-Z]+$)|(^[a-z0-9A-Z]+\.sol$)/.test(contractName)) {
await makeDir(root); console.error(
if (!isFolderEmpty(root, projectName)) { `Contract name ${chalk.red(
`"${contractName}"`,
)} is not valid (only alphanumeric characters are allowed).`,
);
process.exit(1); process.exit(1);
} }
// Clean the contract name
contractName = contractName.replace(/\.sol$/, "") + ".sol";
const useYarn = packageManager === "yarn"; const useYarn = packageManager === "yarn";
const isOnline = !useYarn || (await getOnline());
const originalDirectory = process.cwd();
console.log( if (onlyContract) {
`Creating a new thirdweb contracts project in ${chalk.green(root)}.`, // If we are already in a contracts project, just create a new contract
); if (fs.existsSync(path.join(root, contractName))) {
console.log(); console.error(
`A contract with the name ${chalk.red(
process.chdir(root); `"${contractName}"`,
)} already exists in specified directory.`,
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); 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) { if (baseContract && baseContract.length > 0) {
const baseContractText = readBaseContract(baseContract); const baseContractText = readBaseContract(baseContract);
// Set the contents of the Contract.sol file to the base contract // Set the contents of the Contract.sol file to the base contract
let contractFile = ""; let contractFile = "";
if (framework === "hardhat") { contractFile = path.join(root, contractName);
contractFile = path.join(root, "contracts", "Contract.sol");
}
if (framework === "forge") {
contractFile = path.join(root, "src", "Contract.sol");
}
// Write the base contract to the MyContract.sol file // Write the base contract to the MyContract.sol file
await writeFile(contractFile, baseContractText); 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 { } else {
cdpath = contractPath; // Otherwise, create a new contracts project
} const projectName = path.basename(root);
console.log( await makeDir(root);
`${chalk.green("Success!")} Created ${projectName} at ${contractPath}`, if (!isFolderEmpty(root, projectName)) {
); process.exit(1);
console.log(); }
console.log("Inside that directory, you can run several commands:");
console.log(); const isOnline = !useYarn || (await getOnline());
console.log(chalk.cyan(` ${packageManager}${useYarn ? "" : " run"} build`)); const originalDirectory = process.cwd();
console.log(
" Compiles your contracts and detects thirdweb extensions implemented on them.", console.log(
); `Creating a new thirdweb contracts project in ${chalk.green(root)}.`,
console.log(); );
console.log(chalk.cyan(` ${packageManager}${useYarn ? "" : " run"} deploy`)); console.log();
console.log(" Deploys your contracts with the thirdweb deploy flow.");
console.log(); process.chdir(root);
console.log(
chalk.cyan(` ${packageManager}${useYarn ? "" : " run"} release`), function isErrorLike(err: unknown): err is { message: string } {
); return (
console.log(" Releases your contracts with the thirdweb release flow."); typeof err === "object" &&
console.log(); err !== null &&
console.log("We suggest that you begin by typing:"); typeof (err as { message?: unknown }).message === "string"
console.log(); );
console.log(chalk.cyan(" cd"), cdpath); }
console.log();
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`,
);
}
}
}
} }
@@ -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);
});
});
}
+16 -1
View File
@@ -1,11 +1,26 @@
import spawn from "cross-spawn"; 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) => { return new Promise<void>((resolve, reject) => {
/** /**
* Spawn the installation process. * Spawn the installation process.
*/ */
const child = spawn(command, args); 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) => { child.on("close", (code) => {
if (code !== 0) { if (code !== 0) {
reject({ command: `${command}` }); reject({ command: `${command}` });
+43
View File
@@ -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");
}
}
+54
View File
@@ -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 // Pre-built contract
else { else {
const mapping = { const mapping = {
"signature-drop": "drop/signature-drop", "signature-drop": "SignatureDrop",
"nft-drop": "drop/nft-drop", "nft-drop": "DropERC721",
"edition-drop": "drop/edition-drop", "edition-drop": "DropERC1155",
"nft-collection": "token/nft-collection", "nft-collection": "TokenERC721",
edition: "token/edition", edition: "TokenERC1155",
"token-drop": "drop/token-drop", "token-drop": "DropERC20",
token: "token/token", token: "TokenERC20",
marketplace: "marketplace/marketplace", marketplace: "Marketplace",
split: "governance/split", split: "Split",
vote: "governance/vote", vote: "VoteERC20",
pack: "token/pack", pack: "Pack",
multiwrap: "token/multiwrap", multiwrap: "Multiwrap",
}; };
const foundMapping = mapping[name as keyof typeof mapping]; const foundMapping = mapping[name as keyof typeof mapping];
@@ -33,6 +33,6 @@ export default function generateDashboardUrl(
return undefined; return undefined;
} }
return `https://thirdweb.com/contracts/new/pre-built/${foundMapping}`; return `https://thirdweb.com/thirdweb.eth/${foundMapping}`;
} }
} }
+4 -26
View File
@@ -1,7 +1,5 @@
import { logger } from "../core/helpers/logger";
import { spinner } from "../core/helpers/logger"; import { spinner } from "../core/helpers/logger";
import { BufferOrStringWithName, ThirdwebStorage } from "@thirdweb-dev/storage"; import { BufferOrStringWithName, ThirdwebStorage } from "@thirdweb-dev/storage";
import chalk from "chalk";
import fs from "fs"; import fs from "fs";
import path from "path"; import path from "path";
@@ -33,22 +31,12 @@ export async function upload(
uploadPath: string, uploadPath: string,
): Promise<string> { ): Promise<string> {
if (!uploadPath) { if (!uploadPath) {
logger.error( return Promise.reject("No path provided");
`Please pass a path to a file or directory to upload with the following format:\n ${chalk.blueBright(
`npx thirdweb@latest upload path/to/file.jpg`,
)}\n`,
);
process.exit(1);
} }
const pathExists = fs.existsSync(uploadPath); const pathExists = fs.existsSync(uploadPath);
if (!pathExists) { if (!pathExists) {
logger.error( return Promise.reject("Invalid path provided");
`Invalid path ${chalk.blueBright(
uploadPath,
)} provided. Please provide a valid path to a file or directory to upload."`,
);
process.exit(1);
} }
let uri = ""; let uri = "";
@@ -57,12 +45,7 @@ export async function upload(
const files = recurseFiles(uploadPath, uploadPath); const files = recurseFiles(uploadPath, uploadPath);
if (files.length === 0) { if (files.length === 0) {
logger.error( return Promise.reject("No files detected in specified directory");
`No files detected in specified directory ${chalk.blueBright(
uploadPath,
)} to upload.`,
);
process.exit(1);
} }
const spin = spinner( const spin = spinner(
@@ -82,12 +65,7 @@ export async function upload(
uri = await storage.upload(file, { uploadWithoutDirectory: true }); uri = await storage.upload(file, { uploadWithoutDirectory: true });
spin.succeed("Succesfully uploaded file to IPFS."); spin.succeed("Succesfully uploaded file to IPFS.");
} else { } else {
logger.error( return Promise.reject("Invalid path provided");
`Path ${chalk.blueBright(
uploadPath,
)} does not point to a valid file or directory. Please provide a valid path to a file or directory to upload`,
);
process.exit(1);
} }
return uri; return uri;
+6
View File
@@ -1,5 +1,11 @@
# @thirdweb-dev/contracts-js # @thirdweb-dev/contracts-js
## 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 ## 1.2.1
### Patch Changes ### Patch Changes
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "@thirdweb-dev/contracts-js", "name": "@thirdweb-dev/contracts-js",
"version": "1.2.1", "version": "1.2.2",
"main": "dist/thirdweb-dev-contracts-js.cjs.js", "main": "dist/thirdweb-dev-contracts-js.cjs.js",
"module": "dist/thirdweb-dev-contracts-js.esm.js", "module": "dist/thirdweb-dev-contracts-js.esm.js",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js", "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js",
"dependencies": { "dependencies": {
"@thirdweb-dev/contracts": "^3.2.2" "@thirdweb-dev/contracts": "3.2.8-0"
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-env": "^7.18.10", "@babel/preset-env": "^7.18.10",
+6
View File
@@ -0,0 +1,6 @@
{
"presets": [
"@babel/preset-typescript",
["@babel/preset-env", { "targets": "defaults, not ie 11" }]
]
}
+4
View File
@@ -0,0 +1,4 @@
# folders
dist/
# files
+4
View File
@@ -0,0 +1,4 @@
module.exports = {
root: true,
extends: ["thirdweb"],
};
+7
View File
@@ -0,0 +1,7 @@
# @thirdweb-dev/pay
## 0.1.0
### Minor Changes
- [#433](https://github.com/thirdweb-dev/js/pull/433) [`7269268`](https://github.com/thirdweb-dev/js/commit/72692689e9adb41e92038765fd01a36c2b7457e1) Thanks [@jnsdls](https://github.com/jnsdls)! - Initialize Pay Package
+16
View File
@@ -0,0 +1,16 @@
<p align="center">
<br />
<a href="https://thirdweb.com"><img src="https://github.com/thirdweb-dev/js/blob/main/packages/sdk/logo.svg?raw=true" width="200" alt=""/></a>
<br />
</p>
<h1 align="center">thirdweb wallets</h1>
<p align="center">
<!-- <a href="https://www.npmjs.com/package/@thirdweb-dev/sdk"><img src="https://img.shields.io/npm/v/@thirdweb-dev/sdk?color=red&label=npm&logo=npm" alt="npm version"/></a> -->
<!-- <a href="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml"><img alt="Build Status" src="https://github.com/thirdweb-dev/js/actions/workflows/CI.yml/badge.svg"/></a> -->
<!-- <a href="https://discord.gg/thirdweb"><img alt="Join our Discord!" src="https://img.shields.io/discord/834227967404146718.svg?color=7289da&label=discord&logo=discord&style=flat"/></a> -->
</p>
<!-- <p align="center"><strong>Best in class Web3 SDK for Browser, Node and Mobile apps</strong></p> -->
<br />
### todo
@@ -0,0 +1,4 @@
{
"main": "dist/thirdweb-dev-pay-integrations-coinbase.cjs.js",
"module": "dist/thirdweb-dev-pay-integrations-coinbase.esm.js"
}
+53
View File
@@ -0,0 +1,53 @@
{
"name": "@thirdweb-dev/pay",
"version": "0.1.0",
"main": "dist/thirdweb-dev-pay.cjs.js",
"module": "dist/thirdweb-dev-pay.esm.js",
"exports": {
".": {
"module": "./dist/thirdweb-dev-pay.esm.js",
"default": "./dist/thirdweb-dev-pay.cjs.js"
},
"./integrations/coinbase": {
"module": "./integrations/coinbase/dist/thirdweb-dev-pay-integrations-coinbase.esm.js",
"default": "./integrations/coinbase/dist/thirdweb-dev-pay-integrations-coinbase.cjs.js"
},
"./package.json": "./package.json"
},
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/pay",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/thirdweb-dev/js/issues"
},
"author": "thirdweb eng <[email protected]>",
"files": [
"dist/",
"integrations/"
],
"preconstruct": {
"entrypoints": [
"index.ts",
"integrations/**"
],
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
},
"exports": true
},
"sideEffects": false,
"dependencies": {
"@coinbase/cbpay-js": "^1.6.0"
},
"devDependencies": {
"@preconstruct/cli": "^2.2.1",
"typescript": "^4.7.4"
},
"scripts": {
"format": "prettier --write 'src/**/*'",
"lint": "eslint src/",
"fix": "eslint src/ --fix",
"clean": "rm -rf dist/",
"build": "tsc && preconstruct build",
"push": "yalc push"
}
}
+1
View File
@@ -0,0 +1 @@
export * from "./integrations/coinbase";
@@ -0,0 +1,62 @@
import { initOnRamp, InitOnRampParams } from "@coinbase/cbpay-js";
interface CoinbasePayOptions extends Pick<InitOnRampParams, "appId"> {}
const CHAIN_ID_MAP = {
[-1]: "solana",
1: "ethereum",
69: "optimism",
137: "polygon",
} as const;
export type FundWalletOptions = {
address: string;
chainId: keyof typeof CHAIN_ID_MAP;
assets?: string[];
};
export class CoinbasePayIntegration {
#appId: string;
constructor(options: CoinbasePayOptions) {
this.#appId = options.appId;
}
async fundWallet(opts: FundWalletOptions): Promise<void> {
const { address, chainId, assets } = opts;
return new Promise((res, rej) => {
initOnRamp(
{
appId: this.#appId,
widgetParameters: {
destinationWallets: [
{
address,
assets,
supportedNetworks: [CHAIN_ID_MAP[chainId]],
},
],
},
experienceLoggedIn: "embedded",
experienceLoggedOut: "popup",
closeOnExit: true,
onSuccess: () => {
res();
},
onExit(error) {
if (error) {
return rej(error);
}
return res();
},
},
(err, instance) => {
if (err || !instance) {
return rej(err);
}
instance.open();
},
);
});
}
}
+5
View File
@@ -0,0 +1,5 @@
{
"extends": "@thirdweb-dev/tsconfig/sdk.json",
"include": ["src", "types"],
"exclude": ["dist", "build", "node_modules"]
}
+32
View File
@@ -1,5 +1,37 @@
# @thirdweb-dev/react # @thirdweb-dev/react
## 3.6.8
### Patch Changes
- [#454](https://github.com/thirdweb-dev/js/pull/454) [`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0) Thanks [@jnsdls](https://github.com/jnsdls)! - upgraded dependencies
- [#422](https://github.com/thirdweb-dev/js/pull/422) [`08d04fe`](https://github.com/thirdweb-dev/js/commit/08d04fe4dc74ba0d12625d7d4004c23f7dc330a2) Thanks [@yehia67](https://github.com/yehia67)! - Add `btnTitle` prop to the `ConnectWallet` component. Now you can set customized string or child component to the connect button.
## 3.6.7
### Patch Changes
- [#448](https://github.com/thirdweb-dev/js/pull/448) [`7a37e56`](https://github.com/thirdweb-dev/js/commit/7a37e564fd5d5a9df84c8da44ecaf6c42f67a0e2) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - allow `useContract` to fail faster to enable the import case
## 3.6.6
### Patch Changes
- [#443](https://github.com/thirdweb-dev/js/pull/443) [`8c6cdaa`](https://github.com/thirdweb-dev/js/commit/8c6cdaa2887fb2cc40d3ee6991233d195d103805) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix magic link connector not connecting to the right chain
## 3.6.5
## 3.6.4
### Patch Changes
- [#425](https://github.com/thirdweb-dev/js/pull/425) [`f545a67`](https://github.com/thirdweb-dev/js/commit/f545a67e9fb597d27bb39ca515d24d306fbb121a) Thanks [@adam-maj](https://github.com/adam-maj)! - Add sameSite none and include credentials
- [#420](https://github.com/thirdweb-dev/js/pull/420) [`639e535`](https://github.com/thirdweb-dev/js/commit/639e535ed55280ad9d081001aab3f5af72bb3e45) Thanks [@jnsdls](https://github.com/jnsdls)! - update deps
## 3.6.3
## 3.6.2 ## 3.6.2
### Patch Changes ### Patch Changes
+7 -7
View File
@@ -1,6 +1,6 @@
{ {
"name": "@thirdweb-dev/react", "name": "@thirdweb-dev/react",
"version": "3.6.2", "version": "3.6.8",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react", "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
"author": "thirdweb eng <[email protected]>", "author": "thirdweb eng <[email protected]>",
"license": "Apache-2.0", "license": "Apache-2.0",
@@ -97,19 +97,19 @@
"dependencies": { "dependencies": {
"@emotion/react": "^11.10.0", "@emotion/react": "^11.10.0",
"@emotion/styled": "^11.10.0", "@emotion/styled": "^11.10.0",
"@gnosis.pm/safe-core-sdk": "^3.1.1",
"@gnosis.pm/safe-ethers-adapters": "0.1.0-alpha.11",
"@gnosis.pm/safe-ethers-lib": "^1.6.1",
"@react-icons/all-files": "^4.1.0", "@react-icons/all-files": "^4.1.0",
"@safe-global/safe-core-sdk": "^3.2.0",
"@safe-global/safe-ethers-adapters": "0.1.0-alpha.13",
"@safe-global/safe-ethers-lib": "^1.7.0",
"@solana/wallet-adapter-phantom": "^0.9.17", "@solana/wallet-adapter-phantom": "^0.9.17",
"@tanstack/react-query": "^4.0.10", "@tanstack/react-query": "^4.0.10",
"@zag-js/menu": "^0.1.16", "@zag-js/menu": "^0.3.0",
"@zag-js/react": "^0.1.18", "@zag-js/react": "^0.3.1",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"color": "^4.2.3", "color": "^4.2.3",
"copy-to-clipboard": "^3.3.2", "copy-to-clipboard": "^3.3.2",
"detect-browser": "^5.3.0", "detect-browser": "^5.3.0",
"magic-sdk": "^8.1.1", "magic-sdk": "^10.1.0",
"mime": "^3.0.0", "mime": "^3.0.0",
"react-cool-dimensions": "^2.0.7", "react-cool-dimensions": "^2.0.7",
"tiny-invariant": "^1.2.0", "tiny-invariant": "^1.2.0",
@@ -14,19 +14,19 @@ export const SupportedNetworkSelect: React.FC<SupportedNetworkSelectProps> = ({
const deprecatedNetworks = useMemo(() => { const deprecatedNetworks = useMemo(() => {
return SUPPORTED_CHAIN_IDS.map((supportedChain) => { return SUPPORTED_CHAIN_IDS.map((supportedChain) => {
return getChainFromChainId(supportedChain); return getChainFromChainId(supportedChain);
}).filter((n) => !!n.deprecated); });
}, []); }, []);
const testnets = useMemo(() => { const testnets = useMemo(() => {
return SUPPORTED_CHAIN_IDS.map((supportedChain) => { return SUPPORTED_CHAIN_IDS.map((supportedChain) => {
return getChainFromChainId(supportedChain); return getChainFromChainId(supportedChain);
}).filter((n) => n.testnet && !n.deprecated); });
}, []); }, []);
const mainnets = useMemo(() => { const mainnets = useMemo(() => {
return SUPPORTED_CHAIN_IDS.map((supportedChain) => { return SUPPORTED_CHAIN_IDS.map((supportedChain) => {
return getChainFromChainId(supportedChain); return getChainFromChainId(supportedChain);
}).filter((n) => !n.testnet && !n.deprecated); });
}, []); }, []);
return ( return (
<Select {...selectProps}> <Select {...selectProps}>
@@ -63,6 +63,7 @@ interface ConnectWalletProps extends ThemeProviderProps {
loginOptional?: boolean; loginOptional?: boolean;
}; };
className?: string; className?: string;
btnTitle?: JSX.Element | string;
} }
let connecting = false; let connecting = false;
@@ -120,6 +121,7 @@ const chainIdToCurrencyMap: Record<
export const ConnectWallet: React.FC<ConnectWalletProps> = ({ export const ConnectWallet: React.FC<ConnectWalletProps> = ({
auth, auth,
className, className,
btnTitle,
...themeProps ...themeProps
}) => { }) => {
const id = useId(); const id = useId();
@@ -248,7 +250,9 @@ export const ConnectWallet: React.FC<ConnectWalletProps> = ({
</span> </span>
) )
) : ( ) : (
<span style={{ whiteSpace: "nowrap" }}>Connect Wallet</span> <span style={{ whiteSpace: "nowrap" }}>
{btnTitle || "Connect Wallet"}
</span>
)} )}
</Button> </Button>
@@ -15,7 +15,7 @@ export interface ThirdwebNftMediaProps extends SharedMediaProps {
/** /**
* This component can be used to render NFTs from the thirdweb SDK. * This component can be used to render NFTs from the thirdweb SDK.
* Props: {@link ThirdwebNftMediaProps} * Props: {@link ThirdwebNftMediaProps}
* *
* @example * @example
* ```jsx * ```jsx
* import { ThirdwebNftMedia, useContract, useNFT } from "@thirdweb-dev/react"; * import { ThirdwebNftMedia, useContract, useNFT } from "@thirdweb-dev/react";
@@ -98,12 +98,15 @@ export class GnosisSafeConnector extends Connector {
invariant(serverUrl, "Chain not supported"); invariant(serverUrl, "Chain not supported");
const [safeEthersAdapters, safeCoreSdk, safeEthersLib] = await Promise.all([ const [safeEthersAdapters, safeCoreSdk, safeEthersLib] = await Promise.all([
import("@gnosis.pm/safe-ethers-adapters"), import("@safe-global/safe-ethers-adapters"),
import("@gnosis.pm/safe-core-sdk"), import("@safe-global/safe-core-sdk"),
import("@gnosis.pm/safe-ethers-lib"), import("@safe-global/safe-ethers-lib"),
]); ]);
const ethAdapter = new safeEthersLib.default({ ethers, signer }); const ethAdapter = new safeEthersLib.default({
ethers,
signerOrProvider: signer,
});
const safe = await safeCoreSdk.default.create({ const safe = await safeCoreSdk.default.create({
ethAdapter: ethAdapter as any, ethAdapter: ethAdapter as any,
@@ -62,6 +62,18 @@ export class MagicConnector extends Connector {
const { apiKey, ...options } = this.options; const { apiKey, ...options } = this.options;
const configuration = this.getConfiguration(); const configuration = this.getConfiguration();
const chains = Object.entries(this.options.rpcUrls);
if (chains.length > 1) {
console.warn(
`Magic only supports connecting to one chain at a time. Using the first chain specified in rpcUrls: ${chains[0]}.`,
);
}
const [chainId, rpcUrl] = chains[0];
this.options.network = {
chainId: parseInt(chainId),
rpcUrl,
};
try { try {
invariant( invariant(
configuration, configuration,
+1 -1
View File
@@ -2,7 +2,7 @@ import { NATIVE_TOKENS, SUPPORTED_CHAIN_ID } from "@thirdweb-dev/sdk";
import { ChainId } from "@thirdweb-dev/sdk"; import { ChainId } from "@thirdweb-dev/sdk";
import type { Chain as WagmiChain } from "wagmi"; import type { Chain as WagmiChain } from "wagmi";
export type Chain = WagmiChain & { deprecated?: boolean }; export type Chain = WagmiChain;
const chain: Record<string, Chain> = { const chain: Record<string, Chain> = {
mainnet: { mainnet: {
id: ChainId.Mainnet, id: ChainId.Mainnet,
@@ -238,7 +238,7 @@ export function useContract(
await queryClient.fetchQuery( await queryClient.fetchQuery(
compilerMetadata.cacheKey(contractAddress, activeChainId), compilerMetadata.cacheKey(contractAddress, activeChainId),
() => compilerMetadata.fetchQuery(contractAddress, sdk), () => compilerMetadata.fetchQuery(contractAddress, sdk),
{ cacheTime: Infinity, staleTime: Infinity }, { cacheTime: Infinity, staleTime: Infinity, retry: 0 },
) )
)?.abi; )?.abi;
} }
@@ -258,6 +258,8 @@ export function useContract(
cacheTime: Infinity, cacheTime: Infinity,
staleTime: Infinity, staleTime: Infinity,
enabled: !!contractAddress && !!sdk && !!activeChainId, enabled: !!contractAddress && !!sdk && !!activeChainId,
// never retry
retry: 0,
}, },
); );
+2 -2
View File
@@ -106,7 +106,7 @@ export function useUnclaimedNFTSupply(contract: RequiredParam<DropContract>) {
invariant(erc721, "No ERC721 Contract instance provided"); invariant(erc721, "No ERC721 Contract instance provided");
return erc721.totalUnclaimedSupply(); return erc721.totalUnclaimedSupply();
} }
invariant(false, "Contract is not an instance of ERC721") invariant(false, "Contract is not an instance of ERC721");
}, },
{ enabled: !!erc721 }, { enabled: !!erc721 },
); );
@@ -129,7 +129,7 @@ export function useClaimedNFTSupply(contract: RequiredParam<DropContract>) {
if (erc721) { if (erc721) {
return erc721.totalClaimedSupply(); return erc721.totalClaimedSupply();
} }
invariant(false, "Contract is not an instance of ERC721") invariant(false, "Contract is not an instance of ERC721");
}, },
{ enabled: !!erc721 }, { enabled: !!erc721 },
); );
+3 -1
View File
@@ -24,7 +24,9 @@ export function useUser() {
authConfig, authConfig,
"Please specify an authConfig in the ThirdwebProvider", "Please specify an authConfig in the ThirdwebProvider",
); );
const res = await fetch(`${authConfig.authUrl}/user`); const res = await fetch(`${authConfig.authUrl}/user`, {
credentials: "include",
});
return (await res.json()) as ThirdwebAuthUser; return (await res.json()) as ThirdwebAuthUser;
}, },
{ {
@@ -24,7 +24,9 @@ export function useUser() {
authConfig, authConfig,
"Please specify an authConfig in the ThirdwebProvider", "Please specify an authConfig in the ThirdwebProvider",
); );
const res = await fetch(`${authConfig.authUrl}/user`); const res = await fetch(`${authConfig.authUrl}/user`, {
credentials: "include",
});
return (await res.json()) as ThirdwebAuthUser; return (await res.json()) as ThirdwebAuthUser;
}, },
{ {
@@ -40,6 +40,8 @@ export function nftRoyaltyQuery(
* *
* @public * @public
*/ */
export function useRoyaltySettings(program: RequiredParam<NFTCollection | NFTDrop>) { export function useRoyaltySettings(
program: RequiredParam<NFTCollection | NFTDrop>,
) {
return useQuery(nftRoyaltyQuery(program)); return useQuery(nftRoyaltyQuery(program));
} }
@@ -4,7 +4,11 @@ import {
RequiredParam, RequiredParam,
} from "../../../core/query-utils/required-param"; } from "../../../core/query-utils/required-param";
import { useMutation, useQueryClient } from "@tanstack/react-query"; import { useMutation, useQueryClient } from "@tanstack/react-query";
import type { NFTCollection, NFTDrop, UpdateCreatorInput } from "@thirdweb-dev/sdk/solana"; import type {
NFTCollection,
NFTDrop,
UpdateCreatorInput,
} from "@thirdweb-dev/sdk/solana";
/** /**
* Update the creators for an NFT program * Update the creators for an NFT program
@@ -4,7 +4,11 @@ import {
RequiredParam, RequiredParam,
} from "../../../core/query-utils/required-param"; } from "../../../core/query-utils/required-param";
import { useMutation, useQueryClient } from "@tanstack/react-query"; import { useMutation, useQueryClient } from "@tanstack/react-query";
import type { NFTCollection, NFTDrop, UpdateRoyaltySettingsInput } from "@thirdweb-dev/sdk/solana"; import type {
NFTCollection,
NFTDrop,
UpdateRoyaltySettingsInput,
} from "@thirdweb-dev/sdk/solana";
/** /**
* Update the royalty for an NFT program * Update the royalty for an NFT program
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+73
View File
@@ -1,5 +1,78 @@
# @thirdweb-dev/sdk # @thirdweb-dev/sdk
## 3.6.8
### Patch Changes
- [#454](https://github.com/thirdweb-dev/js/pull/454) [`c673e39`](https://github.com/thirdweb-dev/js/commit/c673e39f23ef082097d73d62910580e8fad400a0) Thanks [@jnsdls](https://github.com/jnsdls)! - upgraded dependencies
- [#421](https://github.com/thirdweb-dev/js/pull/421) [`ea95c5f`](https://github.com/thirdweb-dev/js/commit/ea95c5f609e306e333ee0f73f7920503358ca848) Thanks [@yehia67](https://github.com/yehia67)! - Add new utilities to parse/format currencies. `toEther` & `toWei` as default 18 decimal and `toUnits` & `toDisplayValue` in case of different numbers of decimals.
- [#456](https://github.com/thirdweb-dev/js/pull/456) [`699a2b1`](https://github.com/thirdweb-dev/js/commit/699a2b16fb991c474ec57db8f178e2601d631f39) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - [SOL] Fix claiming drops with custom currencies
- [#458](https://github.com/thirdweb-dev/js/pull/458) [`4cdd0bd`](https://github.com/thirdweb-dev/js/commit/4cdd0bd6348494a256d7c6a2bdf8f7b5c20f6877) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fixes for latest wallet package integration
- [#453](https://github.com/thirdweb-dev/js/pull/453) [`a8267f9`](https://github.com/thirdweb-dev/js/commit/a8267f912df84c58d3fe3f47b90bd474f73c84ca) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - [SOL] Drop fixes for large batch uploads
## 3.6.7
### Patch Changes
- [#451](https://github.com/thirdweb-dev/js/pull/451) [`3731459`](https://github.com/thirdweb-dev/js/commit/3731459d33f1ded7ebb69124809449b901b3ad3d) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Less strict prebuilt checks to support OSRF variants
- [#450](https://github.com/thirdweb-dev/js/pull/450) [`cac6c30`](https://github.com/thirdweb-dev/js/commit/cac6c30bca5e17df81d746ef81316af47d5e252e) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix setting allowance or approvals gaslessly
- [#448](https://github.com/thirdweb-dev/js/pull/448) [`7a37e56`](https://github.com/thirdweb-dev/js/commit/7a37e564fd5d5a9df84c8da44ecaf6c42f67a0e2) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - allow `useContract` to fail faster to enable the import case
## 3.6.6
### Patch Changes
- [#443](https://github.com/thirdweb-dev/js/pull/443) [`8c6cdaa`](https://github.com/thirdweb-dev/js/commit/8c6cdaa2887fb2cc40d3ee6991233d195d103805) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Fix signature minting from OpenSea Royalty Filter NFT collection contracts
## 3.6.5
### Patch Changes
- [#440](https://github.com/thirdweb-dev/js/pull/440) [`efc56fa`](https://github.com/thirdweb-dev/js/commit/efc56fa5802490ac8ef50037658d046afd89e9a1) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - providers are now re-used if the constructor options are identical leading to better batching, also introduced an additional max batch size param (250 by default)
## 3.6.4
### 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
- [#416](https://github.com/thirdweb-dev/js/pull/416) [`af3acc6`](https://github.com/thirdweb-dev/js/commit/af3acc6b10751b840e56aef6400da5eea6040df2) Thanks [@adam-maj](https://github.com/adam-maj)! - Add support for AWS KMS
- [#424](https://github.com/thirdweb-dev/js/pull/424) [`1bfb91d`](https://github.com/thirdweb-dev/js/commit/1bfb91dbf3a39160c987a425813ac5dbb84703ad) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Improve error parsing for other wallets
- [#436](https://github.com/thirdweb-dev/js/pull/436) [`ee47840`](https://github.com/thirdweb-dev/js/commit/ee478407673b0416e0c1cfe2be11bd6963395348) Thanks [@jnsdls](https://github.com/jnsdls)! - fix #429
- [#434](https://github.com/thirdweb-dev/js/pull/434) [`def4251`](https://github.com/thirdweb-dev/js/commit/def42511ff5a20d83f9094164dafb87e412571b5) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - [SOL] Remove workaround to fetch NFT owners
- [#429](https://github.com/thirdweb-dev/js/pull/429) [`034a257`](https://github.com/thirdweb-dev/js/commit/034a257442314c67729f7bafcbe3740cff33fa32) Thanks [@jakeloo](https://github.com/jakeloo)! - Extract more minimal proxy impl address
- [#418](https://github.com/thirdweb-dev/js/pull/418) [`eca4776`](https://github.com/thirdweb-dev/js/commit/eca47763cd89cc3b7aa57b542971837987540b55) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Increase gas limit for opening packs
- [#420](https://github.com/thirdweb-dev/js/pull/420) [`639e535`](https://github.com/thirdweb-dev/js/commit/639e535ed55280ad9d081001aab3f5af72bb3e45) Thanks [@jnsdls](https://github.com/jnsdls)! - update deps
- Updated dependencies [[`f451da6`](https://github.com/thirdweb-dev/js/commit/f451da6395689a5f89800ee63f34b6175b61f703)]:
- @thirdweb-dev/contracts-js@1.2.2
## 3.6.3
### Patch Changes
- [#408](https://github.com/thirdweb-dev/js/pull/408) [`48797c7`](https://github.com/thirdweb-dev/js/commit/48797c7cf0695965e33eb6bf602be4652f7085a8) Thanks [@jnsdls](https://github.com/jnsdls)! - [EVM] - add `Gasless` as a possible extension to feature-detect
- [#402](https://github.com/thirdweb-dev/js/pull/402) [`83dcaf7`](https://github.com/thirdweb-dev/js/commit/83dcaf70584af8c5cdf0427f9fc1ba82d89f0887) Thanks [@adam-maj](https://github.com/adam-maj)! - Expose sdk.fromWallet and wallet classes
- [#412](https://github.com/thirdweb-dev/js/pull/412) [`f03be39`](https://github.com/thirdweb-dev/js/commit/f03be398e0d7b75c9c5b4fb643f35903e89a17e7) Thanks [@easonchai](https://github.com/easonchai)! - Correctly handle contracts using the SignatureMintERC1155 ContractKit extension
- [#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)! - AppURI detection now enabled
- [#414](https://github.com/thirdweb-dev/js/pull/414) [`47f8945`](https://github.com/thirdweb-dev/js/commit/47f8945325447874b1ace0359919c1d54fd55436) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Improve error parsing
## 3.6.2 ## 3.6.2
### Patch Changes ### Patch Changes
+4
View File
@@ -0,0 +1,4 @@
{
"main": "dist/thirdweb-dev-sdk-evm-wallets.cjs.js",
"module": "dist/thirdweb-dev-sdk-evm-wallets.esm.js"
}
+22 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "@thirdweb-dev/sdk", "name": "@thirdweb-dev/sdk",
"version": "3.6.2", "version": "3.6.8",
"description": "The main thirdweb SDK.", "description": "The main thirdweb SDK.",
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk", "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk",
"license": "Apache-2.0", "license": "Apache-2.0",
@@ -19,6 +19,10 @@
"module": "./solana/dist/thirdweb-dev-sdk-solana.esm.js", "module": "./solana/dist/thirdweb-dev-sdk-solana.esm.js",
"default": "./solana/dist/thirdweb-dev-sdk-solana.cjs.js" "default": "./solana/dist/thirdweb-dev-sdk-solana.cjs.js"
}, },
"./evm/wallets": {
"module": "./evm/wallets/dist/thirdweb-dev-sdk-evm-wallets.esm.js",
"default": "./evm/wallets/dist/thirdweb-dev-sdk-evm-wallets.cjs.js"
},
"./solana/server": { "./solana/server": {
"module": "./solana/server/dist/thirdweb-dev-sdk-solana-server.esm.js", "module": "./solana/server/dist/thirdweb-dev-sdk-solana-server.esm.js",
"default": "./solana/server/dist/thirdweb-dev-sdk-solana-server.cjs.js" "default": "./solana/server/dist/thirdweb-dev-sdk-solana-server.cjs.js"
@@ -28,6 +32,7 @@
"files": [ "files": [
"dist/", "dist/",
"evm/", "evm/",
"wallets/",
"solana/", "solana/",
"server/" "server/"
], ],
@@ -35,6 +40,7 @@
"entrypoints": [ "entrypoints": [
"index.ts", "index.ts",
"evm/index.ts", "evm/index.ts",
"evm/wallets/index.ts",
"solana/index.ts", "solana/index.ts",
"solana/server/index.ts" "solana/server/index.ts"
], ],
@@ -65,6 +71,7 @@
"push": "yalc push" "push": "yalc push"
}, },
"devDependencies": { "devDependencies": {
"@aws-sdk/client-secrets-manager": "^3.216.0",
"@metaplex-foundation/amman": "^0.12.0", "@metaplex-foundation/amman": "^0.12.0",
"@metaplex-foundation/amman-client": "^0.2.1", "@metaplex-foundation/amman-client": "^0.2.1",
"@microsoft/api-documenter": "^7.19.4", "@microsoft/api-documenter": "^7.19.4",
@@ -78,7 +85,7 @@
"@types/deep-equal-in-any-order": "^1.0.1", "@types/deep-equal-in-any-order": "^1.0.1",
"@types/mocha": "^10.0.0", "@types/mocha": "^10.0.0",
"@types/node": "^18.0.0", "@types/node": "^18.0.0",
"@types/uuid": "^8.3.3", "@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^5.33.0", "@typescript-eslint/eslint-plugin": "^5.33.0",
"@typescript-eslint/parser": "^5.33.0", "@typescript-eslint/parser": "^5.33.0",
"chai": "^4.3.6", "chai": "^4.3.6",
@@ -90,13 +97,24 @@
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-tsdoc": "^0.2.16", "eslint-plugin-tsdoc": "^0.2.16",
"ethers": "^5.7.2", "ethers": "^5.7.2",
"ethers-aws-kms-signer": "^1.3.2",
"hardhat": "^2.9.3", "hardhat": "^2.9.3",
"mocha": "^10.0.0", "mocha": "^10.0.0",
"prettier": "^2.7.1", "prettier": "^2.7.1",
"typescript": "^4.7.4" "typescript": "^4.7.4"
}, },
"peerDependencies": { "peerDependencies": {
"ethers": "^5" "@aws-sdk/client-secrets-manager": "^3.215.0",
"ethers": "^5",
"ethers-aws-kms-signer": "^1.3.2"
},
"peerDependenciesMeta": {
"@aws-sdk/client-secrets-manager": {
"optional": true
},
"ethers-aws-kms-signer": {
"optional": true
}
}, },
"dependencies": { "dependencies": {
"@metaplex-foundation/js": "^0.17.6", "@metaplex-foundation/js": "^0.17.6",
@@ -109,7 +127,7 @@
"bn.js": "^5.2.1", "bn.js": "^5.2.1",
"bs58": "^5.0.0", "bs58": "^5.0.0",
"cross-fetch": "^3.1.5", "cross-fetch": "^3.1.5",
"eventemitter3": "^4.0.7", "eventemitter3": "^5.0.0",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"merkletreejs": "^0.2.24", "merkletreejs": "^0.2.24",
"tiny-invariant": "^1.2.0", "tiny-invariant": "^1.2.0",
+2 -2
View File
@@ -1,6 +1,6 @@
export const DEFAULT_API_KEY = export const DEFAULT_API_KEY =
"c6634ad2d97b74baf15ff556016830c251050e6c36b9da508ce3ec80095d3dc1"; "c6634ad2d97b74baf15ff556016830c251050e6c36b9da508ce3ec80095d3dc1";
export function getRpcUrl(network: string) { export function getRpcUrl(network: string, apikey = DEFAULT_API_KEY) {
return `https://${network}.rpc.thirdweb.com/${DEFAULT_API_KEY}`; return `https://${network}.rpc.thirdweb.com/${apikey}`;
} }
+18 -2
View File
@@ -124,7 +124,7 @@ export async function setErc20Allowance(
signer || provider, signer || provider,
currencyAddress, currencyAddress,
ERC20Abi, ERC20Abi,
{}, contractToApprove.options,
); );
const owner = await contractToApprove.getSignerAddress(); const owner = await contractToApprove.getSignerAddress();
@@ -151,7 +151,7 @@ export async function approveErc20Allowance(
signer || provider, signer || provider,
currencyAddress, currencyAddress,
ERC20Abi, ERC20Abi,
{}, contractToApprove.options,
); );
const owner = await contractToApprove.getSignerAddress(); const owner = await contractToApprove.getSignerAddress();
const spender = contractToApprove.readContract.address; const spender = contractToApprove.readContract.address;
@@ -192,3 +192,19 @@ export async function normalizeAmount(
const decimals = await contractWrapper.readContract.decimals(); const decimals = await contractWrapper.readContract.decimals();
return utils.parseUnits(AmountSchema.parse(amount), decimals); return utils.parseUnits(AmountSchema.parse(amount), decimals);
} }
export function toEther(amount: BigNumberish): string {
return utils.formatEther(amount);
}
export function toWei(amount: Amount): BigNumber {
return utils.parseEther(AmountSchema.parse(amount));
}
export function toUnits(amount: Amount, decimals: BigNumberish): BigNumber {
return utils.parseUnits(AmountSchema.parse(amount), decimals);
}
export function toDisplayValue(amount: BigNumberish, decimals: BigNumberish): string {
return utils.formatUnits(amount, decimals);
}
+4 -8
View File
@@ -394,20 +394,16 @@ export async function convertToTWError(
contractInterface: ethers.utils.Interface, contractInterface: ethers.utils.Interface,
): Promise<TransactionError> { ): Promise<TransactionError> {
let raw: string; let raw: string;
if (error.data) { if (typeof error === "object") {
// metamask errors comes as objects, apply parsing on data object // metamask errors comes as objects, apply parsing on data object
// TODO test errors from other wallets raw = JSON.stringify(error);
raw = JSON.stringify(error.data);
} else if (error instanceof Error) {
// regular ethers.js error
raw = error.message;
} else { } else {
// not sure what this is, just throw it back // not sure what this is, just throw it back
raw = error.toString(); raw = error.toString();
} }
const reason = const reason =
error.reason || parseMessageParts(/.*?"message[^a-zA-Z0-9]*([^"\\]*).*?/, raw) ||
parseMessageParts(/.*?"message[^a-zA-Z0-9]*([^"\\]*).*?/, raw); parseMessageParts(/.*?"reason[^a-zA-Z0-9]*([^"\\]*).*?/, raw);
const data = parseMessageParts(/.*?"data[^a-zA-Z0-9]*([^"\\]*).*?/, raw); const data = parseMessageParts(/.*?"data[^a-zA-Z0-9]*([^"\\]*).*?/, raw);
const rpcUrl = parseMessageParts(/.*?"url[^a-zA-Z0-9]*([^"\\]*).*?/, raw); const rpcUrl = parseMessageParts(/.*?"url[^a-zA-Z0-9]*([^"\\]*).*?/, raw);
let from = parseMessageParts(/.*?"from[^a-zA-Z0-9]*([^"\\]*).*?/, raw); let from = parseMessageParts(/.*?"from[^a-zA-Z0-9]*([^"\\]*).*?/, raw);
@@ -266,6 +266,42 @@ function toJSType(
return jsType; return jsType;
} }
/**
* @internal
* @param bytecode
*/
export function extractMinimalProxyImplementationAddress(
bytecode: string,
): string | undefined {
// EIP-1167 clone minimal proxy - https://eips.ethereum.org/EIPS/eip-1167
if (bytecode.startsWith("0x363d3d373d3d3d363d73")) {
const implementationAddress = bytecode.slice(22, 62);
return `0x${implementationAddress}`;
}
// Minimal Proxy with receive() from 0xSplits - https://github.com/0xSplits/splits-contracts/blob/c7b741926ec9746182d0d1e2c4c2046102e5d337/contracts/libraries/Clones.sol
if (bytecode.startsWith("0x36603057343d5230")) {
// +40 = size of addr
const implementationAddress = bytecode.slice(122, 122 + 40);
return `0x${implementationAddress}`;
}
// 0age's minimal proxy - https://medium.com/coinmonks/the-more-minimal-proxy-5756ae08ee48
if (bytecode.startsWith("0x3d3d3d3d363d3d37363d73")) {
// +40 = size of addr
const implementationAddress = bytecode.slice(24, 24 + 40);
return `0x${implementationAddress}`;
}
// vyper's minimal proxy (uniswap v1) - https://etherscan.io/address/0x09cabec1ead1c0ba254b09efb3ee13841712be14#code
if (bytecode.startsWith("0x366000600037611000600036600073")) {
const implementationAddress = bytecode.slice(32, 32 + 40);
return `0x${implementationAddress}`;
}
return undefined;
}
/** /**
* @internal * @internal
* @param address * @param address
@@ -282,14 +318,20 @@ export async function resolveContractUriFromAddress(
`Contract at ${address} does not exist on chain '${chain.name}' (chainId: ${chain.chainId})`, `Contract at ${address} does not exist on chain '${chain.name}' (chainId: ${chain.chainId})`,
); );
} }
// EIP-1167 clone proxy - https://eips.ethereum.org/EIPS/eip-1167
if (bytecode.startsWith("0x363d3d373d3d3d363d")) { try {
const implementationAddress = bytecode.slice(22, 62); const implementationAddress =
return await resolveContractUriFromAddress( extractMinimalProxyImplementationAddress(bytecode);
`0x${implementationAddress}`, if (implementationAddress) {
provider, return await resolveContractUriFromAddress(
); implementationAddress,
provider,
);
}
} catch (e) {
// ignore
} }
// EIP-1967 proxy storage slots - https://eips.ethereum.org/EIPS/eip-1967 // EIP-1967 proxy storage slots - https://eips.ethereum.org/EIPS/eip-1967
try { try {
const proxyStorage = await provider.getStorageAt( const proxyStorage = await provider.getStorageAt(
@@ -400,6 +442,11 @@ export async function fetchContractMetadata(
storage: ThirdwebStorage, storage: ThirdwebStorage,
): Promise<PublishedMetadata> { ): Promise<PublishedMetadata> {
const metadata = await storage.downloadJSON(compilerMetadataUri); const metadata = await storage.downloadJSON(compilerMetadataUri);
if (!metadata || !metadata.output) {
throw new Error(
`Could not resolve metadata for contract at ${compilerMetadataUri}`,
);
}
const abi = AbiSchema.parse(metadata.output.abi); const abi = AbiSchema.parse(metadata.output.abi);
const compilationTarget = metadata.settings.compilationTarget; const compilationTarget = metadata.settings.compilationTarget;
const targets = Object.keys(compilationTarget); const targets = Object.keys(compilationTarget);
@@ -438,8 +485,8 @@ export async function fetchSourceFilesFromMetadata(
async ([path, info]) => { async ([path, info]) => {
const urls = (info as any).urls as string[]; const urls = (info as any).urls as string[];
const ipfsLink = urls const ipfsLink = urls
? urls.find((url) => url.includes("ipfs")) ? urls.find((url) => url.includes("ipfs"))
: undefined; : undefined;
if (ipfsLink) { if (ipfsLink) {
const ipfsHash = ipfsLink.split("ipfs/")[1]; const ipfsHash = ipfsLink.split("ipfs/")[1];
// 5 sec timeout for sources that haven't been uploaded to ipfs // 5 sec timeout for sources that haven't been uploaded to ipfs
@@ -458,8 +505,8 @@ export async function fetchSourceFilesFromMetadata(
return { return {
filename: path, filename: path,
source: source:
(info as any).content || (info as any).content ||
"Could not find source for this contract", "Could not find source for this contract",
}; };
} }
}, },
@@ -543,8 +590,8 @@ export function detectFeatures(
} }
function extractFeatures( function extractFeatures(
input: Record<string, FeatureWithEnabled>, input: Record<string, FeatureWithEnabled>,
enabledExtensions: FeatureWithEnabled[], enabledExtensions: FeatureWithEnabled[],
) { ) {
if (!input) { if (!input) {
return; return;
@@ -556,10 +603,7 @@ function extractFeatures(
enabledExtensions.push(extension); enabledExtensions.push(extension);
} }
// recurse // recurse
extractFeatures( extractFeatures(extension.features, enabledExtensions);
extension.features,
enabledExtensions,
);
} }
} }
+16 -12
View File
@@ -3,7 +3,6 @@ import {
InterfaceId_IERC1155, InterfaceId_IERC1155,
InterfaceId_IERC721, InterfaceId_IERC721,
} from "../constants/contract"; } from "../constants/contract";
import { SignerOrProvider } from "../core";
import { ContractWrapper } from "../core/classes/contract-wrapper"; import { ContractWrapper } from "../core/classes/contract-wrapper";
import { import {
NewAuctionListing, NewAuctionListing,
@@ -76,33 +75,38 @@ export async function isTokenApprovedForTransfer(
/** /**
* Checks if the marketplace is approved to make transfers on the assetContract * Checks if the marketplace is approved to make transfers on the assetContract
* If not, it tries to set the approval. * If not, it tries to set the approval.
* @param signerOrProvider * @param contractWrapper
* @param marketplaceAddress * @param marketplaceAddress
* @param assetContract * @param assetContract
* @param tokenId * @param tokenId
* @param from * @param from
*/ */
export async function handleTokenApproval( export async function handleTokenApproval(
signerOrProvider: SignerOrProvider, contractWrapper: ContractWrapper<any>,
marketplaceAddress: string, marketplaceAddress: string,
assetContract: string, assetContract: string,
tokenId: BigNumberish, tokenId: BigNumberish,
from: string, from: string,
): Promise<void> { ): Promise<void> {
const erc165 = new Contract( const erc165 = new ContractWrapper<IERC165>(
contractWrapper.getSignerOrProvider(),
assetContract, assetContract,
ERC165Abi, ERC165Abi,
signerOrProvider, contractWrapper.options,
) as IERC165; );
const isERC721 = await erc165.supportsInterface(InterfaceId_IERC721); const isERC721 = await erc165.readContract.supportsInterface(
const isERC1155 = await erc165.supportsInterface(InterfaceId_IERC1155); InterfaceId_IERC721,
);
const isERC1155 = await erc165.readContract.supportsInterface(
InterfaceId_IERC1155,
);
// check for token approval // check for token approval
if (isERC721) { if (isERC721) {
const asset = new ContractWrapper<IERC721>( const asset = new ContractWrapper<IERC721>(
signerOrProvider, contractWrapper.getSignerOrProvider(),
assetContract, assetContract,
ERC721Abi, ERC721Abi,
{}, contractWrapper.options,
); );
const approved = await asset.readContract.isApprovedForAll( const approved = await asset.readContract.isApprovedForAll(
from, from,
@@ -122,10 +126,10 @@ export async function handleTokenApproval(
} }
} else if (isERC1155) { } else if (isERC1155) {
const asset = new ContractWrapper<IERC1155>( const asset = new ContractWrapper<IERC1155>(
signerOrProvider, contractWrapper.getSignerOrProvider(),
assetContract, assetContract,
ERC1155Abi, ERC1155Abi,
{}, contractWrapper.options,
); );
const approved = await asset.readContract.isApprovedForAll( const approved = await asset.readContract.isApprovedForAll(
@@ -52,6 +52,7 @@ import {
FEATURE_PRIMARY_SALE, FEATURE_PRIMARY_SALE,
FEATURE_ROYALTY, FEATURE_ROYALTY,
FEATURE_APPURI, FEATURE_APPURI,
FEATURE_GASLESS,
} from "./thirdweb-features"; } from "./thirdweb-features";
/** /**
@@ -104,7 +105,8 @@ export type Feature =
| typeof FEATURE_PERMISSIONS_ENUMERABLE | typeof FEATURE_PERMISSIONS_ENUMERABLE
| typeof FEATURE_METADATA | typeof FEATURE_METADATA
| typeof FEATURE_APPURI | typeof FEATURE_APPURI
| typeof FEATURE_OWNER; | typeof FEATURE_OWNER
| typeof FEATURE_GASLESS;
/** /**
* @internal * @internal
@@ -132,4 +134,5 @@ export const SUPPORTED_FEATURES: Record<string, Feature> = {
[FEATURE_METADATA.name]: FEATURE_METADATA, [FEATURE_METADATA.name]: FEATURE_METADATA,
[FEATURE_APPURI.name]: FEATURE_APPURI, [FEATURE_APPURI.name]: FEATURE_APPURI,
[FEATURE_OWNER.name]: FEATURE_OWNER, [FEATURE_OWNER.name]: FEATURE_OWNER,
[FEATURE_GASLESS.name]: FEATURE_GASLESS,
}; };
@@ -12,8 +12,8 @@ import ILazyMintAbi from "@thirdweb-dev/contracts-js/dist/abis/ILazyMint.json";
import IMintableERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IMintableERC721.json"; import IMintableERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/IMintableERC721.json";
import MulticallAbi from "@thirdweb-dev/contracts-js/dist/abis/IMulticall.json"; import MulticallAbi from "@thirdweb-dev/contracts-js/dist/abis/IMulticall.json";
import SignatureMintERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/ISignatureMintERC721.json"; import SignatureMintERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/ISignatureMintERC721.json";
import SignatureMintERC721_V1Abi from "@thirdweb-dev/contracts-js/dist/abis/ISignatureMintERC721_V1.json";
import TieredDropAbi from "@thirdweb-dev/contracts-js/dist/abis/LazyMintWithTier.json"; import TieredDropAbi from "@thirdweb-dev/contracts-js/dist/abis/LazyMintWithTier.json";
import TokenERC721Abi from "@thirdweb-dev/contracts-js/dist/abis/TokenERC721.json";
export const FEATURE_NFT_BURNABLE = { export const FEATURE_NFT_BURNABLE = {
name: "ERC721Burnable", name: "ERC721Burnable",
@@ -163,7 +163,7 @@ export const FEATURE_NFT_SIGNATURE_MINTABLE_V1 = {
sdk: "sdk.erc721signaturemint", sdk: "sdk.erc721signaturemint",
contracts: "ISignatureMintERC721", contracts: "ISignatureMintERC721",
}, },
abis: [TokenERC721Abi], abis: [SignatureMintERC721_V1Abi],
features: {}, features: {},
} as const; } as const;
@@ -1,3 +1,4 @@
import IERC2771ContextAbi from "@thirdweb-dev/contracts-js/dist/abis/ERC2771Context.json";
import IAppURI from "@thirdweb-dev/contracts-js/dist/abis/IAppURI.json"; import IAppURI from "@thirdweb-dev/contracts-js/dist/abis/IAppURI.json";
import IContractMetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IContractMetadata.json"; import IContractMetadataAbi from "@thirdweb-dev/contracts-js/dist/abis/IContractMetadata.json";
import IPermissionsAbi from "@thirdweb-dev/contracts-js/dist/abis/IPermissions.json"; import IPermissionsAbi from "@thirdweb-dev/contracts-js/dist/abis/IPermissions.json";
@@ -96,3 +97,15 @@ export const FEATURE_OWNER = {
abis: [IOwnableAbi], abis: [IOwnableAbi],
features: {}, features: {},
} as const; } as const;
export const FEATURE_GASLESS = {
name: "Gasless",
namespace: "gasless",
docLinks: {
sdk: "sdk.gaslesstransaction",
// TODO add the correct name for this once it's added to portal
contracts: "",
},
abis: [IERC2771ContextAbi],
features: {},
} as const;
+14 -1
View File
@@ -123,6 +123,11 @@ export function getProviderForNetwork(network: ChainOrRpc | SignerOrProvider) {
} }
} }
const READONLY_PROVIDER_MAP: Map<
string,
StaticJsonRpcBatchProvider | providers.JsonRpcBatchProvider
> = new Map();
/** /**
* *
* @param network - the chain name or rpc url * @param network - the chain name or rpc url
@@ -136,11 +141,19 @@ export function getReadOnlyProvider(network: string, chainId?: number) {
if (match) { if (match) {
switch (match[1]) { switch (match[1]) {
case "http": case "http":
return chainId const seralizedOpts = `${network}-${chainId || -1}`;
const existingProvider = READONLY_PROVIDER_MAP.get(seralizedOpts);
if (existingProvider) {
return existingProvider;
}
const newProvider = chainId
? // if we know the chainId we should use the StaticJsonRpcBatchProvider ? // if we know the chainId we should use the StaticJsonRpcBatchProvider
new StaticJsonRpcBatchProvider(network, chainId) new StaticJsonRpcBatchProvider(network, chainId)
: // otherwise fall back to the built in json rpc batch provider : // otherwise fall back to the built in json rpc batch provider
new providers.JsonRpcBatchProvider(network, chainId); new providers.JsonRpcBatchProvider(network, chainId);
READONLY_PROVIDER_MAP.set(seralizedOpts, newProvider);
return newProvider;
case "ws": case "ws":
return new providers.WebSocketProvider(network, chainId); return new providers.WebSocketProvider(network, chainId);
+14 -38
View File
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { getPrebuiltInfo } from "../common/legacy"; import { getPrebuiltInfo } from "../common/legacy";
import { ALL_ROLES } from "../common/role"; import { ALL_ROLES } from "../common/role";
import { getSignerAndProvider } from "../core/classes/rpc-connection-handler"; import { getSignerAndProvider } from "../core/classes/rpc-connection-handler";
@@ -56,12 +57,8 @@ export const EditionDropInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
const contractInfo = await assertContractType( const contractInfo = await getContractInfo(address, provider);
address, return !contractInfo || contractInfo.version > 2
provider,
"edition-drop",
);
return contractInfo.version > 2
? (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC1155.json")) ? (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC1155.json"))
.default .default
: ( : (
@@ -97,7 +94,6 @@ export const EditionInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "edition");
return ( return (
await import("@thirdweb-dev/contracts-js/dist/abis/TokenERC1155.json") await import("@thirdweb-dev/contracts-js/dist/abis/TokenERC1155.json")
).default; ).default;
@@ -129,7 +125,6 @@ export const MarketplaceInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "marketplace");
return ( return (
await import("@thirdweb-dev/contracts-js/dist/abis/Marketplace.json") await import("@thirdweb-dev/contracts-js/dist/abis/Marketplace.json")
).default; ).default;
@@ -161,7 +156,6 @@ export const MultiwrapInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "multiwrap");
return (await import("@thirdweb-dev/contracts-js/dist/abis/Multiwrap.json")) return (await import("@thirdweb-dev/contracts-js/dist/abis/Multiwrap.json"))
.default; .default;
}, },
@@ -193,7 +187,6 @@ export const NFTCollectionInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "nft-collection");
return ( return (
await import("@thirdweb-dev/contracts-js/dist/abis/TokenERC721.json") await import("@thirdweb-dev/contracts-js/dist/abis/TokenERC721.json")
).default; ).default;
@@ -225,12 +218,8 @@ export const NFTDropInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
const contractInfo = await assertContractType( const contractInfo = await getContractInfo(address, provider);
address, return !contractInfo || contractInfo.version > 3
provider,
"nft-drop",
);
return contractInfo.version > 3
? (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC721.json")) ? (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC721.json"))
.default .default
: ( : (
@@ -267,7 +256,6 @@ export const PackInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "pack");
return (await import("@thirdweb-dev/contracts-js/dist/abis/Pack.json")) return (await import("@thirdweb-dev/contracts-js/dist/abis/Pack.json"))
.default; .default;
}, },
@@ -299,12 +287,8 @@ export const SignatureDropInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
const contractInfo = await assertContractType( const contractInfo = await getContractInfo(address, provider);
address, return !contractInfo || contractInfo.version > 4
provider,
"signature-drop",
);
return contractInfo.version > 4
? ( ? (
await import( await import(
"@thirdweb-dev/contracts-js/dist/abis/SignatureDrop.json" "@thirdweb-dev/contracts-js/dist/abis/SignatureDrop.json"
@@ -344,7 +328,6 @@ export const SplitInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "split");
return (await import("@thirdweb-dev/contracts-js/dist/abis/Split.json")) return (await import("@thirdweb-dev/contracts-js/dist/abis/Split.json"))
.default; .default;
}, },
@@ -376,12 +359,8 @@ export const TokenDropInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
const contractInfo = await assertContractType( const contractInfo = await getContractInfo(address, provider);
address, return !contractInfo || contractInfo.version > 2
provider,
"token-drop",
);
return contractInfo.version > 2
? (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC20.json")) ? (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC20.json"))
.default .default
: (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC20_V2.json")) : (await import("@thirdweb-dev/contracts-js/dist/abis/DropERC20_V2.json"))
@@ -414,7 +393,6 @@ export const TokenInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "token");
return ( return (
await import("@thirdweb-dev/contracts-js/dist/abis/TokenERC20.json") await import("@thirdweb-dev/contracts-js/dist/abis/TokenERC20.json")
).default; ).default;
@@ -447,22 +425,20 @@ export const VoteInitializer = {
); );
}, },
getAbi: async (address: string, provider: ethers.providers.Provider) => { getAbi: async (address: string, provider: ethers.providers.Provider) => {
await assertContractType(address, provider, "vote");
return (await import("@thirdweb-dev/contracts-js/dist/abis/VoteERC20.json")) return (await import("@thirdweb-dev/contracts-js/dist/abis/VoteERC20.json"))
.default; .default;
}, },
}; };
async function assertContractType( async function getContractInfo(
address: string, address: string,
provider: ethers.providers.Provider, provider: ethers.providers.Provider,
type: PrebuiltContractType,
) { ) {
const contractInfo = await getPrebuiltInfo(address, provider); try {
if (!contractInfo || contractInfo.type !== getContractName(type)) { return await getPrebuiltInfo(address, provider);
throw new Error(`Contract is not a ${type}`); } catch (e) {
return undefined;
} }
return contractInfo;
} }
/** /**
@@ -536,10 +536,14 @@ export class Pack extends StandardErc1155<PackContract> {
tokenId: BigNumberish, tokenId: BigNumberish,
amount: BigNumberish = 1, amount: BigNumberish = 1,
): Promise<PackRewards> { ): Promise<PackRewards> {
const receipt = await this.contractWrapper.sendTransaction("openPack", [ const receipt = await this.contractWrapper.sendTransaction(
tokenId, "openPack",
amount, [tokenId, amount],
]); {
// Higher gas limit for opening packs
gasLimit: 500000,
},
);
const event = this.contractWrapper.parseLogs<PackOpenedEvent>( const event = this.contractWrapper.parseLogs<PackOpenedEvent>(
"PackOpened", "PackOpened",
receipt?.logs, receipt?.logs,
@@ -3,7 +3,6 @@ import { FEATURE_TOKEN } from "../constants/erc20-features";
import { FEATURE_NFT } from "../constants/erc721-features"; import { FEATURE_NFT } from "../constants/erc721-features";
import { FEATURE_EDITION } from "../constants/erc1155-features"; import { FEATURE_EDITION } from "../constants/erc1155-features";
import { import {
FEATURE_APPURI,
FEATURE_OWNER, FEATURE_OWNER,
FEATURE_PERMISSIONS, FEATURE_PERMISSIONS,
FEATURE_PLATFORM_FEE, FEATURE_PLATFORM_FEE,
@@ -39,7 +38,6 @@ import type {
IPrimarySale, IPrimarySale,
IRoyalty, IRoyalty,
Ownable, Ownable,
AppURI,
} from "@thirdweb-dev/contracts-js"; } from "@thirdweb-dev/contracts-js";
import { ThirdwebStorage } from "@thirdweb-dev/storage"; import { ThirdwebStorage } from "@thirdweb-dev/storage";
import { BaseContract, CallOverrides, ContractInterface } from "ethers"; import { BaseContract, CallOverrides, ContractInterface } from "ethers";
@@ -84,6 +82,7 @@ export class SmartContract<TContract extends BaseContract = BaseContract>
public publishedMetadata: ContractPublishedMetadata<TContract>; public publishedMetadata: ContractPublishedMetadata<TContract>;
public abi: ContractInterface; public abi: ContractInterface;
public metadata: ContractMetadata<BaseContract, any>; public metadata: ContractMetadata<BaseContract, any>;
public appURI: ContractAppURI<BaseContract>;
/** /**
* Handle royalties * Handle royalties
@@ -120,13 +119,6 @@ export class SmartContract<TContract extends BaseContract = BaseContract>
return assertEnabled(this.detectOwnable(), FEATURE_OWNER); return assertEnabled(this.detectOwnable(), FEATURE_OWNER);
} }
/**
* Set and get the appuri of the contract
*/
get appURI(): ContractAppURI<AppURI> {
return assertEnabled(this.detectAppURI(), FEATURE_APPURI);
}
/** /**
* Auto-detects ERC20 standard functions. * Auto-detects ERC20 standard functions.
*/ */
@@ -186,6 +178,8 @@ export class SmartContract<TContract extends BaseContract = BaseContract>
CustomContractSchema, CustomContractSchema,
this.storage, this.storage,
); );
this.appURI = new ContractAppURI(this.contractWrapper, this.metadata);
} }
onNetworkUpdated(network: NetworkOrSignerOrProvider): void { onNetworkUpdated(network: NetworkOrSignerOrProvider): void {
@@ -290,12 +284,6 @@ export class SmartContract<TContract extends BaseContract = BaseContract>
return undefined; return undefined;
} }
private detectAppURI() {
if (detectContractFeature<AppURI>(this.contractWrapper, "AppURI")) {
return new ContractAppURI(this.contractWrapper);
}
return undefined;
}
private detectOwnable() { private detectOwnable() {
if (detectContractFeature<Ownable>(this.contractWrapper, "Ownable")) { if (detectContractFeature<Ownable>(this.contractWrapper, "Ownable")) {
return new ContractOwner(this.contractWrapper); return new ContractOwner(this.contractWrapper);
@@ -1,8 +1,11 @@
import { detectContractFeature } from "../../common";
import { FEATURE_APPURI } from "../../constants/thirdweb-features"; import { FEATURE_APPURI } from "../../constants/thirdweb-features";
import { DetectableFeature } from "../interfaces/DetectableFeature"; import { DetectableFeature } from "../interfaces/DetectableFeature";
import { TransactionResult } from "../types"; import { TransactionResult } from "../types";
import { ContractMetadata } from "./contract-metadata";
import { ContractWrapper } from "./contract-wrapper"; import { ContractWrapper } from "./contract-wrapper";
import type { AppURI } from "@thirdweb-dev/contracts-js"; import type { AppURI } from "@thirdweb-dev/contracts-js";
import { BaseContract } from "ethers";
/** /**
* Have an official Application URI for this contract. * Have an official Application URI for this contract.
@@ -17,14 +20,19 @@ import type { AppURI } from "@thirdweb-dev/contracts-js";
* ``` * ```
* @public * @public
*/ */
export class ContractAppURI<TContract extends AppURI> export class ContractAppURI<TContract extends BaseContract>
implements DetectableFeature implements DetectableFeature
{ {
featureName = FEATURE_APPURI.name; featureName = FEATURE_APPURI.name;
private contractWrapper; private contractWrapper;
metadata: ContractMetadata<BaseContract, any>;
constructor(contractWrapper: ContractWrapper<TContract>) { constructor(
contractWrapper: ContractWrapper<TContract>,
metadata: ContractMetadata<BaseContract, any>,
) {
this.contractWrapper = contractWrapper; this.contractWrapper = contractWrapper;
this.metadata = metadata;
} }
/** /**
@@ -32,7 +40,11 @@ export class ContractAppURI<TContract extends AppURI>
* @returns the appURI object * @returns the appURI object
*/ */
public async get() { public async get() {
return await this.contractWrapper.readContract.appURI(); if (detectContractFeature<AppURI>(this.contractWrapper, "AppURI")) {
return await this.contractWrapper.readContract.appURI();
}
return (await this.metadata.get()).appURI || "";
} }
/** /**
@@ -40,10 +52,14 @@ export class ContractAppURI<TContract extends AppURI>
* @param appURI - the uri to set (typically an IPFS hash) * @param appURI - the uri to set (typically an IPFS hash)
*/ */
public async set(appURI: string): Promise<TransactionResult> { public async set(appURI: string): Promise<TransactionResult> {
return { if (detectContractFeature<AppURI>(this.contractWrapper, "AppURI")) {
receipt: await this.contractWrapper.sendTransaction("setAppURI", [ return {
appURI, receipt: await this.contractWrapper.sendTransaction("setAppURI", [
]), appURI,
}; ]),
};
}
return await this.metadata.update({ appURI });
} }
} }
@@ -3,7 +3,7 @@ import { ContractEvent, EventQueryOptions } from "../../types/index";
import { ContractWrapper } from "./contract-wrapper"; import { ContractWrapper } from "./contract-wrapper";
import { EventFragment } from "@ethersproject/abi"; import { EventFragment } from "@ethersproject/abi";
import { BaseContract, Event, providers } from "ethers"; import { BaseContract, Event, providers } from "ethers";
import { ListenerFn } from "eventemitter3"; import type { EventEmitter } from "eventemitter3";
/** /**
* Listen to Contract events in real time * Listen to Contract events in real time
@@ -28,7 +28,7 @@ export class ContractEvents<TContract extends BaseContract> {
* @param listener - the callback function that will be called on every transaction * @param listener - the callback function that will be called on every transaction
* @public * @public
*/ */
public addTransactionListener(listener: ListenerFn) { public addTransactionListener(listener: EventEmitter.ListenerFn) {
this.contractWrapper.addListener(EventType.Transaction, listener); this.contractWrapper.addListener(EventType.Transaction, listener);
} }
@@ -44,7 +44,7 @@ export class ContractEvents<TContract extends BaseContract> {
* @param listener - the callback function to remove * @param listener - the callback function to remove
* @public * @public
*/ */
public removeTransactionListener(listener: ListenerFn) { public removeTransactionListener(listener: EventEmitter.ListenerFn) {
this.contractWrapper.off(EventType.Transaction, listener); this.contractWrapper.off(EventType.Transaction, listener);
} }
@@ -22,7 +22,7 @@ export class ContractOwner<TContract extends Ownable>
* Return the current owner of the contract * Return the current owner of the contract
* @returns the owner address * @returns the owner address
*/ */
public async get(): Promise<string> { public async get(): Promise<string> {
return this.contractWrapper.readContract.owner(); return this.contractWrapper.readContract.owner();
} }
@@ -31,13 +31,13 @@ export class ContractOwner<TContract extends Ownable>
* @remarks Can only be called by the current owner. * @remarks Can only be called by the current owner.
* *
* @param address - the address of the new owner * @param address - the address of the new owner
* *
* @example * @example
* ```javascript * ```javascript
* await contract.owner.set("0x1234567890123456789012345678901234567890"); * await contract.owner.set("0x1234567890123456789012345678901234567890");
* ``` * ```
*/ */
public async set(address: string): Promise<TransactionResult> { public async set(address: string): Promise<TransactionResult> {
return { return {
receipt: await this.contractWrapper.sendTransaction("setOwner", [ receipt: await this.contractWrapper.sendTransaction("setOwner", [
address, address,
@@ -1,4 +1,5 @@
import { normalizePriceValue, setErc20Allowance } from "../../common/currency"; import { normalizePriceValue, setErc20Allowance } from "../../common/currency";
import { getPrebuiltInfo } from "../../common/legacy";
import { uploadOrExtractURIs } from "../../common/nft"; import { uploadOrExtractURIs } from "../../common/nft";
import { FEATURE_EDITION_SIGNATURE_MINTABLE } from "../../constants/erc1155-features"; import { FEATURE_EDITION_SIGNATURE_MINTABLE } from "../../constants/erc1155-features";
import type { NFTCollectionInitializer } from "../../contracts"; import type { NFTCollectionInitializer } from "../../contracts";
@@ -330,6 +331,12 @@ export class Erc1155SignatureMintable implements DetectableFeature {
const signer = this.contractWrapper.getSigner(); const signer = this.contractWrapper.getSigner();
invariant(signer, "No signer available"); invariant(signer, "No signer available");
const contractInfo = await getPrebuiltInfo(
this.contractWrapper.readContract.address,
this.contractWrapper.getProvider(),
);
const isLegacyContract = contractInfo?.type === "TokenERC1155";
return await Promise.all( return await Promise.all(
parsedRequests.map(async (m, i) => { parsedRequests.map(async (m, i) => {
const uri = uris[i]; const uri = uris[i];
@@ -340,7 +347,7 @@ export class Erc1155SignatureMintable implements DetectableFeature {
const signature = await this.contractWrapper.signTypedData( const signature = await this.contractWrapper.signTypedData(
signer, signer,
{ {
name: "TokenERC1155", name: isLegacyContract ? "TokenERC1155" : "SignatureMintERC1155",
version: "1", version: "1",
chainId, chainId,
verifyingContract: this.contractWrapper.readContract.address, verifyingContract: this.contractWrapper.readContract.address,
@@ -1,4 +1,4 @@
import { hasFunction } from "../../common"; import { detectContractFeature } from "../../common";
import { normalizePriceValue, setErc20Allowance } from "../../common/currency"; import { normalizePriceValue, setErc20Allowance } from "../../common/currency";
import { uploadOrExtractURIs } from "../../common/nft"; import { uploadOrExtractURIs } from "../../common/nft";
import { FEATURE_NFT_SIGNATURE_MINTABLE_V2 } from "../../constants/erc721-features"; import { FEATURE_NFT_SIGNATURE_MINTABLE_V2 } from "../../constants/erc721-features";
@@ -22,7 +22,7 @@ import type {
} from "@thirdweb-dev/contracts-js"; } from "@thirdweb-dev/contracts-js";
import { TokensMintedWithSignatureEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/SignatureDrop"; import { TokensMintedWithSignatureEvent } from "@thirdweb-dev/contracts-js/dist/declarations/src/SignatureDrop";
import { ThirdwebStorage } from "@thirdweb-dev/storage"; import { ThirdwebStorage } from "@thirdweb-dev/storage";
import { BigNumber, ethers } from "ethers"; import { BigNumber } from "ethers";
import invariant from "tiny-invariant"; import invariant from "tiny-invariant";
/** /**
@@ -397,17 +397,9 @@ export class Erc721WithQuantitySignatureMintable implements DetectableFeature {
} }
private async isLegacyNFTContract() { private async isLegacyNFTContract() {
if (hasFunction<TokenERC721>("contractType", this.contractWrapper)) { return detectContractFeature<ISignatureMintERC721>(
try { this.contractWrapper,
const contractType = ethers.utils.toUtf8String( "ERC721SignatureMintV1",
await this.contractWrapper.readContract.contractType(), );
);
return contractType.includes("TokenERC721");
} catch (e) {
return false;
}
} else {
return false;
}
} }
} }
@@ -207,7 +207,7 @@ export class MarketplaceAuction {
validateNewListingParam(listing); validateNewListingParam(listing);
await handleTokenApproval( await handleTokenApproval(
this.contractWrapper.getSignerOrProvider(), this.contractWrapper,
this.getAddress(), this.getAddress(),
listing.assetContractAddress, listing.assetContractAddress,
listing.tokenId, listing.tokenId,
@@ -162,7 +162,7 @@ export class MarketplaceDirect {
validateNewListingParam(listing); validateNewListingParam(listing);
await handleTokenApproval( await handleTokenApproval(
this.contractWrapper.getSignerOrProvider(), this.contractWrapper,
this.getAddress(), this.getAddress(),
listing.assetContractAddress, listing.assetContractAddress,
listing.tokenId, listing.tokenId,
@@ -14,7 +14,7 @@ import EventEmitter from "eventemitter3";
export class RPCConnectionHandler extends EventEmitter { export class RPCConnectionHandler extends EventEmitter {
private provider: providers.Provider; private provider: providers.Provider;
private signer: Signer | undefined; private signer: Signer | undefined;
protected readonly options: SDKOptionsOutput; public readonly options: SDKOptionsOutput;
constructor(network: NetworkOrSignerOrProvider, options: SDKOptions) { constructor(network: NetworkOrSignerOrProvider, options: SDKOptions) {
super(); super();
+39 -1
View File
@@ -12,6 +12,7 @@ import {
import { SmartContract } from "../contracts/smart-contract"; import { SmartContract } from "../contracts/smart-contract";
import { SDKOptions } from "../schema/sdk-options"; import { SDKOptions } from "../schema/sdk-options";
import { CurrencyValue } from "../types/index"; import { CurrencyValue } from "../types/index";
import type { AbstractWallet } from "../wallets";
import { WalletAuthenticator } from "./auth/wallet-authenticator"; import { WalletAuthenticator } from "./auth/wallet-authenticator";
import type { ContractMetadata } from "./classes"; import type { ContractMetadata } from "./classes";
import { ContractDeployer } from "./classes/contract-deployer"; import { ContractDeployer } from "./classes/contract-deployer";
@@ -39,6 +40,43 @@ import invariant from "tiny-invariant";
* @public * @public
*/ */
export class ThirdwebSDK extends RPCConnectionHandler { export class ThirdwebSDK extends RPCConnectionHandler {
/**
* Get an instance of the thirdweb SDK based on an AbstractWallet
*
* @example
* ```javascript
* import { ThirdwebSDK } from "@thirdweb-dev/sdk"
*
* const wallet = new AbstractWalletImplementation();
* const sdk = await ThirdwebSDK.fromWallet(wallet, "mainnet");
* ```
*
* @param wallet - the implementation of the AbstractWallet class to use for signing
* @param network - the network (chain) to connect to (e.g. "mainnet", "rinkeby", "polygon", "mumbai"...) or a fully formed RPC url
* @param options - the SDK options to use
* @param storage - optional storage implementation to use
* @returns an instance of the SDK
*
* @beta
*/
static async fromWallet(
wallet: AbstractWallet,
network: ChainOrRpc,
options: SDKOptions = {},
storage: ThirdwebStorage = new ThirdwebStorage(),
) {
const signerOrProvider = getProviderForNetwork(network);
const provider = Signer.isSigner(signerOrProvider)
? signerOrProvider.provider
: typeof signerOrProvider === "string"
? getReadOnlyProvider(signerOrProvider)
: signerOrProvider;
const signer = await wallet.getSigner(provider);
return ThirdwebSDK.fromSigner(signer, network, options, storage);
}
/** /**
* Get an instance of the thirdweb SDK based on an existing ethers signer * Get an instance of the thirdweb SDK based on an existing ethers signer
* *
@@ -54,8 +92,8 @@ export class ThirdwebSDK extends RPCConnectionHandler {
* @param signer - a ethers Signer to be used for transactions * @param signer - a ethers Signer to be used for transactions
* @param network - the network (chain) to connect to (e.g. "mainnet", "rinkeby", "polygon", "mumbai"...) or a fully formed RPC url * @param network - the network (chain) to connect to (e.g. "mainnet", "rinkeby", "polygon", "mumbai"...) or a fully formed RPC url
* @param options - the SDK options to use * @param options - the SDK options to use
* @returns an instance of the SDK
* @param storage - optional storage implementation to use * @param storage - optional storage implementation to use
* @returns an instance of the SDK
* *
* @beta * @beta
*/ */
+114 -83
View File
@@ -1,99 +1,130 @@
import { providers, utils } from "ethers"; import { providers, utils } from "ethers";
const DEFAULT_BATCH_TIME_LIMIT_MS = 50;
const DEFAULT_BATCH_SIZE_LIMIT = 250;
const DEFAULT_BATCH_OPTIONS = {
timeLimitMs: DEFAULT_BATCH_TIME_LIMIT_MS,
sizeLimit: DEFAULT_BATCH_SIZE_LIMIT,
};
export type BatchOptions = Partial<typeof DEFAULT_BATCH_OPTIONS>;
// mostly copied from ethers.js directly but make it a StaticJsonRpcProvider // mostly copied from ethers.js directly but make it a StaticJsonRpcProvider
export class StaticJsonRpcBatchProvider extends providers.StaticJsonRpcProvider { export class StaticJsonRpcBatchProvider extends providers.StaticJsonRpcProvider {
_pendingBatchAggregator: NodeJS.Timer | null; private _timeLimitMs: number;
_pendingBatch: Array<{ private _sizeLimit: number;
request: { method: string, params: Array<any>, id: number, jsonrpc: "2.0" }, _pendingBatchAggregator: NodeJS.Timer | null;
resolve: (result: any) => void, _pendingBatch: Array<{
reject: (error: Error) => void request: { method: string; params: Array<any>; id: number; jsonrpc: "2.0" };
}> | null; resolve: (result: any) => void;
reject: (error: Error) => void;
}> | null;
constructor(url: string | utils.ConnectionInfo | undefined, network: providers.Networkish | undefined){ constructor(
super(url, network); url: string | utils.ConnectionInfo | undefined,
this._pendingBatchAggregator = null; network: providers.Networkish | undefined,
this._pendingBatch = null; batchOptions: BatchOptions = DEFAULT_BATCH_OPTIONS,
) {
super(url, network);
this._timeLimitMs = batchOptions.timeLimitMs || DEFAULT_BATCH_SIZE_LIMIT;
this._sizeLimit = batchOptions.sizeLimit || DEFAULT_BATCH_TIME_LIMIT_MS;
this._pendingBatchAggregator = null;
this._pendingBatch = null;
}
private sendCurrentBatch(request: any) {
// if we still have a timeout clear that first
if (this._pendingBatchAggregator) {
clearTimeout(this._pendingBatchAggregator);
} }
// Get the current batch and clear it, so new requests
// go into the next batch
const batch = this._pendingBatch || [];
this._pendingBatch = null;
this._pendingBatchAggregator = null;
send(method: string, params: Array<any>): Promise<any> { // Get the request as an array of requests
const request = { const request_ = batch.map((inflight) => inflight.request);
method: method,
params: params,
id: (this._nextId++),
jsonrpc: "2.0"
};
if (this._pendingBatch === null) { this.emit("debug", {
this._pendingBatch = [ ]; action: "requestBatch",
} request: utils.deepCopy(request),
provider: this,
});
const inflightRequest: any = { request, resolve: null, reject: null }; return utils.fetchJson(this.connection, JSON.stringify(request_)).then(
(result) => {
const promise = new Promise((resolve, reject) => { this.emit("debug", {
inflightRequest.resolve = resolve; action: "response",
inflightRequest.reject = reject; request: request_,
response: result,
provider: this,
}); });
this._pendingBatch.push(inflightRequest); // For each result, feed it to the correct Promise, depending
// on whether it was a success or error
batch.forEach((inflightRequest_, index) => {
const payload = result[index];
if (payload.error) {
const error = new Error(payload.error.message);
(error as any).code = payload.error.code;
(error as any).data = payload.error.data;
inflightRequest_.reject(error);
} else {
inflightRequest_.resolve(payload.result);
}
});
},
(error) => {
this.emit("debug", {
action: "response",
error: error,
request: request_,
provider: this,
});
if (!this._pendingBatchAggregator) { // If there was an error, reject all the requests
// Schedule batch for next event loop + short duration batch.forEach((inflightRequest_) => {
this._pendingBatchAggregator = setTimeout(() => { inflightRequest_.reject(error);
});
},
);
}
// Get the current batch and clear it, so new requests send(method: string, params: Array<any>): Promise<any> {
// go into the next batch const request = {
const batch = this._pendingBatch || []; method: method,
this._pendingBatch = null; params: params,
this._pendingBatchAggregator = null; id: this._nextId++,
jsonrpc: "2.0",
};
// Get the request as an array of requests if (this._pendingBatch === null) {
const request_ = batch.map((inflight) => inflight.request); this._pendingBatch = [];
this.emit("debug", {
action: "requestBatch",
request: utils.deepCopy(request),
provider: this
});
return utils.fetchJson(this.connection, JSON.stringify(request_)).then((result) => {
this.emit("debug", {
action: "response",
request: request_,
response: result,
provider: this
});
// For each result, feed it to the correct Promise, depending
// on whether it was a success or error
batch.forEach((inflightRequest_, index) => {
const payload = result[index];
if (payload.error) {
const error = new Error(payload.error.message);
(<any>error).code = payload.error.code;
(<any>error).data = payload.error.data;
inflightRequest_.reject(error);
} else {
inflightRequest_.resolve(payload.result);
}
});
}, (error) => {
this.emit("debug", {
action: "response",
error: error,
request: request,
provider: this
});
batch.forEach((inflightRequest_) => {
inflightRequest_.reject(error);
});
});
}, 10);
}
return promise;
} }
}
const inflightRequest: any = { request, resolve: null, reject: null };
const promise = new Promise((resolve, reject) => {
inflightRequest.resolve = resolve;
inflightRequest.reject = reject;
});
// if we would go *over* the size limit of the batch with this request, send the batch now
if (this._pendingBatch.length === this._sizeLimit) {
this.sendCurrentBatch(request);
}
this._pendingBatch.push(inflightRequest);
if (!this._pendingBatchAggregator) {
// Schedule batch for next event loop + short duration
this._pendingBatchAggregator = setTimeout(() => {
this.sendCurrentBatch(request);
}, this._timeLimitMs);
}
return promise;
}
}
@@ -8,3 +8,4 @@ export * from "./token-erc20";
export * from "./token-erc721"; export * from "./token-erc721";
export * from "./token-erc1155"; export * from "./token-erc1155";
export * from "./vote"; export * from "./vote";
export * from "./custom";
+1 -1
View File
@@ -80,4 +80,4 @@ export type SDKOptions = z.input<typeof SDKOptionsSchema>;
/** /**
* @internal * @internal
*/ */
export type SDKOptionsOutput = z.output<typeof SDKOptionsSchema>; export type SDKOptionsOutput = z.output<typeof SDKOptionsSchema>;
@@ -0,0 +1,62 @@
import { AbstractWallet } from "../types/abstract";
import {
TypedDataDomain,
TypedDataField,
} from "@ethersproject/abstract-signer";
import { ethers } from "ethers";
import { AwsKmsSigner, AwsKmsSignerCredentials } from "ethers-aws-kms-signer";
/**
* Create a wallet instance using a private key stored in AWS KMS.
*
* @example
* ```javascript
* import { ThirdwebSDK } from "@thirdweb-dev/sdk"
* import { AwsKmsWallet } from "@thirdweb-dev/sdk/evm/wallets"
*
* const wallet = new AwsKmsallet({
* region: "us-east-1",
* accessKeyId: process.env.AWS_ACCESS_KEY_ID,
* secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
* sessionToken: process.env.AWS_SESSION_TOKEN,
* keyId: process.env.AWS_KEY_ID,
* });
*
* const sdk = await ThirdwebSDK.fromWallet(wallet, "mainnet");
* ```
*/
export class AwsKmsWallet extends AbstractWallet {
private cachedSigner: AwsKmsSigner;
constructor(options: AwsKmsSignerCredentials) {
super();
this.cachedSigner = this.updateSigner(new AwsKmsSigner(options));
}
async getSigner(
provider?: ethers.providers.Provider,
): Promise<ethers.Signer> {
if (provider) {
this.cachedSigner = this.updateSigner(
this.cachedSigner.connect(provider),
);
}
return this.cachedSigner;
}
// Add _signTypedData method onto the signer for now so we don't need to reimpliment
// The entire AWS KMS signer repository and maintain it ourselves.
private updateSigner(signer: AwsKmsSigner): AwsKmsSigner {
(signer as any)._signTypedData = async function (
domain: TypedDataDomain,
types: Record<string, Array<TypedDataField>>,
value: Record<string, any>,
) {
const hash = ethers.utils._TypedDataEncoder.hash(domain, types, value);
return signer._signDigest(hash);
};
return signer;
}
}
@@ -0,0 +1,79 @@
import { AbstractWallet } from "../types/abstract";
import {
GetSecretValueCommand,
SecretsManagerClient,
SecretsManagerClientConfig,
} from "@aws-sdk/client-secrets-manager";
import { ethers } from "ethers";
export type AwsSecretsManagerWalletOptions = {
secretId: string;
secretKeyName: string;
awsConfig: SecretsManagerClientConfig;
};
/**
* Create a wallet instance using a private key stored in AWS Secrets Manager.
*
* @example
* ```javascript
* import { ThirdwebSDK } from "@thirdweb-dev/sdk"
* import { AwsSecretsManagerWallet } from "@thirdweb-dev/sdk/evm/wallets"
*
* const wallet = new AwsSecretsManagerWallet({
* secretName: "my-secret",
* secretKeyName: "private-key",
* awsConfig: {
* region: "us-east-1",
* credentials: {
* accessKeyId: process.env.AWS_ACCESS_KEY_ID,
* secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
* },
* }
* });
*
* const sdk = await ThirdwebSDK.fromWallet(wallet, "mainnet");
* ```
*/
export class AwsSecretsManagerWallet extends AbstractWallet {
private secretId: string;
private secretKeyName: string;
private client: SecretsManagerClient;
private cachedSigner: ethers.Signer | undefined;
constructor(options: AwsSecretsManagerWalletOptions) {
super();
this.secretId = options.secretId;
this.secretKeyName = options.secretKeyName;
this.client = new SecretsManagerClient(options.awsConfig);
}
async getSigner(
provider?: ethers.providers.Provider,
): Promise<ethers.Signer> {
if (this.cachedSigner) {
return this.cachedSigner;
}
const res = await this.client.send(
new GetSecretValueCommand({
SecretId: this.secretId,
VersionStage: "AWSCURRENT", // VersionStage defaults to AWSCURRENT if unspecified
}),
);
if (!res || !res.SecretString) {
throw new Error(`No secret found at ${this.secretId}`);
}
const privateKey = JSON.parse(res.SecretString)[this.secretKeyName];
if (!privateKey) {
throw new Error(
`Secret ${this.secretId} does not have key ${this.secretKeyName}`,
);
}
this.cachedSigner = new ethers.Wallet(privateKey, provider);
return this.cachedSigner;
}
}
@@ -0,0 +1,2 @@
export * from "./aws-secrets-manager";
export * from "./aws-kms";

Some files were not shown because too many files have changed in this diff Show More