Compare commits

..
Author SHA1 Message Date
github-actions[bot]andgithub-actions[bot] 6ce366f59e Version Packages (#1190)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-06-20 23:26:22 -07:00
SebastianandJoaquim Verges 8a2d92046a [SDK] update polygon gas station url (#1208)
Co-authored-by: Joaquim Verges <[email protected]>
2023-06-21 06:04:20 +00:00
Yash 45ae105ed3 [SDK] Minimal forwarders for ZKSync (#1191) 2023-06-21 05:53:53 +00:00
Jonas Daniels 23d61cfeff [SDK] - open edition feature (#1193) 2023-06-21 02:33:58 +00:00
nkrishang 990c665de9 Feature detection and SDK class for Smart Wallet. (#1134) 2023-06-20 23:46:01 +00:00
Joaquim Verges 08eaefcf0b [SDK] shortcut getAllOwners for NFT drops to only check claimed (#1203) 2023-06-20 23:40:36 +00:00
Manan Tank 3d62278aba [wallets, react, react-core] Add eslint-plugin-better-tree-shaking (#1206) 2023-06-20 20:53:22 +00:00
iketw 3ab7d1e975 [ReactNative] Export more components for easy development (#1205) 2023-06-20 19:19:21 +00:00
Manan Tank c6f44722f9 [sdk] Add eslint-plugin-better-tree-shaking (#1199) 2023-06-20 15:06:30 +00:00
Joaquim Verges e0ce4a3759 [SDK] Zora claim extension (#1197) 2023-06-20 04:47:02 +00:00
iketw 04416e7c93 [RN] Return connection Promise for better error handling (#1202) 2023-06-19 20:30:41 +00:00
Manan Tank 5166b24a48 [readme] Update install command for windows in contributing.md (#1200) 2023-06-19 17:29:33 +00:00
Manan Tank bb7ca20e49 [sdk] Better PURE annotations for tree-shaking (#1198) 2023-06-17 19:34:08 +00:00
Jonas Daniels f41f1a2958 [chains] - fix arbitrum goerli (#1192) 2023-06-16 21:55:21 +00:00
Manan Tank d9b7360d1d [sdk] Refactor erc-721.ts, erc-1155.ts, erc-20.ts (#1196) 2023-06-16 21:36:38 +00:00
Manan Tank 8941b22682 [sdk] Add PURE annotations for improved tree-shaking (#1189) 2023-06-16 13:51:28 +00:00
github-actions[bot] f61beace93 Version Packages (#1158) 2023-06-15 19:49:18 -07:00
Adam Majmudar 08403dd9da Expose useSwitchAccount (#1187) 2023-06-16 00:35:25 +00:00
Nacho Iacovino 36f3191f3e [React] Fix useIsSmartWalletDeployed cache (#1186) 2023-06-15 23:46:24 +00:00
Yash 7d2a446ece [SDK] Expose salt input for deployments (#1155) 2023-06-15 21:20:56 +00:00
FirekeeperandJonas Daniels ab575726fe [unity-js-bridge] add allChains to unity bridge wallet instantiation (#1176)
Co-authored-by: Jonas Daniels <[email protected]>
2023-06-15 18:20:02 +00:00
Jonas Daniels 8e28b0f5e7 [chains] add zora mainnet (#1185) 2023-06-15 17:57:43 +00:00
Mariano Fuentes e7f1ce43b0 Detector typo fix (#1184) 2023-06-15 17:46:31 +00:00
Mariano Fuentes 224b7241dc Bugfix for python detectors (#1183) 2023-06-15 17:20:41 +00:00
iketw a0eee749a2 Ike/demo (#1182) 2023-06-15 14:21:13 +00:00
iketw 20bbad1abc [SDK] Switch warn to debug console message (#1181) 2023-06-15 12:53:15 +00:00
Yash a430160e6b [SDK] Util for deterministic direct deployments (#1162) 2023-06-14 23:56:58 +00:00
Mariano Fuentes 5745481584 Revert Checking for pip and pip3 (#1178) 2023-06-14 21:22:29 +00:00
Mariano Fuentes afdedb1feb [Install] - Handle pip and pip3 install automatically (#1177) 2023-06-14 20:30:58 +00:00
Manan Tank 01293857fa [sdk] Tree shaking improvements (#1175) 2023-06-14 17:25:02 +00:00
Nacho Iacovino ecdcf82cf3 [React] Add password data-test (#1172) 2023-06-14 00:29:46 +00:00
Kien NgoandJoaquim Verges 12b07aad9a [SDK] Fix circular deps issue between metadata-resolver <-> core/sdk (#1167)
Co-authored-by: Joaquim Verges <[email protected]>
2023-06-14 00:20:01 +00:00
Mariano Fuentes c0e2c9457f Bug fixes for install (#1171) 2023-06-13 23:56:37 +00:00
654b8ab351 [REACT] Add Zerion Wallet (#1160)
Co-authored-by: iketw <[email protected]>
Co-authored-by: Manan Tank <[email protected]>
2023-06-13 17:02:26 +00:00
Kien NgoandJoaquim Verges a5578abf66 [REACT] Reduce circular dependencies (#1164)
Co-authored-by: Joaquim Verges <[email protected]>
2023-06-13 10:37:30 +00:00
Nacho Iacovino 541e488d5b [React] Add data-address to ConnectWallet (#1166) 2023-06-13 00:42:46 +00:00
Adam Majmudar 088f2567f6 [Auth] Include chain id in login payload (#1165) 2023-06-13 00:29:31 +00:00
Nacho Iacovino 6803e8ca09 [React] Add data-test to ConnectWallet (#1163) 2023-06-12 23:41:44 +00:00
Adam Majmudar d60e544a24 [Auth] Update with refresh interval and active account (#1150) 2023-06-12 22:52:08 +00:00
Mariano FuentesandJonas Daniels cc20f93e17 Update Install Command (#1074)
Co-authored-by: Jonas Daniels <[email protected]>
2023-06-12 17:47:43 +00:00
329bccec4b [react, wallets] Add Frame wallet (#1000)
Co-authored-by: Jonas Daniels <[email protected]>
Co-authored-by: Manan Tank <[email protected]>
Co-authored-by: ikethirdweb <[email protected]>
2023-06-12 14:06:24 +00:00
BeauandJonas Daniels 02d55a063e fix: always use latest CLI version to prevent build failures in CI (#1154)
Co-authored-by: Jonas Daniels <[email protected]>
2023-06-09 19:09:23 +00:00
github-actions[bot]andgithub-actions[bot] 73bee2bed1 Version Packages (#1121)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-06-08 22:35:52 -06:00
Kristof GazsoandJoaquim Verges 2a443365bd [Smart Wallet] Fix Celo support (#1153)
Co-authored-by: Joaquim Verges <[email protected]>
2023-06-09 04:22:15 +00:00
Manan Tank ed47fd5310 [sdk] Reduce circular dependencies (#1152) 2023-06-08 22:01:35 +00:00
Manan Tank 2a0294d8e6 [react] Fix wrong balance in ConnectWallet (#1151) 2023-06-08 20:09:52 +00:00
Manan Tank 65ecf072eb [react] Improve rendering of long Network List in ConnectWallet Modal (#1149) 2023-06-08 19:10:45 +00:00
Manan Tank 9ce3eb6aad [react-core] Remove WalletConfig.config, Remove circular dependency (#1144) 2023-06-08 09:43:16 +00:00
Nacho Iacovino e32faeb57a [React] Fix return type for useIsSmartWalletDeployed (#1146) 2023-06-08 00:38:59 +00:00
Nacho Iacovino 6a19426200 [React] Add useIsSmartWalletDeployed hook (#1145) 2023-06-07 23:40:11 +00:00
iketw 2bcad4b716 [ReactNative] make links optional (#1143) 2023-06-07 20:57:22 +00:00
Firekeeper 193de1e9d8 [unity-js-bridge] WebGL SW Multi EOA Support (#1142) 2023-06-07 09:35:17 +00:00
Josh SteinandJonas Daniels 645b0303cc feat: create Taro Testnet (#1138)
Co-authored-by: Jonas Daniels <[email protected]>
2023-06-07 05:22:09 +00:00
Yash 16232de9ea [Chains] Update chains (#1140) 2023-06-06 23:36:12 +00:00
Joaquim Verges 52056edfd6 [SDK] Fix contract.call documentation (#1139) 2023-06-06 19:53:17 +00:00
iketw dec4c4a8cf [ReactNative] Exports WCV1 and V2 abstract classes to facilitate creation of wallet connect based wallets (#1137) 2023-06-06 17:22:58 +00:00
Manan Tank 9a015a23cd [react-core] Logout user on account switch (#1136) 2023-06-06 10:39:43 +00:00
iketw 15ef4779e0 [ReactNative] Exports base UI components for external use (#1135) 2023-06-05 22:22:37 +00:00
Firekeeper b8498c2a10 [unity-js-bridge] sw lw persistence webgl & export (#1133) 2023-06-05 16:38:48 +00:00
Manan TankandJoaquim Verges 56f85e57df [sdk] Reduce circular dependencies (#1124)
Co-authored-by: Joaquim Verges <[email protected]>
2023-06-05 15:22:02 +00:00
Manan Tank 197a6838f6 [wallets] Clear localWallet.ethersWallet when calling localWallet.disconnect (#1132) 2023-06-05 15:10:59 +00:00
Yash 3bf7f37593 [SDK] Fix handling of standard contracts (#1131) 2023-06-03 23:30:21 +00:00
Yash 6803c3e97c Fix any evm deploy: when not autoFactory (#1129) 2023-06-03 02:43:58 +00:00
Yash b672860397 [SDK] Enable ZKSync mainnet deployments (#1128) 2023-06-03 01:02:58 +00:00
Adam Majmudar ab14cd8938 [Auth] Add expiration date to cookies (#1126) 2023-06-02 23:28:39 +00:00
Yash 8687d6ac3a Add missing exports (#1127) 2023-06-02 23:27:30 +00:00
Yash a5f16b6dc5 Check standard deploy type (#1125) 2023-06-02 22:19:18 +00:00
YashandNacho Iacovino 6a91b6a025 [SDK] Publish flow updates (#1016)
Co-authored-by: Nacho Iacovino <[email protected]>
2023-06-02 20:59:45 +00:00
Nacho Iacovino 54cfd6d891 [React] Update useCreateSmartWallet (#1123) 2023-06-02 19:56:14 +00:00
Manan Tank 522453fd56 [sdk] Reduce circular dependencies (#1120) 2023-06-02 18:01:57 +00:00
Nacho Iacovino 0cba69ca40 Export smart wallet factory hooks (#1119) 2023-06-02 17:48:15 +00:00
github-actions[bot]andgithub-actions[bot] 96b43b8488 Version Packages (#1106)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-06-02 10:33:56 -07:00
Nacho IacovinoandKrishang b4c9515937 Add Smart Wallet Factory hooks (#1115)
Co-authored-by: Krishang <[email protected]>
2023-06-02 16:19:24 +00:00
Manan Tank 9b20fc9ad2 [wallets, react] Remove chain restriction in paper wallet, Fix email validation in paper & magic (#1118) 2023-06-02 15:54:48 +00:00
Manan Tank 51bbd3d1bc [sdk] Reduce circular dependencies (#1117) 2023-06-02 13:58:26 +00:00
Manan Tank 356f7aa643 [react] Fix missing connectionStatus on localWallet connection, Metamask QR connection (#1116) 2023-06-02 12:35:14 +00:00
Adam Majmudar 2283e71aca [Auth] Switch to server-side payload generation (#1114) 2023-06-02 00:38:35 +00:00
iketw 90ab9ab031 [RN] fix lint warning (#1113) 2023-06-01 22:13:39 +00:00
Manan Tank 6aee041343 [sdk] Reduce circular dependencies (#1112) 2023-06-01 22:07:36 +00:00
Adam Majmudar 21627c03d1 Update auth expiration (#1111) 2023-06-01 18:48:26 +00:00
ce36322b38 [SDK] Added getNonce() & updated airdrop (#1104)
Co-authored-by: Joaquim Verges <[email protected]>
Co-authored-by: Jonas Daniels <[email protected]>
2023-06-01 17:43:55 +00:00
nkrishang 564eaccf48 Smart Wallet Factory class for creating accounts and fetching data about them. (#1095) 2023-06-01 14:31:32 +00:00
Manan Tank aa9e952cb5 [sdk] Reduce circular dependencies (#1110) 2023-06-01 14:28:30 +00:00
Manan Tank 85a6162137 [sdk] Reduce circular deps (#1109) 2023-06-01 13:30:29 +00:00
Manan Tank e93aa70ef0 [sdk] Reduce circular deps (#1108) 2023-06-01 12:43:31 +00:00
Manan Tank 6e86123403 [sdk] Reduce circular dependencies (#1107) 2023-06-01 12:13:22 +00:00
Manan Tank c60658ed8c [sdk] Reduce circular deps (#1105) 2023-06-01 11:29:45 +00:00
463 changed files with 36064 additions and 16862 deletions
+6
View File
@@ -59,9 +59,15 @@ To begin:
``` ```
pnpm install pnpm install
``` ```
If you are on windows, use the `--ignore-scripts` flag
```
pnpm install --ignore-scripts
```
Now you have got the repo on your local machine, and you're ready to start making your changes! Now you have got the repo on your local machine, and you're ready to start making your changes!
<br/>
### Test Your Changes ### Test Your Changes
We use [yalc](https://github.com/wclr/yalc) to test changes locally. We use [yalc](https://github.com/wclr/yalc) to test changes locally.
+1 -1
View File
@@ -43,7 +43,7 @@
"@playwright/test": "1.31.2", "@playwright/test": "1.31.2",
"@trivago/prettier-plugin-sort-imports": "^4.1.1", "@trivago/prettier-plugin-sort-imports": "^4.1.1",
"@types/node": "^18.15.11", "@types/node": "^18.15.11",
"eslint": "^8.37.0", "eslint": "^8.42.0",
"mocha": "^10.2.0", "mocha": "^10.2.0",
"prettier": "^2.8.7", "prettier": "^2.8.7",
"turbo": "^1.9.8", "turbo": "^1.9.8",
+42
View File
@@ -1,5 +1,47 @@
# @thirdweb-dev/auth # @thirdweb-dev/auth
## 3.2.1
### Patch Changes
- Updated dependencies [[`3d62278a`](https://github.com/thirdweb-dev/js/commit/3d62278aba79101ae1158fb726d6ddfed505c939)]:
- @thirdweb-dev/wallets@0.3.1
## 3.2.0
### Minor Changes
- [#1150](https://github.com/thirdweb-dev/js/pull/1150) [`d60e544a`](https://github.com/thirdweb-dev/js/commit/d60e544a240b93312743e62096ee2dc77d0c1bd1) Thanks [@adam-maj](https://github.com/adam-maj)! - Add support for multipled logged in accounts and token refreshing to auth
### Patch Changes
- [#1165](https://github.com/thirdweb-dev/js/pull/1165) [`088f2567`](https://github.com/thirdweb-dev/js/commit/088f2567f615360edd44776b20ae0bedff250f43) Thanks [@adam-maj](https://github.com/adam-maj)! - Include chain id in login payload
- Updated dependencies [[`654b8ab3`](https://github.com/thirdweb-dev/js/commit/654b8ab35184e02127a5a47f05d78606dd5b29ca), [`329bccec`](https://github.com/thirdweb-dev/js/commit/329bccec4b88b02db5bac6c1415158928843376a)]:
- @thirdweb-dev/wallets@0.3.0
## 3.1.1
### Patch Changes
- [#1126](https://github.com/thirdweb-dev/js/pull/1126) [`ab14cd89`](https://github.com/thirdweb-dev/js/commit/ab14cd89385aefad7f32e20a22baa9fce42b98e2) Thanks [@adam-maj](https://github.com/adam-maj)! - Add expiration date to cookie
- Updated dependencies [[`2a443365`](https://github.com/thirdweb-dev/js/commit/2a443365bdc3d47d0f41fc895f70256dcde423f5), [`197a6838`](https://github.com/thirdweb-dev/js/commit/197a6838f69ae8b9ad46524e7c469fc757d0a2cb)]:
- @thirdweb-dev/wallets@0.2.26
## 3.1.0
### Minor Changes
- [#1114](https://github.com/thirdweb-dev/js/pull/1114) [`2283e71a`](https://github.com/thirdweb-dev/js/commit/2283e71acaaf3d15eb2d6121682f1d2a81eec4f3) Thanks [@adam-maj](https://github.com/adam-maj)! - Switch to server-side payload generation
### Patch Changes
- [#1111](https://github.com/thirdweb-dev/js/pull/1111) [`21627c03`](https://github.com/thirdweb-dev/js/commit/21627c03d1bb1658fee19b12d580faa6c7f048d9) Thanks [@adam-maj](https://github.com/adam-maj)! - Update expiration dates for auth
- Updated dependencies [[`9b20fc9a`](https://github.com/thirdweb-dev/js/commit/9b20fc9ad2d303edc31f44fbd2ea3b4dcf35d11e)]:
- @thirdweb-dev/wallets@0.2.25
## 3.0.23 ## 3.0.23
### Patch Changes ### Patch Changes
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "@thirdweb-dev/auth", "name": "@thirdweb-dev/auth",
"version": "3.0.23", "version": "3.2.1",
"main": "dist/thirdweb-dev-auth.cjs.js", "main": "dist/thirdweb-dev-auth.cjs.js",
"module": "dist/thirdweb-dev-auth.esm.js", "module": "dist/thirdweb-dev-auth.esm.js",
"browser": { "browser": {
@@ -101,7 +101,7 @@
"@typescript-eslint/parser": "^5.33.0", "@typescript-eslint/parser": "^5.33.0",
"chai": "^4.3.6", "chai": "^4.3.6",
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"eslint": "^8.21.0", "eslint": "^8.42.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-config-thirdweb": "workspace:*", "eslint-config-thirdweb": "workspace:*",
"eslint-plugin-import": "^2.26.0", "eslint-plugin-import": "^2.26.0",
+7
View File
@@ -0,0 +1,7 @@
const THIRDWEB_AUTH_COOKIE_PREFIX = `thirdweb_auth`;
export const THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX = `${THIRDWEB_AUTH_COOKIE_PREFIX}_token`;
export const THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE = `${THIRDWEB_AUTH_COOKIE_PREFIX}_active_account`;
export const THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS = 60 * 10;
export const THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS = 60 * 60 * 24;
export const THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS = 5;
+95 -38
View File
@@ -1,3 +1,7 @@
import {
THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
} from "../constants";
import { import {
LoginOptions, LoginOptions,
LoginPayload, LoginPayload,
@@ -6,7 +10,6 @@ import {
LoginPayloadDataSchema, LoginPayloadDataSchema,
AuthenticationPayloadDataSchema, AuthenticationPayloadDataSchema,
AuthenticationPayloadData, AuthenticationPayloadData,
LoginOptionsSchema,
VerifyOptionsSchema, VerifyOptionsSchema,
VerifyOptions, VerifyOptions,
GenerateOptionsSchema, GenerateOptionsSchema,
@@ -14,6 +17,9 @@ import {
AuthenticateOptions, AuthenticateOptions,
User, User,
Json, Json,
LoginOptionsSchema,
AuthenticationPayload,
AuthenticationPayloadDataInput,
} from "./schema"; } from "./schema";
import { isBrowser } from "./utils"; import { isBrowser } from "./utils";
import type { GenericAuthWallet } from "@thirdweb-dev/wallets"; import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
@@ -31,7 +37,7 @@ export class ThirdwebAuth {
this.wallet = wallet; this.wallet = wallet;
} }
public async login(options?: LoginOptions): Promise<LoginPayload> { public async payload(options?: LoginOptions): Promise<LoginPayloadData> {
const parsedOptions = LoginOptionsSchema.parse(options); const parsedOptions = LoginOptionsSchema.parse(options);
let chainId: string | undefined = parsedOptions?.chainId; let chainId: string | undefined = parsedOptions?.chainId;
@@ -43,31 +49,48 @@ export class ThirdwebAuth {
} }
} }
const payloadData = LoginPayloadDataSchema.parse({ return LoginPayloadDataSchema.parse({
type: this.wallet.type, type: this.wallet.type,
domain: parsedOptions?.domain || this.domain, domain: parsedOptions?.domain || this.domain,
address: await this.wallet.getAddress(), address: parsedOptions?.address || (await this.wallet.getAddress()),
statement: parsedOptions?.statement, statement: parsedOptions?.statement,
version: parsedOptions?.version, version: parsedOptions?.version,
uri: parsedOptions?.uri, uri: parsedOptions?.uri,
chain_id: chainId, chain_id: chainId,
nonce: parsedOptions?.nonce, nonce: parsedOptions?.nonce,
expiration_time: expiration_time:
parsedOptions?.expirationTime || new Date(Date.now() + 1000 * 60 * 5), parsedOptions?.expirationTime ||
new Date(
Date.now() +
1000 * THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
),
invalid_before: invalid_before:
parsedOptions?.invalidBefore || new Date(Date.now() - 1000 * 60 * 5), parsedOptions?.invalidBefore ||
new Date(
Date.now() -
1000 * THIRDWEB_AUTH_DEFAULT_LOGIN_PAYLOAD_DURATION_IN_SECONDS,
),
resources: parsedOptions?.resources, resources: parsedOptions?.resources,
}); });
}
const message = this.generateMessage(payloadData); public async loginWithPayload(
payload: LoginPayloadData,
): Promise<LoginPayload> {
const message = this.generateMessage(payload);
const signature = await this.wallet.signMessage(message); const signature = await this.wallet.signMessage(message);
return { return {
payload: payloadData, payload,
signature, signature,
}; };
} }
public async login(options?: LoginOptions): Promise<LoginPayload> {
const payloadData = await this.payload(options);
return await this.loginWithPayload(payloadData);
}
public async verify( public async verify(
payload: LoginPayload, payload: LoginPayload,
options?: VerifyOptions, options?: VerifyOptions,
@@ -208,41 +231,37 @@ export class ThirdwebAuth {
} }
const adminAddress = await this.wallet.getAddress(); const adminAddress = await this.wallet.getAddress();
const payloadData = AuthenticationPayloadDataSchema.parse({ return this.createToken({
iss: adminAddress, iss: adminAddress,
sub: userAddress, sub: userAddress,
aud: domain, aud: domain,
nbf: parsedOptions?.invalidBefore || new Date(), nbf: parsedOptions?.invalidBefore || new Date(),
exp: exp:
parsedOptions?.expirationTime || parsedOptions?.expirationTime ||
new Date(Date.now() + 1000 * 60 * 60 * 5), new Date(
Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
),
iat: new Date(), iat: new Date(),
jti: parsedOptions?.tokenId, jti: parsedOptions?.tokenId,
ctx: session, ctx: session,
}); });
}
const message = JSON.stringify(payloadData); public async refresh(token: string, expirationTime?: Date): Promise<string> {
const signature = await this.wallet.signMessage(message); const { payload } = this.parseToken(token);
return this.createToken({
// Header used for JWT token specifying hash algorithm iss: payload.iss,
const header = { sub: payload.sub,
// Specify ECDSA with SHA-256 for hashing algorithm aud: payload.aud,
alg: "ES256", nbf: new Date(),
typ: "JWT", exp:
}; expirationTime ||
new Date(
const encodedHeader = Buffer.from(JSON.stringify(header)).toString( Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
"base64", ),
); iat: new Date(),
const encodedData = Buffer.from(JSON.stringify(payloadData)) ctx: payload.ctx,
.toString("base64") });
.replace(/=/g, "");
const encodedSignature = Buffer.from(signature).toString("base64");
// Generate a JWT token with base64 encoded header, payload, and signature
const token = `${encodedHeader}.${encodedData}.${encodedSignature}`;
return token;
} }
/** /**
@@ -277,12 +296,7 @@ export class ThirdwebAuth {
const parsedOptions = AuthenticateOptionsSchema.parse(options); const parsedOptions = AuthenticateOptionsSchema.parse(options);
const domain = parsedOptions?.domain || this.domain; const domain = parsedOptions?.domain || this.domain;
const encodedPayload = token.split(".")[1]; const { payload, signature } = this.parseToken(token);
const encodedSignature = token.split(".")[2];
const payload: AuthenticationPayloadData = JSON.parse(
Buffer.from(encodedPayload, "base64").toString(),
);
const signature = Buffer.from(encodedSignature, "base64").toString();
// Check that the payload unique ID is valid // Check that the payload unique ID is valid
if (parsedOptions?.validateTokenId !== undefined) { if (parsedOptions?.validateTokenId !== undefined) {
@@ -350,6 +364,49 @@ export class ThirdwebAuth {
}; };
} }
public parseToken(token: string): AuthenticationPayload {
const encodedPayload = token.split(".")[1];
const encodedSignature = token.split(".")[2];
const payload: AuthenticationPayloadData = JSON.parse(
Buffer.from(encodedPayload, "base64").toString(),
);
const signature = Buffer.from(encodedSignature, "base64").toString();
return {
payload,
signature,
};
}
private async createToken(
payload: AuthenticationPayloadDataInput,
): Promise<string> {
const payloadData = AuthenticationPayloadDataSchema.parse(payload);
const message = JSON.stringify(payloadData);
const signature = await this.wallet.signMessage(message);
// Header used for JWT token specifying hash algorithm
const header = {
// Specify ECDSA with SHA-256 for hashing algorithm
alg: "ES256",
typ: "JWT",
};
const encodedHeader = Buffer.from(JSON.stringify(header)).toString(
"base64",
);
const encodedData = Buffer.from(JSON.stringify(payloadData))
.toString("base64")
.replace(/=/g, "");
const encodedSignature = Buffer.from(signature).toString("base64");
// Generate a JWT token with base64 encoded header, payload, and signature
const token = `${encodedHeader}.${encodedData}.${encodedSignature}`;
return token;
}
private async verifySignature( private async verifySignature(
message: string, message: string,
signature: string, signature: string,
+8
View File
@@ -34,6 +34,7 @@ const JsonSchema: z.ZodType<Json> = z.lazy(
export const LoginOptionsSchema = z export const LoginOptionsSchema = z
.object({ .object({
domain: z.string().optional(), domain: z.string().optional(),
address: z.string().optional(),
statement: z.string().optional(), statement: z.string().optional(),
uri: z.string().optional(), uri: z.string().optional(),
version: z.string().optional(), version: z.string().optional(),
@@ -179,6 +180,13 @@ export type AuthenticationPayloadData = z.output<
typeof AuthenticationPayloadDataSchema typeof AuthenticationPayloadDataSchema
>; >;
/**
* @internal
*/
export type AuthenticationPayloadDataInput = z.input<
typeof AuthenticationPayloadDataSchema
>;
/** /**
* @public * @public
*/ */
+34 -7
View File
@@ -1,24 +1,51 @@
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
import { Json } from "../../core/schema"; import { Json } from "../../core/schema";
import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types"; import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
import { Request } from "express"; import { Request } from "express";
function getToken(req: Request): string | undefined { export function getCookie(req: Request, cookie: string): string | undefined {
if (typeof req.cookies.get === "function") {
return req.cookies.get(cookie);
}
return req.cookies[cookie];
}
export function getActiveCookie(req: Request): string | undefined {
if (!req.cookies) {
return undefined;
}
const activeAccount = getCookie(req, THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE);
if (activeAccount) {
return `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${activeAccount}`;
}
// If active account is not present, then use the old default
return THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX;
}
export function getToken(req: Request): string | undefined {
if (req.headers["authorization"]) { if (req.headers["authorization"]) {
const authorizationHeader = req.headers["authorization"].split(" "); const authorizationHeader = req.headers["authorization"].split(" ");
if (authorizationHeader?.length === 2) { if (authorizationHeader?.length === 2) {
return authorizationHeader[1]; return authorizationHeader[1];
} }
}
if (!req.cookies) {
return undefined; return undefined;
} }
const cookie: string | undefined = !req.cookies const activeCookie = getActiveCookie(req);
? undefined if (!activeCookie) {
: typeof req.cookies.get === "function" return undefined;
? (req.cookies as any).get("thirdweb_auth_token") }
: (req.cookies as any).thirdweb_auth_token;
return cookie; return getCookie(req, activeCookie);
} }
export async function getUser< export async function getUser<
+16
View File
@@ -1,8 +1,10 @@
import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core"; import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core";
import { getUser } from "./helpers/user"; import { getUser } from "./helpers/user";
import payloadHandler from "./routes/payload";
import loginHandler from "./routes/login"; import loginHandler from "./routes/login";
import logoutHandler from "./routes/logout"; import logoutHandler from "./routes/logout";
import userHandler from "./routes/user"; import userHandler from "./routes/user";
import switchAccountHandler from "./routes/switch-account";
import { import {
ThirdwebAuthConfig, ThirdwebAuthConfig,
ThirdwebAuthContext, ThirdwebAuthContext,
@@ -47,6 +49,13 @@ export function ThirdwebAuth<
router.use(express.json()); router.use(express.json());
router.use(cookieMiddleware); router.use(cookieMiddleware);
router.post(
"/payload",
asyncHandler((req: Request, res: Response) =>
payloadHandler(req, res, ctx as ThirdwebAuthContext),
),
);
router.post( router.post(
"/login", "/login",
asyncHandler((req: Request, res: Response) => asyncHandler((req: Request, res: Response) =>
@@ -68,6 +77,13 @@ export function ThirdwebAuth<
), ),
); );
router.post(
"/switch-account",
asyncHandler((req: Request, res: Response) =>
switchAccountHandler(req, res, ctx as ThirdwebAuthContext),
),
);
return { return {
authRouter: router, authRouter: router,
authMiddleware: cookieMiddleware, authMiddleware: cookieMiddleware,
+24 -4
View File
@@ -1,3 +1,7 @@
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
import { GenerateOptions } from "../../core"; import { GenerateOptions } from "../../core";
import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types"; import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types";
import { serialize } from "cookie"; import { serialize } from "cookie";
@@ -64,18 +68,34 @@ export default async function handler(
} }
} }
const {
payload: { exp },
} = ctx.auth.parseToken(token);
// Securely set httpOnly cookie on request to prevent XSS on frontend // Securely set httpOnly cookie on request to prevent XSS on frontend
// And set path to / to enable thirdweb_auth_token usage on all endpoints // And set path to / to enable thirdweb_auth_token usage on all endpoints
res.setHeader( res.setHeader("Set-Cookie", [
"Set-Cookie", serialize(
serialize("thirdweb_auth_token", token, { `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${payload.payload.address}`,
token,
{
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(exp * 1000),
httpOnly: true,
secure: true,
},
),
serialize(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE, payload.payload.address, {
domain: ctx.cookieOptions?.domain, domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/", path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none", sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(exp * 1000),
httpOnly: true, httpOnly: true,
secure: true, secure: true,
}), }),
); ]);
// Send token in body and as cookie for frontend and backend use cases // Send token in body and as cookie for frontend and backend use cases
return res.status(200).json({ token }); return res.status(200).json({ token });
+9 -2
View File
@@ -1,4 +1,4 @@
import { getUser } from "../helpers/user"; import { getActiveCookie, getUser } from "../helpers/user";
import { ThirdwebAuthContext } from "../types"; import { ThirdwebAuthContext } from "../types";
import { serialize } from "cookie"; import { serialize } from "cookie";
import { Request, Response } from "express"; import { Request, Response } from "express";
@@ -14,6 +14,13 @@ export default async function handler(
}); });
} }
const activeCookie = getActiveCookie(req);
if (!activeCookie) {
return res.status(400).json({
error: "No logged in user to logout.",
});
}
if (ctx.callbacks?.onLogout) { if (ctx.callbacks?.onLogout) {
const user = await getUser(req, ctx); const user = await getUser(req, ctx);
if (user) { if (user) {
@@ -24,7 +31,7 @@ export default async function handler(
// Set the access token to 'none' and expire in 5 seconds // Set the access token to 'none' and expire in 5 seconds
res.setHeader( res.setHeader(
"Set-Cookie", "Set-Cookie",
serialize("thirdweb_auth_token", "", { serialize(activeCookie, "", {
domain: ctx.cookieOptions?.domain, domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/", path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none", sameSite: ctx.cookieOptions?.sameSite || "none",
@@ -0,0 +1,31 @@
import { Request, Response } from "express";
import { PayloadBodySchema, ThirdwebAuthContext } from "../types";
export default async function handler(
req: Request,
res: Response,
ctx: ThirdwebAuthContext,
) {
if (req.method !== "POST") {
return res.status(405).json({
error: "Invalid method. Only POST supported.",
});
}
const parsedPayload = PayloadBodySchema.safeParse(req.body);
if (!parsedPayload.success) {
return res.status(400).json({ error: "Please provide an address" });
}
// TODO: Add nonce generation + custom expiration + invalid before
const payload = await ctx.auth.payload({
address: parsedPayload.data.address,
statement: ctx.authOptions?.statement,
uri: ctx.authOptions?.uri,
version: ctx.authOptions?.version,
chainId: parsedPayload.data.chainId || ctx.authOptions?.chainId,
resources: ctx.authOptions?.resources,
});
return res.status(200).json({ payload });
}
@@ -0,0 +1,63 @@
import { Request, Response } from "express";
import { ActiveBodySchema, ThirdwebAuthContext } from "../types";
import { serialize } from "cookie";
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
import { getCookie } from "../helpers/user";
export default async function handler(
req: Request,
res: Response,
ctx: ThirdwebAuthContext,
) {
if (req.method !== "POST") {
return res.status(405).json({
error: "Invalid method. Only POST supported.",
});
}
const parsedPayload = ActiveBodySchema.safeParse(req.body);
if (!parsedPayload.success) {
return res.status(400).json({ error: "Please provide an address" });
}
let cookieExpiration: Date;
const cookie = getCookie(
req,
`${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${parsedPayload.data.address}`,
);
if (cookie) {
// If the new account is already logged in, get the expiration time from the cookie
const {
payload: { exp },
} = ctx.auth.parseToken(cookie);
cookieExpiration = new Date(exp * 1000);
} else if (ctx.authOptions?.tokenDurationInSeconds) {
// Otherwise, if we have a token duration in seconds, set it to that
cookieExpiration = new Date(
Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds,
);
} else {
// Otherwise, just default to 24 hours
cookieExpiration = new Date(
Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
);
}
res.setHeader("Set-Cookie", [
serialize(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE, parsedPayload.data.address, {
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: cookieExpiration,
httpOnly: true,
secure: true,
}),
]);
return res.status(200).end();
}
+56 -1
View File
@@ -1,6 +1,12 @@
import { getUser } from "../helpers/user"; import { serialize } from "cookie";
import { getToken, getUser } from "../helpers/user";
import { ThirdwebAuthContext } from "../types"; import { ThirdwebAuthContext } from "../types";
import { Request, Response } from "express"; import { Request, Response } from "express";
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
export default async function handler( export default async function handler(
req: Request, req: Request,
@@ -14,5 +20,54 @@ export default async function handler(
} }
const user = await getUser(req, ctx); const user = await getUser(req, ctx);
// Importantly, make sure the user was actually logged in before refreshing
if (user) {
const token = getToken(req);
if (token) {
const payload = ctx.auth.parseToken(token);
const refreshDate = ctx.authOptions?.refreshIntervalInSeconds
? new Date(
payload.payload.iat * 1000 +
ctx.authOptions.refreshIntervalInSeconds * 1000,
)
: new Date(
payload.payload.iat * 1000 +
THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS * 1000,
);
if (new Date() > refreshDate) {
const expirationTime = ctx.authOptions?.tokenDurationInSeconds
? new Date(Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds)
: undefined;
const refreshedToken = await ctx.auth.refresh(token, expirationTime);
const refreshedPayload = ctx.auth.parseToken(refreshedToken);
res.setHeader("Set-Cookie", [
serialize(
`${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${user.address}`,
refreshedToken,
{
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(refreshedPayload.payload.exp * 1000),
httpOnly: true,
secure: true,
},
),
serialize(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE, user.address, {
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(refreshedPayload.payload.exp * 1000),
httpOnly: true,
secure: true,
}),
]);
}
}
}
return res.status(200).json(user); return res.status(200).json(user);
} }
+10
View File
@@ -4,6 +4,15 @@ import type { GenericAuthWallet } from "@thirdweb-dev/wallets";
import { Request } from "express"; import { Request } from "express";
import { z } from "zod"; import { z } from "zod";
export const PayloadBodySchema = z.object({
address: z.string(),
chainId: z.string().optional(),
});
export const ActiveBodySchema = z.object({
address: z.string(),
});
export const LoginPayloadBodySchema = z.object({ export const LoginPayloadBodySchema = z.object({
payload: LoginPayloadOutputSchema, payload: LoginPayloadOutputSchema,
}); });
@@ -36,6 +45,7 @@ export type ThirdwebAuthConfig<
| ((tokenId: string) => void) | ((tokenId: string) => void)
| ((tokenId: string) => Promise<void>); | ((tokenId: string) => Promise<void>);
tokenDurationInSeconds?: number; tokenDurationInSeconds?: number;
refreshIntervalInSeconds?: number;
}; };
cookieOptions?: { cookieOptions?: {
domain?: string; domain?: string;
+39 -7
View File
@@ -1,9 +1,40 @@
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
import { Json } from "../../core/schema"; import { Json } from "../../core/schema";
import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types"; import { ThirdwebAuthContext, ThirdwebAuthUser } from "../types";
import { GetServerSidePropsContext, NextApiRequest } from "next"; import { GetServerSidePropsContext, NextApiRequest } from "next";
import { NextRequest } from "next/server"; import { NextRequest } from "next/server";
function getToken( export function getCookie(
req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
cookie: string,
): string | undefined {
if (typeof req.cookies.get === "function") {
return req.cookies.get(cookie);
}
return (req.cookies as any)[cookie];
}
export function getActiveCookie(
req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
): string | undefined {
if (!req.cookies) {
return undefined;
}
const activeAccount = getCookie(req, THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE);
if (activeAccount) {
return `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${activeAccount}`;
}
// If active account is not present, then use the old default
return THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX;
}
export function getToken(
req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest, req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
): string | undefined { ): string | undefined {
if (!!(req as NextApiRequest).headers["authorization"]) { if (!!(req as NextApiRequest).headers["authorization"]) {
@@ -13,17 +44,18 @@ function getToken(
if (authorizationHeader?.length === 2) { if (authorizationHeader?.length === 2) {
return authorizationHeader[1]; return authorizationHeader[1];
} }
}
if (!req.cookies) {
return undefined; return undefined;
} }
const cookie: string | undefined = !req.cookies const activeCookie = getActiveCookie(req);
? undefined if (!activeCookie) {
: typeof req.cookies.get === "function" return undefined;
? (req.cookies as any).get("thirdweb_auth_token") }
: (req.cookies as any).thirdweb_auth_token;
return cookie; return getCookie(req, activeCookie);
} }
export async function getUser< export async function getUser<
+6
View File
@@ -1,8 +1,10 @@
import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core"; import { Json, ThirdwebAuth as ThirdwebAuthSDK } from "../core";
import { getUser } from "./helpers/user"; import { getUser } from "./helpers/user";
import payloadHandler from "./routes/payload";
import loginHandler from "./routes/login"; import loginHandler from "./routes/login";
import logoutHandler from "./routes/logout"; import logoutHandler from "./routes/logout";
import userHandler from "./routes/user"; import userHandler from "./routes/user";
import switchAccountHandler from "./routes/switch-account";
import { import {
ThirdwebAuthConfig, ThirdwebAuthConfig,
ThirdwebAuthContext, ThirdwebAuthContext,
@@ -27,12 +29,16 @@ async function ThirdwebAuthRouter(
const action = thirdweb?.[0] as ThirdwebAuthRoute; const action = thirdweb?.[0] as ThirdwebAuthRoute;
switch (action) { switch (action) {
case "payload":
return await payloadHandler(req, res, ctx);
case "login": case "login":
return await loginHandler(req, res, ctx); return await loginHandler(req, res, ctx);
case "user": case "user":
return await userHandler(req, res, ctx); return await userHandler(req, res, ctx);
case "logout": case "logout":
return await logoutHandler(req, res, ctx); return await logoutHandler(req, res, ctx);
case "switch-account":
return await switchAccountHandler(req, res, ctx);
default: default:
return res.status(400).json({ return res.status(400).json({
message: "Invalid route for authentication.", message: "Invalid route for authentication.",
+24 -4
View File
@@ -1,3 +1,7 @@
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
import { GenerateOptions } from "../../core"; import { GenerateOptions } from "../../core";
import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types"; import { LoginPayloadBodySchema, ThirdwebAuthContext } from "../types";
import { serialize } from "cookie"; import { serialize } from "cookie";
@@ -64,18 +68,34 @@ export default async function handler(
} }
} }
const {
payload: { exp },
} = ctx.auth.parseToken(token);
// Securely set httpOnly cookie on request to prevent XSS on frontend // Securely set httpOnly cookie on request to prevent XSS on frontend
// And set path to / to enable thirdweb_auth_token usage on all endpoints // And set path to / to enable thirdweb_auth_token usage on all endpoints
res.setHeader( res.setHeader("Set-Cookie", [
"Set-Cookie", serialize(
serialize("thirdweb_auth_token", token, { `${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${payload.payload.address}`,
token,
{
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(exp * 1000),
httpOnly: true,
secure: true,
},
),
serialize(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE, payload.payload.address, {
domain: ctx.cookieOptions?.domain, domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/", path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none", sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(exp * 1000),
httpOnly: true, httpOnly: true,
secure: true, secure: true,
}), }),
); ]);
// Send token in body and as cookie for frontend and backend use cases // Send token in body and as cookie for frontend and backend use cases
return res.status(200).json({ token }); return res.status(200).json({ token });
+9 -2
View File
@@ -1,4 +1,4 @@
import { getUser } from "../helpers/user"; import { getActiveCookie, getUser } from "../helpers/user";
import { ThirdwebAuthContext } from "../types"; import { ThirdwebAuthContext } from "../types";
import { serialize } from "cookie"; import { serialize } from "cookie";
import { NextApiRequest, NextApiResponse } from "next"; import { NextApiRequest, NextApiResponse } from "next";
@@ -14,6 +14,13 @@ export default async function handler(
}); });
} }
const activeCookie = getActiveCookie(req);
if (!activeCookie) {
return res.status(400).json({
error: "No logged in user to logout.",
});
}
if (ctx.callbacks?.onLogout) { if (ctx.callbacks?.onLogout) {
const user = await getUser(req, ctx); const user = await getUser(req, ctx);
if (user) { if (user) {
@@ -24,7 +31,7 @@ export default async function handler(
// Set the access token to 'none' and expire in 5 seconds // Set the access token to 'none' and expire in 5 seconds
res.setHeader( res.setHeader(
"Set-Cookie", "Set-Cookie",
serialize("thirdweb_auth_token", "", { serialize(activeCookie, "", {
domain: ctx.cookieOptions?.domain, domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/", path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none", sameSite: ctx.cookieOptions?.sameSite || "none",
+31
View File
@@ -0,0 +1,31 @@
import { PayloadBodySchema, ThirdwebAuthContext } from "../types";
import { NextApiRequest, NextApiResponse } from "next";
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
ctx: ThirdwebAuthContext,
) {
if (req.method !== "POST") {
return res.status(405).json({
error: "Invalid method. Only POST supported.",
});
}
const parsedPayload = PayloadBodySchema.safeParse(req.body);
if (!parsedPayload.success) {
return res.status(400).json({ error: "Please provide an address" });
}
// TODO: Add nonce generation + custom expiration + invalid before
const payload = await ctx.auth.payload({
address: parsedPayload.data.address,
statement: ctx.authOptions?.statement,
uri: ctx.authOptions?.uri,
version: ctx.authOptions?.version,
chainId: parsedPayload.data.chainId || ctx.authOptions?.chainId,
resources: ctx.authOptions?.resources,
});
return res.status(200).json({ payload });
}
@@ -0,0 +1,63 @@
import { serialize } from "cookie";
import { getCookie } from "../helpers/user";
import { ActiveBodySchema, ThirdwebAuthContext } from "../types";
import { NextApiRequest, NextApiResponse } from "next";
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
export default async function handler(
req: NextApiRequest,
res: NextApiResponse,
ctx: ThirdwebAuthContext,
) {
if (req.method !== "POST") {
return res.status(405).json({
error: "Invalid method. Only POST supported.",
});
}
const parsedPayload = ActiveBodySchema.safeParse(req.body);
if (!parsedPayload.success) {
return res.status(400).json({ error: "Please provide an address" });
}
let cookieExpiration: Date;
const cookie = getCookie(
req,
`${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${parsedPayload.data.address}`,
);
if (cookie) {
// If the new account is already logged in, get the expiration time from the cookie
const {
payload: { exp },
} = ctx.auth.parseToken(cookie);
cookieExpiration = new Date(exp * 1000);
} else if (ctx.authOptions?.tokenDurationInSeconds) {
// Otherwise, if we have a token duration in seconds, set it to that
cookieExpiration = new Date(
Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds,
);
} else {
// Otherwise, just default to 24 hours
cookieExpiration = new Date(
Date.now() + 1000 * THIRDWEB_AUTH_DEFAULT_TOKEN_DURATION_IN_SECONDS,
);
}
res.setHeader("Set-Cookie", [
serialize(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE, parsedPayload.data.address, {
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: cookieExpiration,
httpOnly: true,
secure: true,
}),
]);
return res.status(200).end();
}
+56 -1
View File
@@ -1,4 +1,10 @@
import { getUser } from "../helpers/user"; import { serialize } from "cookie";
import {
THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE,
THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS,
THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX,
} from "../../constants";
import { getToken, getUser } from "../helpers/user";
import { ThirdwebAuthContext } from "../types"; import { ThirdwebAuthContext } from "../types";
import { NextApiRequest, NextApiResponse } from "next"; import { NextApiRequest, NextApiResponse } from "next";
@@ -14,5 +20,54 @@ export default async function handler(
} }
const user = await getUser(req, ctx); const user = await getUser(req, ctx);
// Importantly, make sure the user was actually logged in before refreshing
if (user) {
const token = getToken(req);
if (token) {
const payload = ctx.auth.parseToken(token);
const refreshDate = ctx.authOptions?.refreshIntervalInSeconds
? new Date(
payload.payload.iat * 1000 +
ctx.authOptions.refreshIntervalInSeconds * 1000,
)
: new Date(
payload.payload.iat * 1000 +
THIRDWEB_AUTH_DEFAULT_REFRESH_INTERVAL_IN_SECONDS * 1000,
);
if (new Date() > refreshDate) {
const expirationTime = ctx.authOptions?.tokenDurationInSeconds
? new Date(Date.now() + 1000 * ctx.authOptions.tokenDurationInSeconds)
: undefined;
const refreshedToken = await ctx.auth.refresh(token, expirationTime);
const refreshedPayload = ctx.auth.parseToken(refreshedToken);
res.setHeader("Set-Cookie", [
serialize(
`${THIRDWEB_AUTH_TOKEN_COOKIE_PREFIX}_${user.address}`,
refreshedToken,
{
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(refreshedPayload.payload.exp * 1000),
httpOnly: true,
secure: true,
},
),
serialize(THIRDWEB_AUTH_ACTIVE_ACCOUNT_COOKIE, user.address, {
domain: ctx.cookieOptions?.domain,
path: ctx.cookieOptions?.path || "/",
sameSite: ctx.cookieOptions?.sameSite || "none",
expires: new Date(refreshedPayload.payload.exp * 1000),
httpOnly: true,
secure: true,
}),
]);
}
}
}
return res.status(200).json(user); return res.status(200).json(user);
} }
+16 -1
View File
@@ -5,6 +5,15 @@ import { GetServerSidePropsContext, NextApiRequest } from "next";
import { NextRequest } from "next/server"; import { NextRequest } from "next/server";
import { z } from "zod"; import { z } from "zod";
export const PayloadBodySchema = z.object({
address: z.string(),
chainId: z.string().optional(),
});
export const ActiveBodySchema = z.object({
address: z.string(),
});
export const LoginPayloadBodySchema = z.object({ export const LoginPayloadBodySchema = z.object({
payload: LoginPayloadOutputSchema, payload: LoginPayloadOutputSchema,
}); });
@@ -14,7 +23,12 @@ type RequestType =
| NextRequest | NextRequest
| NextApiRequest; | NextApiRequest;
export type ThirdwebAuthRoute = "login" | "logout" | "user"; export type ThirdwebAuthRoute =
| "payload"
| "login"
| "logout"
| "user"
| "switch-account";
export type ThirdwebAuthUser< export type ThirdwebAuthUser<
TData extends Json = Json, TData extends Json = Json,
@@ -42,6 +56,7 @@ export type ThirdwebAuthConfig<
| ((tokenId: string) => void) | ((tokenId: string) => void)
| ((tokenId: string) => Promise<void>); | ((tokenId: string) => Promise<void>);
tokenDurationInSeconds?: number; tokenDurationInSeconds?: number;
refreshIntervalInSeconds?: number;
}; };
cookieOptions?: { cookieOptions?: {
domain?: string; domain?: string;
+22
View File
@@ -1,5 +1,27 @@
# @thirdweb-dev/chains # @thirdweb-dev/chains
## 0.1.22
### Patch Changes
- [#1192](https://github.com/thirdweb-dev/js/pull/1192) [`f41f1a29`](https://github.com/thirdweb-dev/js/commit/f41f1a2958a2cedcf0496c9a3ca284d0b98f1b89) Thanks [@jnsdls](https://github.com/jnsdls)! - fix arbitrum goerli infura url
## 0.1.21
### Patch Changes
- [#1074](https://github.com/thirdweb-dev/js/pull/1074) [`cc20f93e`](https://github.com/thirdweb-dev/js/commit/cc20f93e178d86ee2b3f39102bbb0811de211f05) Thanks [@Marfuen](https://github.com/Marfuen)! - Enhance CLI Install command and update chains
- [#1185](https://github.com/thirdweb-dev/js/pull/1185) [`8e28b0f5`](https://github.com/thirdweb-dev/js/commit/8e28b0f5e75596d29273ed80269bcee6d209adb4) Thanks [@jnsdls](https://github.com/jnsdls)! - add Zora Mainnet
## 0.1.20
### Patch Changes
- [#1140](https://github.com/thirdweb-dev/js/pull/1140) [`16232de9`](https://github.com/thirdweb-dev/js/commit/16232de9eab9966e24e335929b2a3919346af265) Thanks [@kumaryash90](https://github.com/kumaryash90)! - Update chains
- [#1138](https://github.com/thirdweb-dev/js/pull/1138) [`645b0303`](https://github.com/thirdweb-dev/js/commit/645b0303cc1a9cbb0a0e9cbd67d11c3b865e4584) Thanks [@jcstein](https://github.com/jcstein)! - feat: create Taro Testnet
## 0.1.19 ## 0.1.19
### Patch Changes ### Patch Changes
+40
View File
@@ -0,0 +1,40 @@
import type { Chain } from "../src/types";
export default {
"name": "Siberium Test Network",
"chain": "SBR",
"rpc": [
"https://siberium-test-network.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.test.siberium.net"
],
"faucets": [],
"nativeCurrency": {
"name": "TestSIBR",
"symbol": "SIBR",
"decimals": 18
},
"infoURL": "https://siberium.net",
"shortName": "testsbr",
"chainId": 111000,
"networkId": 111000,
"icon": {
"url": "ipfs://QmYeMdWDZ1iaBFeSPorRyPi7RuSXTdDKTgW3rfnUf3W5ne",
"width": 512,
"height": 512,
"format": "svg"
},
"explorers": [
{
"name": "Siberium Testnet Explorer - blockscout",
"url": "https://explorer.test.siberium.net",
"icon": {
"url": "ipfs://QmYeMdWDZ1iaBFeSPorRyPi7RuSXTdDKTgW3rfnUf3W5ne",
"width": 512,
"height": 512,
"format": "svg"
},
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "siberium-test-network"
} as const satisfies Chain;
+34
View File
@@ -0,0 +1,34 @@
import type { Chain } from "../src/types";
export default {
"name": "SatoshiChain Mainnet",
"chain": "SATS",
"icon": {
"url": "ipfs://QmRegpZQBW4o1imYNsW3d27MQjygBSU23Gf6JKje26nvs7",
"width": 1251,
"height": 1251,
"format": "png"
},
"rpc": [
"https://satoshichain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://mainnet-rpc.satoshichain.io"
],
"faucets": [],
"nativeCurrency": {
"name": "SatoshiChain Coin",
"symbol": "SATS",
"decimals": 18
},
"infoURL": "https://satoshichain.net",
"shortName": "sats",
"chainId": 12009,
"networkId": 12009,
"explorers": [
{
"name": "SatoshiChain Explorer",
"url": "https://satoshiscan.io",
"standard": "EIP3091"
}
],
"testnet": false,
"slug": "satoshichain"
} as const satisfies Chain;
+28
View File
@@ -0,0 +1,28 @@
import type { Chain } from "../src/types";
export default {
"name": "Living Assets Mainnet",
"chain": "LAS",
"icon": {
"url": "ipfs://QmRidubY7BVwC737BQwGEttenP1npAXN7ZNryktE416uUW",
"width": 500,
"height": 500,
"format": "jpg"
},
"rpc": [
"https://living-assets.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://beta.mainnet.livingassets.io/rpc",
"https://gamma.mainnet.livingassets.io/rpc"
],
"faucets": [],
"nativeCurrency": {
"name": "LAS",
"symbol": "LAS",
"decimals": 18
},
"infoURL": "https://dev.livingassets.io/",
"shortName": "LAS",
"chainId": 1440,
"networkId": 1440,
"testnet": false,
"slug": "living-assets"
} as const satisfies Chain;
+29
View File
@@ -0,0 +1,29 @@
import type { Chain } from "../src/types";
export default {
"name": "ChainX-EVM",
"chain": "ChainX",
"rpc": [
"https://chainx-evm.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://mainnet.chainx.org/rpc",
"https://mainnet2.chainx.org/rpc"
],
"faucets": [],
"nativeCurrency": {
"name": "BTC",
"symbol": "BTC",
"decimals": 18
},
"infoURL": "https://chainx.org",
"shortName": "chainx",
"chainId": 1501,
"networkId": 1501,
"explorers": [
{
"name": "chainx-evm scan",
"url": "https://evm.chainx.org",
"standard": "none"
}
],
"testnet": false,
"slug": "chainx-evm"
} as const satisfies Chain;
+36
View File
@@ -0,0 +1,36 @@
import type { Chain } from "../src/types";
export default {
"name": "Taro Testnet",
"chain": "gETH",
"shortName": "Taro",
"chainId": 1582,
"testnet": true,
"icon": {
"format": "svg",
"url": "ipfs://bafybeibfpls2ealp4e5fdeoxessfjjkldgjnrcx2erph7524pg7alskk6a/1f9cb.svg",
"width": 512,
"height": 512
},
"rpc": [
"https://taro-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://taro-testnet.calderachain.xyz/http"
],
"nativeCurrency": {
"decimals": 18,
"name": "Ether",
"symbol": "gETH"
},
"explorers": [
{
"url": "https://explorer.tarotestnet.com",
"name": "Taro Testnet Explorer",
"standard": "EIP3091"
}
],
"faucets": [
"https://tarotestnet.com"
],
"infoURL": "https://tarotestnet.com",
"networkId": 1582,
"slug": "taro-testnet"
} as const satisfies Chain;
+33
View File
@@ -0,0 +1,33 @@
import type { Chain } from "../src/types";
export default {
"name": "Omni Testnet 1",
"chain": "Omni",
"rpc": [
"https://omni-testnet-1.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://testnet-1.omni.network"
],
"features": [
{
"name": "EIP155"
}
],
"faucets": [],
"nativeCurrency": {
"name": "Omni",
"symbol": "OMNI",
"decimals": 18
},
"infoURL": "https://docs.omni.network/",
"shortName": "omni_testnet",
"chainId": 165,
"networkId": 165,
"explorers": [
{
"name": "Omni Explorer",
"url": "https://testnet-1.explorer.omni.network",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "omni-testnet-1"
} as const satisfies Chain;
-34
View File
@@ -1,34 +0,0 @@
import type { Chain } from "../src/types";
export default {
"name": "Taiko (Alpha-2 Testnet)",
"chain": "ETH",
"icon": {
"url": "ipfs://QmWMUDmNHzCtism9dYK1JooerZJ4da6kGt67HAQmLiEykc",
"width": 1001,
"height": 1001,
"format": "png"
},
"rpc": [
"https://taiko-alpha-2-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.a2.taiko.xyz"
],
"faucets": [],
"nativeCurrency": {
"name": "Ether",
"symbol": "ETH",
"decimals": 18
},
"infoURL": "https://taiko.xyz",
"shortName": "taiko-a2",
"chainId": 167004,
"networkId": 167004,
"explorers": [
{
"name": "blockscout",
"url": "https://explorer.a2.taiko.xyz",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "taiko-alpha-2-testnet"
} as const satisfies Chain;
+35
View File
@@ -0,0 +1,35 @@
import type { Chain } from "../src/types";
export default {
"name": "Taiko (Alpha-3 Testnet)",
"chain": "ETH",
"status": "active",
"icon": {
"url": "ipfs://QmcHdmVr5VRUJq13jnM6tgah5Ge7hn3Dm14eY6vwivJ5ui",
"width": 288,
"height": 258,
"format": "png"
},
"rpc": [
"https://taiko-alpha-3-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.test.taiko.xyz"
],
"faucets": [],
"nativeCurrency": {
"name": "Ether",
"symbol": "ETH",
"decimals": 18
},
"infoURL": "https://taiko.xyz",
"shortName": "taiko-a3",
"chainId": 167005,
"networkId": 167005,
"explorers": [
{
"name": "blockscout",
"url": "https://explorer.test.taiko.xyz",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "taiko-alpha-3-testnet"
} as const satisfies Chain;
+21
View File
@@ -0,0 +1,21 @@
import type { Chain } from "../src/types";
export default {
"name": "Shrapnel Subnet",
"chain": "shrapnel",
"rpc": [
"https://shrapnel-subnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://subnets.avax.network/shrapnel/mainnet/rpc"
],
"faucets": [],
"nativeCurrency": {
"name": "Shrapnel Gas Token",
"symbol": "SHRAPG",
"decimals": 18
},
"infoURL": "https://www.shrapnel.com/",
"shortName": "Shrapnel",
"chainId": 2044,
"networkId": 2044,
"testnet": false,
"slug": "shrapnel-subnet"
} as const satisfies Chain;
+2 -2
View File
@@ -19,8 +19,8 @@ export default {
"networkId": 1, "networkId": 1,
"icon": { "icon": {
"url": "ipfs://QmT7PSXBiVBma6E15hNkivmstqLu3JSnG1jXN5pTmcCGRC", "url": "ipfs://QmT7PSXBiVBma6E15hNkivmstqLu3JSnG1jXN5pTmcCGRC",
"width": 200, "width": 180,
"height": 200, "height": 180,
"format": "png" "format": "png"
}, },
"explorers": [ "explorers": [
-12
View File
@@ -2,12 +2,6 @@ import type { Chain } from "../src/types";
export default { export default {
"name": "Metaplayerone Dubai Testnet", "name": "Metaplayerone Dubai Testnet",
"chain": "MP1 Dubai-Testnet", "chain": "MP1 Dubai-Testnet",
"icon": {
"url": "ipfs://QmfJKxmubJrqYWDcR2PnPvmpukxPz4fYDu3hqTaSnpJDxC",
"width": 42,
"height": 23,
"format": "svg"
},
"rpc": [ "rpc": [
"https://metaplayerone-dubai-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://metaplayerone-dubai-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc-dubai.mp1network.com/" "https://rpc-dubai.mp1network.com/"
@@ -26,12 +20,6 @@ export default {
{ {
"name": "MP1Scan", "name": "MP1Scan",
"url": "https://dubai.mp1scan.io", "url": "https://dubai.mp1scan.io",
"icon": {
"url": "ipfs://QmfJKxmubJrqYWDcR2PnPvmpukxPz4fYDu3hqTaSnpJDxC",
"width": 42,
"height": 23,
"format": "svg"
},
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
+2 -2
View File
@@ -21,8 +21,8 @@ export default {
"networkId": 1, "networkId": 1,
"icon": { "icon": {
"url": "ipfs://QmT7PSXBiVBma6E15hNkivmstqLu3JSnG1jXN5pTmcCGRC", "url": "ipfs://QmT7PSXBiVBma6E15hNkivmstqLu3JSnG1jXN5pTmcCGRC",
"width": 200, "width": 180,
"height": 200, "height": 180,
"format": "png" "format": "png"
}, },
"explorers": [ "explorers": [
+36
View File
@@ -0,0 +1,36 @@
import type { Chain } from "../src/types";
export default {
"name": "WhiteBIT Network Testnet",
"chain": "WBT",
"rpc": [
"https://whitebit-network-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc-testnet.whitebit.network"
],
"faucets": [
"https://explorer.whitebit.network/testnet/faucet"
],
"nativeCurrency": {
"name": "WhiteBIT Coin",
"symbol": "WBT",
"decimals": 18
},
"infoURL": "https://whitebit.com/wbt",
"shortName": "twbt",
"chainId": 2625,
"networkId": 2625,
"icon": {
"url": "ipfs://QmQqAAn2F98TH5ouRyvReKxQdaGKjE7WJQPEPW6mFFVXUT",
"width": 32,
"height": 32,
"format": "svg"
},
"explorers": [
{
"name": "wb-explorer-testnet",
"url": "https://explorer.whitebit.network/testnet",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "whitebit-network-testnet"
} as const satisfies Chain;
+2 -1
View File
@@ -11,7 +11,8 @@ export default {
"rpc": [ "rpc": [
"https://lachain-lachain.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://lachain-lachain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc1.mainnet.lachain.network", "https://rpc1.mainnet.lachain.network",
"https://rpc2.mainnet.lachain.network" "https://rpc2.mainnet.lachain.network",
"https://lachain.rpc-nodes.cedalio.dev"
], ],
"faucets": [], "faucets": [],
"nativeCurrency": { "nativeCurrency": {
-12
View File
@@ -24,22 +24,10 @@ export default {
"shortName": "ncnt", "shortName": "ncnt",
"chainId": 303, "chainId": 303,
"networkId": 303, "networkId": 303,
"icon": {
"url": "ipfs://Qmc9zDWXar67cMUodp28mbN5pnwbVibxGXhwa8YCDvxmTR",
"width": 62,
"height": 59,
"format": "svg"
},
"explorers": [ "explorers": [
{ {
"name": "neuroscan", "name": "neuroscan",
"url": "https://testnet.ncnscan.com", "url": "https://testnet.ncnscan.com",
"icon": {
"url": "ipfs://Qmc9zDWXar67cMUodp28mbN5pnwbVibxGXhwa8YCDvxmTR",
"width": 62,
"height": 59,
"format": "svg"
},
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
-12
View File
@@ -25,22 +25,10 @@ export default {
"shortName": "ncn", "shortName": "ncn",
"chainId": 313, "chainId": 313,
"networkId": 313, "networkId": 313,
"icon": {
"url": "ipfs://Qmc9zDWXar67cMUodp28mbN5pnwbVibxGXhwa8YCDvxmTR",
"width": 62,
"height": 59,
"format": "svg"
},
"explorers": [ "explorers": [
{ {
"name": "neuroscan", "name": "neuroscan",
"url": "https://ncnscan.com", "url": "https://ncnscan.com",
"icon": {
"url": "ipfs://Qmc9zDWXar67cMUodp28mbN5pnwbVibxGXhwa8YCDvxmTR",
"width": 62,
"height": 59,
"format": "svg"
},
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
-59
View File
@@ -1,59 +0,0 @@
import type { Chain } from "../src/types";
export default {
"name": "Filecoin - Hyperspace testnet",
"chain": "FIL",
"icon": {
"url": "ipfs://QmS9r9XQkMHVomWcSBNDkKkz9n87h9bH9ssabeiKZtANoU",
"width": 1000,
"height": 1000,
"format": "png"
},
"rpc": [
"https://filecoin-hyperspace-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://api.hyperspace.node.glif.io/rpc/v1",
"https://rpc.ankr.com/filecoin_testnet",
"https://filecoin-hyperspace.chainstacklabs.com/rpc/v1"
],
"faucets": [
"https://hyperspace.yoga/#faucet"
],
"nativeCurrency": {
"name": "testnet filecoin",
"symbol": "tFIL",
"decimals": 18
},
"infoURL": "https://filecoin.io",
"shortName": "filecoin-hyperspace",
"chainId": 3141,
"networkId": 3141,
"slip44": 1,
"explorers": [
{
"name": "Filfox - Hyperspace",
"url": "https://hyperspace.filfox.info/en",
"standard": "none"
},
{
"name": "Glif Explorer - Hyperspace",
"url": "https://explorer.glif.io/?network=hyperspace",
"standard": "none"
},
{
"name": "Beryx",
"url": "https://beryx.zondax.ch",
"standard": "none"
},
{
"name": "Dev.storage",
"url": "https://dev.storage",
"standard": "none"
},
{
"name": "Filscan - Hyperspace",
"url": "https://hyperspace.filscan.io",
"standard": "none"
}
],
"testnet": true,
"slug": "filecoin-hyperspace-testnet"
} as const satisfies Chain;
-31
View File
@@ -1,31 +0,0 @@
import type { Chain } from "../src/types";
export default {
"name": "Filecoin - Wallaby testnet",
"chain": "FIL",
"icon": {
"url": "ipfs://QmS9r9XQkMHVomWcSBNDkKkz9n87h9bH9ssabeiKZtANoU",
"width": 1000,
"height": 1000,
"format": "png"
},
"rpc": [
"https://filecoin-wallaby-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://wallaby.node.glif.io/rpc/v1"
],
"faucets": [
"https://wallaby.yoga/#faucet"
],
"nativeCurrency": {
"name": "testnet filecoin",
"symbol": "tFIL",
"decimals": 18
},
"infoURL": "https://filecoin.io",
"shortName": "filecoin-wallaby",
"chainId": 31415,
"networkId": 31415,
"slip44": 1,
"explorers": [],
"testnet": true,
"slug": "filecoin-wallaby-testnet"
} as const satisfies Chain;
+14 -1
View File
@@ -10,7 +10,10 @@ export default {
}, },
"rpc": [ "rpc": [
"https://filecoin-calibration-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://filecoin-calibration-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://api.calibration.node.glif.io/rpc/v1" "https://api.calibration.node.glif.io/rpc/v1",
"https://rpc.ankr.com/filecoin_testnet",
"https://filecoin-calibration.chainstacklabs.com/rpc/v1",
"https://filecoin-calibration.chainup.net/rpc/v1"
], ],
"faucets": [ "faucets": [
"https://faucet.calibration.fildev.network/" "https://faucet.calibration.fildev.network/"
@@ -40,6 +43,16 @@ export default {
"name": "Filfox - Calibration", "name": "Filfox - Calibration",
"url": "https://calibration.filfox.info", "url": "https://calibration.filfox.info",
"standard": "none" "standard": "none"
},
{
"name": "Glif Explorer - Calibration",
"url": "https://explorer.glif.io/?network=calibration",
"standard": "none"
},
{
"name": "Beryx",
"url": "https://beryx.zondax.ch",
"standard": "none"
} }
], ],
"testnet": true, "testnet": true,
+48
View File
@@ -0,0 +1,48 @@
import type { Chain } from "../src/types";
export default {
"name": "Aves Testnet",
"chain": "AVST",
"rpc": [
"https://aves-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://test.rpc.avescoin.io"
],
"faucets": [],
"nativeCurrency": {
"name": "AvesT",
"symbol": "AVST",
"decimals": 18
},
"features": [
{
"name": "EIP155"
},
{
"name": "EIP1559"
}
],
"infoURL": "https://ethereum.org",
"shortName": "avst",
"chainId": 333331,
"networkId": 333331,
"icon": {
"url": "ipfs://QmeKQVv2QneHaaggw2NfpZ7DGMdjVhPywTdse5RzCs4oGn",
"width": 232,
"height": 232,
"format": "png"
},
"explorers": [
{
"name": "avescan",
"url": "https://testnet.avescoin.io",
"icon": {
"url": "ipfs://QmeKQVv2QneHaaggw2NfpZ7DGMdjVhPywTdse5RzCs4oGn",
"width": 232,
"height": 232,
"format": "png"
},
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "aves-testnet"
} as const satisfies Chain;
+9 -9
View File
@@ -1,10 +1,10 @@
import type { Chain } from "../src/types"; import type { Chain } from "../src/types";
export default { export default {
"name": "Metacodechain", "name": "Jouleverse Mainnet",
"chain": "metacode", "chain": "Jouleverse",
"rpc": [ "rpc": [
"https://metacodechain.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://jouleverse.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://j.blockcoach.com:8503" "https://rpc.jnsdao.com:8503"
], ],
"faucets": [], "faucets": [],
"nativeCurrency": { "nativeCurrency": {
@@ -12,17 +12,17 @@ export default {
"symbol": "J", "symbol": "J",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://j.blockcoach.com:8089", "infoURL": "https://jnsdao.com",
"shortName": "metacode", "shortName": "jouleverse",
"chainId": 3666, "chainId": 3666,
"networkId": 3666, "networkId": 3666,
"explorers": [ "explorers": [
{ {
"name": "meta", "name": "jscan",
"url": "https://j.blockcoach.com:8089", "url": "https://jscan.jnsdao.com",
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
"testnet": false, "testnet": false,
"slug": "metacodechain" "slug": "jouleverse"
} as const satisfies Chain; } as const satisfies Chain;
+34
View File
@@ -0,0 +1,34 @@
import type { Chain } from "../src/types";
export default {
"name": "Ozone Chain Mainnet",
"chain": "OZONE",
"rpc": [
"https://ozone-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://node1.ozonechain.io"
],
"faucets": [],
"nativeCurrency": {
"name": "OZONE",
"symbol": "OZO",
"decimals": 18
},
"infoURL": "https://ozonechain.io",
"shortName": "ozo",
"chainId": 4000,
"networkId": 4000,
"icon": {
"url": "ipfs://QmbM4weV8Bk6c9yNhosYntkVw39SNZtCHYGgWyXTxkevZ8",
"width": 1600,
"height": 1600,
"format": "png"
},
"explorers": [
{
"name": "OZONE Scan",
"url": "https://ozonescan.io",
"standard": "EIP3091"
}
],
"testnet": false,
"slug": "ozone-chain"
} as const satisfies Chain;
+34
View File
@@ -0,0 +1,34 @@
import type { Chain } from "../src/types";
export default {
"name": "Ozone Chain Testnet",
"chain": "OZONE",
"rpc": [
"https://ozone-chain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://node1.testnet.ozonechain.io"
],
"faucets": [],
"nativeCurrency": {
"name": "OZONE",
"symbol": "OZO",
"decimals": 18
},
"infoURL": "https://ozonechain.io",
"shortName": "ozo_tst",
"chainId": 401,
"networkId": 401,
"icon": {
"url": "ipfs://QmbM4weV8Bk6c9yNhosYntkVw39SNZtCHYGgWyXTxkevZ8",
"width": 1600,
"height": 1600,
"format": "png"
},
"explorers": [
{
"name": "OZONE Scan",
"url": "https://testnet.ozonescan.io",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "ozone-chain-testnet"
} as const satisfies Chain;
+2 -1
View File
@@ -10,7 +10,8 @@ export default {
}, },
"rpc": [ "rpc": [
"https://latestnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://latestnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.testnet.lachain.network" "https://rpc.testnet.lachain.network",
"https://lachain-testnet.rpc-nodes.cedalio.dev"
], ],
"faucets": [ "faucets": [
"https://faucet.lachain.network" "https://faucet.lachain.network"
+31 -22
View File
@@ -1,37 +1,46 @@
import type { Chain } from "../src/types"; import type { Chain } from "../src/types";
export default { export default {
"name": "Kovan", "name": "LUKSO Mainnet",
"title": "Ethereum Testnet Kovan", "chain": "LUKSO",
"chain": "ETH", "icon": {
"url": "ipfs://Qmeg9sFF5tAGi6MCx7YjtVHW6a23zqvHRK1xwzSdp9iE7z",
"width": 512,
"height": 512,
"format": "png"
},
"rpc": [ "rpc": [
"https://kovan.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://lukso.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://kovan.poa.network", "https://rpc.mainnet.lukso.network",
"http://kovan.poa.network:8545", "wss://ws-rpc.mainnet.lukso.network"
"https://kovan.infura.io/v3/${INFURA_API_KEY}",
"wss://kovan.infura.io/ws/v3/${INFURA_API_KEY}",
"ws://kovan.poa.network:8546"
],
"faucets": [
"http://fauceth.komputing.org?chain=42&address=${ADDRESS}",
"https://faucet.kovan.network",
"https://gitter.im/kovan-testnet/faucet"
], ],
"faucets": [],
"nativeCurrency": { "nativeCurrency": {
"name": "Kovan Ether", "name": "LUKSO",
"symbol": "ETH", "symbol": "LYX",
"decimals": 18 "decimals": 18
}, },
"explorers": [ "explorers": [
{ {
"name": "etherscan", "name": "Blockscout",
"url": "https://kovan.etherscan.io", "url": "https://explorer.execution.mainnet.lukso.network",
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
"infoURL": "https://kovan-testnet.github.io/website", "infoURL": "https://lukso.network",
"shortName": "kov", "shortName": "lukso",
"chainId": 42, "chainId": 42,
"networkId": 42, "networkId": 42,
"testnet": true, "features": [
"slug": "kovan" {
"name": "EIP155"
},
{
"name": "EIP1559"
}
],
"redFlags": [
"reusedChainId"
],
"testnet": false,
"slug": "lukso"
} as const satisfies Chain; } as const satisfies Chain;
+45
View File
@@ -0,0 +1,45 @@
import type { Chain } from "../src/types";
export default {
"name": "LUKSO Testnet",
"chain": "LUKSO Testnet",
"icon": {
"url": "ipfs://Qmeg9sFF5tAGi6MCx7YjtVHW6a23zqvHRK1xwzSdp9iE7z",
"width": 512,
"height": 512,
"format": "png"
},
"rpc": [
"https://lukso-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.testnet.lukso.network",
"wss://ws-rpc.testnet.lukso.network"
],
"faucets": [
"https://faucet.testnet.lukso.network"
],
"nativeCurrency": {
"name": "TestLYX",
"symbol": "LYXt",
"decimals": 18
},
"explorers": [
{
"name": "Blockscout",
"url": "https://explorer.execution.testnet.lukso.network",
"standard": "none"
}
],
"infoURL": "https://lukso.network",
"shortName": "lukso-testnet",
"chainId": 4201,
"networkId": 4201,
"features": [
{
"name": "EIP155"
},
{
"name": "EIP1559"
}
],
"testnet": true,
"slug": "lukso-testnet"
} as const satisfies Chain;
+1 -1
View File
@@ -14,7 +14,7 @@ export default {
"rpc": [ "rpc": [
"https://arbitrum-goerli.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://arbitrum-goerli.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://arb-goerli.g.alchemy.com/v2/${ALCHEMY_API_KEY}", "https://arb-goerli.g.alchemy.com/v2/${ALCHEMY_API_KEY}",
"https://abritrum-goerli.infura.io/v3/${INFURA_API_KEY}", "https://arbitrum-goerli.infura.io/v3/${INFURA_API_KEY}",
"https://goerli-rollup.arbitrum.io/rpc/" "https://goerli-rollup.arbitrum.io/rpc/"
], ],
"faucets": [], "faucets": [],
+21
View File
@@ -0,0 +1,21 @@
import type { Chain } from "../src/types";
export default {
"name": "Patex Sepolia Testnet",
"chain": "ETH",
"rpc": [
"https://patex-sepolia-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://test-rpc.patex.io/"
],
"faucets": [],
"nativeCurrency": {
"name": "Sepolia Ether",
"symbol": "ETH",
"decimals": 18
},
"infoURL": "https://patex.io/",
"shortName": "psep",
"chainId": 471100,
"networkId": 471100,
"testnet": true,
"slug": "patex-sepolia-testnet"
} as const satisfies Chain;
+1 -1
View File
@@ -12,7 +12,7 @@ export default {
"rpc": [ "rpc": [
"https://wireshape-floripa-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://wireshape-floripa-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc-floripa.wireshape.org", "https://rpc-floripa.wireshape.org",
"https://floripa.rpc.thirdweb.com" "https://wireshape-floripa-testnet.rpc.thirdweb.com"
], ],
"faucets": [], "faucets": [],
"nativeCurrency": { "nativeCurrency": {
+2 -2
View File
@@ -8,8 +8,8 @@ export default {
], ],
"faucets": [], "faucets": [],
"nativeCurrency": { "nativeCurrency": {
"name": "BitDAO", "name": "Mantle",
"symbol": "BIT", "symbol": "MNT",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://mantle.xyz", "infoURL": "https://mantle.xyz",
+2 -2
View File
@@ -10,8 +10,8 @@ export default {
"https://faucet.testnet.mantle.xyz" "https://faucet.testnet.mantle.xyz"
], ],
"nativeCurrency": { "nativeCurrency": {
"name": "Testnet BitDAO", "name": "Testnet Mantle",
"symbol": "BIT", "symbol": "MNT",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://mantle.xyz", "infoURL": "https://mantle.xyz",
+29
View File
@@ -0,0 +1,29 @@
import type { Chain } from "../src/types";
export default {
"name": "Titan",
"chain": "ETH",
"rpc": [
"https://titan.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.titan.tokamak.network",
"wss://rpc.titan.tokamak.network/ws"
],
"faucets": [],
"nativeCurrency": {
"name": "Ether",
"symbol": "ETH",
"decimals": 18
},
"infoURL": "https://tokamak.network",
"shortName": "teth",
"chainId": 55004,
"networkId": 55004,
"explorers": [
{
"name": "blockscout",
"url": "https://explorer.titan.tokamak.network",
"standard": "EIP3091"
}
],
"testnet": false,
"slug": "titan"
} as const satisfies Chain;
+2
View File
@@ -5,6 +5,8 @@ export default {
"rpc": [ "rpc": [
"https://syscoin.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://syscoin.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.syscoin.org", "https://rpc.syscoin.org",
"https://rpc.ankr.com/syscoin/${ANKR_API_KEY}",
"https://syscoin.public-rpc.com",
"wss://rpc.syscoin.org/wss" "wss://rpc.syscoin.org/wss"
], ],
"faucets": [ "faucets": [
+31
View File
@@ -0,0 +1,31 @@
import type { Chain } from "../src/types";
export default {
"name": "Rollux Mainnet",
"chain": "SYS",
"rpc": [
"https://rollux.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.rollux.com",
"wss://rpc.rollux.com/wss"
],
"faucets": [
"https://rollux.id/faucetapp"
],
"nativeCurrency": {
"name": "Syscoin",
"symbol": "SYS",
"decimals": 18
},
"infoURL": "https://rollux.com",
"shortName": "sys-rollux",
"chainId": 570,
"networkId": 570,
"explorers": [
{
"name": "Rollux Explorer",
"url": "https://explorer.rollux.com",
"standard": "EIP3091"
}
],
"testnet": false,
"slug": "rollux"
} as const satisfies Chain;
+11 -8
View File
@@ -1,29 +1,32 @@
import type { Chain } from "../src/types"; import type { Chain } from "../src/types";
export default { export default {
"name": "Syscoin Rollux Testnet", "name": "Rollux Testnet",
"chain": "SYS", "chain": "SYS",
"rpc": [ "rpc": [
"https://syscoin-rollux-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://rollux-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc-tanenbaum.rollux.com", "https://rpc-tanenbaum.rollux.com",
"https://rpc.ankr.com/rollux_testnet/${ANKR_API_KEY}",
"wss://rpc-tanenbaum.rollux.com/wss" "wss://rpc-tanenbaum.rollux.com/wss"
], ],
"faucets": [], "faucets": [
"https://rollux.id/faucetapp"
],
"nativeCurrency": { "nativeCurrency": {
"name": "Rollux Testnet Syscoin", "name": "Testnet Syscoin",
"symbol": "tSYS", "symbol": "TSYS",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://syscoin.org", "infoURL": "https://rollux.com",
"shortName": "tsys-rollux", "shortName": "tsys-rollux",
"chainId": 57000, "chainId": 57000,
"networkId": 57000, "networkId": 57000,
"explorers": [ "explorers": [
{ {
"name": "Syscoin Rollux Testnet Explorer", "name": "Rollux Testnet Explorer",
"url": "https://rollux.tanenbaum.io", "url": "https://rollux.tanenbaum.io",
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
"testnet": true, "testnet": true,
"slug": "syscoin-rollux-testnet" "slug": "rollux-testnet"
} as const satisfies Chain; } as const satisfies Chain;
+4 -4
View File
@@ -10,7 +10,7 @@ export default {
}, },
"rpc": [ "rpc": [
"https://satoshichain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://satoshichain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.satoshichain.io" "https://testnet-rpc.satoshichain.io"
], ],
"faucets": [ "faucets": [
"https://faucet.satoshichain.io" "https://faucet.satoshichain.io"
@@ -21,13 +21,13 @@ export default {
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://satoshichain.net", "infoURL": "https://satoshichain.net",
"shortName": "sats", "shortName": "satst",
"chainId": 5758, "chainId": 5758,
"networkId": 5758, "networkId": 5758,
"explorers": [ "explorers": [
{ {
"name": "SatoshiChain Explorer", "name": "SatoshiChain Testnet Explorer",
"url": "https://satoshiscan.io", "url": "https://testnet.satoshiscan.io",
"standard": "EIP3091" "standard": "EIP3091"
} }
], ],
+1
View File
@@ -4,6 +4,7 @@ export default {
"chain": "ASTR", "chain": "ASTR",
"rpc": [ "rpc": [
"https://astar.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://astar.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://evm.astar.network",
"https://rpc.astar.network:8545" "https://rpc.astar.network:8545"
], ],
"faucets": [], "faucets": [],
+39
View File
@@ -0,0 +1,39 @@
import type { Chain } from "../src/types";
export default {
"name": "UPTN Testnet",
"chain": "UPTN",
"icon": {
"url": "ipfs://Qma6cGPCDcJPFxy5KQaMBrLtuVQiqeLncXVybcBoQuhai5",
"width": 128,
"height": 128,
"format": "png"
},
"rpc": [
"https://uptn-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://node-api.alp.uptn.io/v1/ext/rpc"
],
"features": [
{
"name": "EIP1559"
}
],
"faucets": [],
"nativeCurrency": {
"name": "UPTN",
"symbol": "UPTN",
"decimals": 18
},
"infoURL": "https://uptn.io",
"shortName": "UPTN-TEST",
"chainId": 6118,
"networkId": 6118,
"explorers": [
{
"name": "UPTN Testnet Explorer",
"url": "https://testnet.explorer.uptn.io",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "uptn-testnet"
} as const satisfies Chain;
+39
View File
@@ -0,0 +1,39 @@
import type { Chain } from "../src/types";
export default {
"name": "UPTN",
"chain": "UPTN",
"icon": {
"url": "ipfs://Qma6cGPCDcJPFxy5KQaMBrLtuVQiqeLncXVybcBoQuhai5",
"width": 128,
"height": 128,
"format": "png"
},
"rpc": [
"https://uptn.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://node-api.uptn.io/v1/ext/rpc"
],
"features": [
{
"name": "EIP1559"
}
],
"faucets": [],
"nativeCurrency": {
"name": "UPTN",
"symbol": "UPTN",
"decimals": 18
},
"infoURL": "https://uptn.io",
"shortName": "UPTN",
"chainId": 6119,
"networkId": 6119,
"explorers": [
{
"name": "UPTN Explorer",
"url": "https://explorer.uptn.io",
"standard": "EIP3091"
}
],
"testnet": false,
"slug": "uptn"
} as const satisfies Chain;
+4 -4
View File
@@ -3,9 +3,9 @@ export default {
"name": "ZetaChain Mainnet", "name": "ZetaChain Mainnet",
"chain": "ZetaChain", "chain": "ZetaChain",
"icon": { "icon": {
"url": "ipfs://QmeABfwZ2nAxDzYyqZ1LEypPgQFMjEyrx8FfnoPLkF8R3f", "url": "ipfs://QmP4Gnf4Lkp8q5LQVePNjAWxSqrw8vU2JAf7amcFz4vEUy",
"width": 1280, "width": 712,
"height": 1280, "height": 712,
"format": "png" "format": "png"
}, },
"rpc": [ "rpc": [
@@ -18,7 +18,7 @@ export default {
"symbol": "ZETA", "symbol": "ZETA",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://docs.zetachain.com/", "infoURL": "https://zetachain.com/docs/",
"shortName": "zetachain-mainnet", "shortName": "zetachain-mainnet",
"chainId": 7000, "chainId": 7000,
"networkId": 7000, "networkId": 7000,
+6 -5
View File
@@ -3,14 +3,15 @@ export default {
"name": "ZetaChain Athens Testnet", "name": "ZetaChain Athens Testnet",
"chain": "ZetaChain", "chain": "ZetaChain",
"icon": { "icon": {
"url": "ipfs://QmeABfwZ2nAxDzYyqZ1LEypPgQFMjEyrx8FfnoPLkF8R3f", "url": "ipfs://QmP4Gnf4Lkp8q5LQVePNjAWxSqrw8vU2JAf7amcFz4vEUy",
"width": 1280, "width": 712,
"height": 1280, "height": 712,
"format": "png" "format": "png"
}, },
"rpc": [ "rpc": [
"https://zetachain-athens-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://zetachain-athens-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://api.athens2.zetachain.com/evm" "https://zetachain-athens-evm.blockpi.network/v1/rpc/public",
"wss://zetachain-athens.blockpi.network/rpc/v1/public/websocket"
], ],
"faucets": [ "faucets": [
"https://labs.zetachain.com/get-zeta" "https://labs.zetachain.com/get-zeta"
@@ -20,7 +21,7 @@ export default {
"symbol": "aZETA", "symbol": "aZETA",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://docs.zetachain.com/", "infoURL": "https://zetachain.com/docs",
"shortName": "zetachain-athens", "shortName": "zetachain-athens",
"chainId": 7001, "chainId": 7001,
"networkId": 7001, "networkId": 7001,
+34
View File
@@ -0,0 +1,34 @@
import type { Chain } from "../src/types";
export default {
"name": "Zora",
"chain": "ETH",
"rpc": [
"https://zora.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.zora.co/"
],
"faucets": [],
"nativeCurrency": {
"name": "Ether",
"symbol": "ETH",
"decimals": 18
},
"infoURL": "https://zora.co",
"shortName": "zora",
"chainId": 7777777,
"networkId": 7777777,
"explorers": [
{
"name": "Zora Network Explorer",
"url": "https://explorer.zora.co",
"standard": "EIP3091"
}
],
"icon": {
"url": "ipfs://QmZ6qaRwTPFEZUspwMUjaxC6KhmzcELdRQcQzS3P72Dzts/Vector.svg",
"height": 512,
"width": 512,
"format": "svg"
},
"testnet": false,
"slug": "zora"
} as const satisfies Chain;
+36
View File
@@ -0,0 +1,36 @@
import type { Chain } from "../src/types";
export default {
"name": "MAAL Sharia Chain",
"chain": "MAAL",
"icon": {
"url": "ipfs://bafkreiexfqfe2x4impvwhra3xxa5eb25gv25zi3kkaoatdnld7wbxdzf2a",
"width": 512,
"height": 512,
"format": "png"
},
"rpc": [
"https://maal-sharia-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://node1-mainnet.maalscan.io/",
"https://node2-mainnet.maalscan.io/",
"https://node3-mainnet.maalscan.io/"
],
"faucets": [],
"nativeCurrency": {
"name": "MAAL",
"symbol": "MAAL",
"decimals": 18
},
"infoURL": "https://www.maalblockchain.com/",
"shortName": "maal",
"chainId": 786,
"networkId": 786,
"explorers": [
{
"name": "maalscan",
"url": "https://maalscan.io",
"standard": "EIP3091"
}
],
"testnet": false,
"slug": "maal-sharia-chain"
} as const satisfies Chain;
+21
View File
@@ -0,0 +1,21 @@
import type { Chain } from "../src/types";
export default {
"name": "Patex",
"chain": "ETH",
"rpc": [
"https://patex.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.patex.io/"
],
"faucets": [],
"nativeCurrency": {
"name": "Ether",
"symbol": "ETH",
"decimals": 18
},
"infoURL": "https://patex.io/",
"shortName": "peth",
"chainId": 789,
"networkId": 789,
"testnet": false,
"slug": "patex"
} as const satisfies Chain;
+37
View File
@@ -0,0 +1,37 @@
import type { Chain } from "../src/types";
export default {
"name": "Nautilus Chain",
"title": "Nautilus Trition Testnet",
"chain": "ETH",
"icon": {
"url": "ipfs://QmNutSgM7n6aJPPDiofe9Dm1epy1RcYTMvugukLUK2vmPM",
"width": 500,
"height": 500,
"format": "png"
},
"rpc": [
"https://nautilus-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://triton.api.nautchain.xyz"
],
"faucets": [
"https://faucet.eclipse.builders"
],
"nativeCurrency": {
"name": "Nautilus Zebec Testnet Tokens",
"symbol": "tZBC",
"decimals": 18
},
"infoURL": "https://docs.nautchain.xyz",
"shortName": "NAUT",
"chainId": 91002,
"networkId": 91002,
"explorers": [
{
"name": "Nautscan",
"url": "https://triton.nautscan.com",
"standard": "EIP3091"
}
],
"testnet": true,
"slug": "nautilus-chain"
} as const satisfies Chain;
+45
View File
@@ -0,0 +1,45 @@
import type { Chain } from "../src/types";
export default {
"name": "CamDL Mainnet",
"chain": "CADL",
"rpc": [
"https://camdl.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc1.camdl.gov.kh/"
],
"faucets": [
"https://faucet.camdl.gov.kh/"
],
"nativeCurrency": {
"name": "CADL",
"symbol": "CADL",
"decimals": 18
},
"features": [
{
"name": "EIP155"
}
],
"infoURL": "https://camdl.gov.kh/",
"shortName": "camdl",
"chainId": 95,
"networkId": 95,
"redFlags": [
"reusedChainId"
],
"icon": {
"url": "ipfs://QmW5Fpb2Ywnfqcj4ibvpbKvPv5Mo5eseWdYZnnUvLkj2Hp",
"width": 1453,
"height": 1453,
"format": "png"
},
"explorers": [
{
"name": "CamDL Block Explorer",
"url": "https://explorer.camdl.gov.kh",
"standard": "EIP3091"
}
],
"status": "active",
"testnet": false,
"slug": "camdl"
} as const satisfies Chain;
+14 -9
View File
@@ -1,21 +1,26 @@
import type { Chain } from "../src/types"; import type { Chain } from "../src/types";
export default { export default {
"name": "Wanchain Testnet", "name": "Zora Testnet",
"chain": "WAN", "chain": "ETH",
"rpc": [ "rpc": [
"https://wanchain-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}", "https://zora-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://gwan-ssl.wandevs.org:46891/" "https://testnet.rpc.zora.co/"
], ],
"faucets": [], "faucets": [],
"nativeCurrency": { "nativeCurrency": {
"name": "Wancoin", "name": "Ether",
"symbol": "WAN", "symbol": "GETH",
"decimals": 18 "decimals": 18
}, },
"infoURL": "https://testnet.wanscan.org", "icon": {
"shortName": "twan", "url": "ipfs://QmZ6qaRwTPFEZUspwMUjaxC6KhmzcELdRQcQzS3P72Dzts/Vector.svg",
"height": 512,
"width": 512,
"format": "svg"
},
"shortName": "Zora",
"chainId": 999, "chainId": 999,
"networkId": 999, "networkId": 999,
"testnet": true, "testnet": true,
"slug": "wanchain-testnet" "slug": "zora-testnet"
} as const satisfies Chain; } as const satisfies Chain;
+33
View File
@@ -0,0 +1,33 @@
// @ts-check
/** @typedef { import("../../src/types").Chain } Chain */
/** @type {Omit<Chain, "slug">} */
export default {
name: "Taro Testnet",
chain: "gETH",
shortName: "Taro",
chainId: 1582,
testnet: true,
icon: {
format: "svg",
url: "ipfs://bafybeibfpls2ealp4e5fdeoxessfjjkldgjnrcx2erph7524pg7alskk6a/1f9cb.svg",
width: 512,
height: 512,
},
rpc: ["https://taro-testnet.calderachain.xyz/http"],
nativeCurrency: {
decimals: 18,
name: "Ether",
symbol: "gETH",
},
explorers: [
{
url: "https://explorer.tarotestnet.com",
name: "Taro Testnet Explorer",
standard: "EIP3091",
},
],
faucets: ["https://tarotestnet.com"],
infoURL: "https://tarotestnet.com",
networkId: 1582,
};
+25
View File
@@ -0,0 +1,25 @@
// @ts-check
/** @typedef { import("../../src/types").Chain } Chain */
/** @type {Omit<Chain, "slug">} */
export default {
name: "Zora Testnet",
chain: "ETH",
rpc: ["https://testnet.rpc.zora.co/"],
faucets: [],
nativeCurrency: {
name: "Ether",
symbol: "GETH",
decimals: 18,
},
icon: {
url: "ipfs://QmZ6qaRwTPFEZUspwMUjaxC6KhmzcELdRQcQzS3P72Dzts/Vector.svg",
height: 512,
width: 512,
format: "svg",
},
shortName: "Zora",
chainId: 999,
networkId: 999,
testnet: true,
};
+1 -1
View File
@@ -10,7 +10,7 @@ export default {
format: "png", format: "png",
}, },
rpc: [ rpc: [
"https://abritrum-goerli.infura.io/v3/${INFURA_API_KEY}", "https://arbitrum-goerli.infura.io/v3/${INFURA_API_KEY}",
"https://arb-goerli.g.alchemy.com/v2/${ALCHEMY_API_KEY}", "https://arb-goerli.g.alchemy.com/v2/${ALCHEMY_API_KEY}",
], ],
}; };
+7
View File
@@ -0,0 +1,7 @@
// @ts-check
/** @typedef { import("../../src/types").Chain } Chain */
/** @type {Partial<Chain>} */
export default {
rpc: ["https://evm.astar.network"],
};
@@ -0,0 +1,12 @@
// @ts-check
/** @typedef { import("../../src/types").Chain } Chain */
/** @type {Partial<Chain>} */
export default {
icon: {
url: "ipfs://QmZ6qaRwTPFEZUspwMUjaxC6KhmzcELdRQcQzS3P72Dzts/Vector.svg",
height: 512,
width: 512,
format: "svg",
},
};
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@thirdweb-dev/chains", "name": "@thirdweb-dev/chains",
"version": "0.1.19", "version": "0.1.22",
"main": "dist/thirdweb-dev-chains.cjs.js", "main": "dist/thirdweb-dev-chains.cjs.js",
"module": "dist/thirdweb-dev-chains.esm.js", "module": "dist/thirdweb-dev-chains.esm.js",
"browser": { "browser": {
@@ -54,6 +54,8 @@ for (const file of additionalChainsFiles) {
const additionalChain = await import( const additionalChain = await import(
path.join("file://", additionalChainsDir, file) path.join("file://", additionalChainsDir, file)
); );
chains = chains.filter((c) => c.chainId !== additionalChain.default.chainId);
chains.push(additionalChain.default); chains.push(additionalChain.default);
} }
File diff suppressed because one or more lines are too long
+41
View File
@@ -1,5 +1,46 @@
# thirdweb # thirdweb
## 0.10.24
### Patch Changes
- Updated dependencies [[`d9b7360d`](https://github.com/thirdweb-dev/js/commit/d9b7360d1d78abcdaca89aa35e66388cbc5eb26c), [`8a2d9204`](https://github.com/thirdweb-dev/js/commit/8a2d92046a416c99c6bfecf63a6fdb6cc02ea175), [`990c665d`](https://github.com/thirdweb-dev/js/commit/990c665de9e5c1070dc80fe0f1b434e251f70a94), [`c6f44722`](https://github.com/thirdweb-dev/js/commit/c6f44722f9d123db4e7c4c799fe8e0374a02107c), [`45ae105e`](https://github.com/thirdweb-dev/js/commit/45ae105ed3e48bfbf6be84aa12ecb0fb55a917b7), [`f41f1a29`](https://github.com/thirdweb-dev/js/commit/f41f1a2958a2cedcf0496c9a3ca284d0b98f1b89), [`bb7ca20e`](https://github.com/thirdweb-dev/js/commit/bb7ca20e49c5c374b12a4ed746a2ac3db488abd9), [`23d61cfe`](https://github.com/thirdweb-dev/js/commit/23d61cfeff2e5a885c511416d7491e7933ed404a), [`8941b226`](https://github.com/thirdweb-dev/js/commit/8941b22682d1b15a6e0d311b1e8548b95d6cfadf), [`e0ce4a37`](https://github.com/thirdweb-dev/js/commit/e0ce4a37596a91a072f8551e323fce6723113dcb)]:
- @thirdweb-dev/sdk@3.10.23
- @thirdweb-dev/chains@0.1.22
## 0.10.23
### Patch Changes
- [#1184](https://github.com/thirdweb-dev/js/pull/1184) [`e7f1ce43`](https://github.com/thirdweb-dev/js/commit/e7f1ce43b04c6ea81fd05c02c8392a16c38d6053) Thanks [@Marfuen](https://github.com/Marfuen)! - Fix typo issues with python detectors
- [#1074](https://github.com/thirdweb-dev/js/pull/1074) [`cc20f93e`](https://github.com/thirdweb-dev/js/commit/cc20f93e178d86ee2b3f39102bbb0811de211f05) Thanks [@Marfuen](https://github.com/Marfuen)! - Enhance CLI Install command and update chains
- [#1154](https://github.com/thirdweb-dev/js/pull/1154) [`02d55a06`](https://github.com/thirdweb-dev/js/commit/02d55a063e7c53761d57e6cb6bf63ea78e454d70) Thanks [@beauwilliams](https://github.com/beauwilliams)! - fix: always use latest CLI version in CI
- [#1171](https://github.com/thirdweb-dev/js/pull/1171) [`c0e2c945`](https://github.com/thirdweb-dev/js/commit/c0e2c9457f5ba992163b175f85b0f4b92b070f48) Thanks [@Marfuen](https://github.com/Marfuen)! - Minor bug fixes and improvements
- [#1183](https://github.com/thirdweb-dev/js/pull/1183) [`224b7241`](https://github.com/thirdweb-dev/js/commit/224b7241dc82155d3207a2d16523ceaae5532f40) Thanks [@Marfuen](https://github.com/Marfuen)! - Python detectors bug fixes
- Updated dependencies [[`cc20f93e`](https://github.com/thirdweb-dev/js/commit/cc20f93e178d86ee2b3f39102bbb0811de211f05), [`a430160e`](https://github.com/thirdweb-dev/js/commit/a430160e6b4771c03d97f6ede91f1aeaa043e50e), [`12b07aad`](https://github.com/thirdweb-dev/js/commit/12b07aad9ae3176daf9d05864247d4806a16c9d2), [`7d2a446e`](https://github.com/thirdweb-dev/js/commit/7d2a446ecef9c6c14959d31e9a66537783b9adac), [`8e28b0f5`](https://github.com/thirdweb-dev/js/commit/8e28b0f5e75596d29273ed80269bcee6d209adb4), [`01293857`](https://github.com/thirdweb-dev/js/commit/01293857fac8531bd94764203cd24b3daa4db51f), [`20bbad1a`](https://github.com/thirdweb-dev/js/commit/20bbad1abcb1ec573318d326b09278492a488abd)]:
- @thirdweb-dev/chains@0.1.21
- @thirdweb-dev/sdk@3.10.22
## 0.10.22
### Patch Changes
- Updated dependencies [[`3bf7f375`](https://github.com/thirdweb-dev/js/commit/3bf7f375933cbd7dd8c682a66e8c67bbcb268bf7), [`16232de9`](https://github.com/thirdweb-dev/js/commit/16232de9eab9966e24e335929b2a3919346af265), [`8687d6ac`](https://github.com/thirdweb-dev/js/commit/8687d6ac3a363eae63eeb1959a953cbcd282d353), [`645b0303`](https://github.com/thirdweb-dev/js/commit/645b0303cc1a9cbb0a0e9cbd67d11c3b865e4584), [`522453fd`](https://github.com/thirdweb-dev/js/commit/522453fd568b8c350141a96f9f1c6d5a3ef74493), [`6803c3e9`](https://github.com/thirdweb-dev/js/commit/6803c3e97ca74eed19cd90095afde25b02150d51), [`56f85e57`](https://github.com/thirdweb-dev/js/commit/56f85e57df84bfa93e3230639c95d12466f8aec7), [`6a91b6a0`](https://github.com/thirdweb-dev/js/commit/6a91b6a0253bab5914d4ebdad951dd1c5d141fbc), [`a5f16b6d`](https://github.com/thirdweb-dev/js/commit/a5f16b6dc50b37920a6e5210b60aa6a1682ceb63), [`b6728603`](https://github.com/thirdweb-dev/js/commit/b6728603972ccd6c95108b25e8562807f0f95e19), [`ed47fd53`](https://github.com/thirdweb-dev/js/commit/ed47fd5310d11323080d984bca18a96fdef3a977)]:
- @thirdweb-dev/sdk@3.10.21
- @thirdweb-dev/chains@0.1.20
## 0.10.21
### Patch Changes
- Updated dependencies [[`ce36322b`](https://github.com/thirdweb-dev/js/commit/ce36322b383af73905894b73f9409a146359ffb0), [`c60658ed`](https://github.com/thirdweb-dev/js/commit/c60658ed8c94867cca831b0d5535006da5b40aa6), [`aa9e952c`](https://github.com/thirdweb-dev/js/commit/aa9e952cb519a47ed112d2905b1f3787863035b6), [`564eaccf`](https://github.com/thirdweb-dev/js/commit/564eaccf480a81f36db43c782392595a5021e5ac), [`6aee0413`](https://github.com/thirdweb-dev/js/commit/6aee0413439b9ca408879bbb3c38c538c89d01af), [`e93aa70e`](https://github.com/thirdweb-dev/js/commit/e93aa70ef0093a2526404e11b7ddae8fb98c213b), [`51bbd3d1`](https://github.com/thirdweb-dev/js/commit/51bbd3d1bccbb92a1405ea50f6c178c091a90f20)]:
- @thirdweb-dev/sdk@3.10.20
## 0.10.20 ## 0.10.20
### Patch Changes ### Patch Changes
+4 -9
View File
@@ -34,9 +34,6 @@ describe("npx thirdweb detect", () => {
// wait for program to finish // wait for program to finish
await create.waitForFinish(); await create.waitForFinish();
// the process should exit with code 0
expect(create.getExitCode()).toEqual(0);
// check if the contract was created // check if the contract was created
expect(await exists("thirdweb-contracts/contracts/Contract.sol")).toEqual( expect(await exists("thirdweb-contracts/contracts/Contract.sol")).toEqual(
true, true,
@@ -56,14 +53,15 @@ describe("npx thirdweb detect", () => {
"./thirdweb-contracts", "./thirdweb-contracts",
); );
// Select pnpm as package manager.
await detect.pressKey("arrowDown");
await detect.pressKey("enter");
// wait for program to finish // wait for program to finish
await detect.waitForFinish(); await detect.waitForFinish();
const lines = detect.getStdout(); const lines = detect.getStdout();
// check that detect excited successfully
expect(detect.getExitCode()).toEqual(0);
// Detected extensions // Detected extensions
expect(lines.findIndex((line) => line.includes("ERC721"))).toBeGreaterThan( expect(lines.findIndex((line) => line.includes("ERC721"))).toBeGreaterThan(
-1, -1,
@@ -86,9 +84,6 @@ describe("npx thirdweb detect", () => {
lines.findIndex((line) => line.includes("- ERC721SignatureMint")), lines.findIndex((line) => line.includes("- ERC721SignatureMint")),
).toBeGreaterThan(-1); ).toBeGreaterThan(-1);
// the process should exit with code 0
expect(detect.getExitCode()).toEqual(0);
await cleanup(); // cleanup after test await cleanup(); // cleanup after test
}); });
}); });
+2 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "thirdweb", "name": "thirdweb",
"main": "dist/cli/index.js", "main": "dist/cli/index.js",
"version": "0.10.20", "version": "0.10.24",
"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",
@@ -47,6 +47,7 @@
"got": "11.8.5", "got": "11.8.5",
"inquirer": "^8.2.3", "inquirer": "^8.2.3",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"node-fetch": "^3.3.1",
"open": "^8.4.0", "open": "^8.4.0",
"prompts": "^2.4.2", "prompts": "^2.4.2",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
+4 -15
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env node #!/usr/bin/env node
import { detectExtensions } from "../common/feature-detector"; import { detectExtensions } from "../common/feature-detector";
import { detectProjectV2 } from "../common/project-detector-v2"; import { detectProject } from "../common/project-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, spinner } from "../core/helpers/logger"; import { info, logger, spinner } from "../core/helpers/logger";
@@ -9,7 +9,6 @@ import { twCreate } from "../create/command";
import { deploy } from "../deploy"; import { deploy } from "../deploy";
import { generate } from "../generate/command"; import { generate } from "../generate/command";
import { findPackageInstallation } from "../helpers/detect-local-packages"; import { findPackageInstallation } from "../helpers/detect-local-packages";
import { install } from "../install/command";
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";
@@ -18,6 +17,7 @@ import { Command } from "commander";
import open from "open"; import open from "open";
import prompts from "prompts"; import prompts from "prompts";
import Cache from "sync-disk-cache"; import Cache from "sync-disk-cache";
import { install } from "../install";
const main = async () => { const main = async () => {
// eslint-disable-next-line turbo/no-undeclared-env-vars // eslint-disable-next-line turbo/no-undeclared-env-vars
@@ -204,6 +204,7 @@ const main = async () => {
) )
.option("--nightly", "Install the nightly version of packages.") .option("--nightly", "Install the nightly version of packages.")
.option("--dev", "Install the dev version of packages") .option("--dev", "Install the dev version of packages")
.option("-d, --debug", "show debug logs")
.action(async (path, options) => { .action(async (path, options) => {
await install(path, options); await install(path, options);
}); });
@@ -398,25 +399,13 @@ const main = async () => {
program program
.command("detect") .command("detect")
.description(
"(deprecated) Compile contracts and detect implemented thirdweb contract extensions",
)
.option("-p, --path <project-path>", "path to project", ".")
.option("-d, --debug", "show debug logs")
.option("-a, --all", "run detection on all contracts")
.action(async (options) => {
await detectExtensions(options);
});
program
.command("detect-project")
.description( .description(
"Detect the type of project your are running and let you know what it is.", "Detect the type of project your are running and let you know what it is.",
) )
.option("-p, --path <project-path>", "path to project", ".") .option("-p, --path <project-path>", "path to project", ".")
.option("-d, --debug", "show debug logs") .option("-d, --debug", "show debug logs")
.action(async (options) => { .action(async (options) => {
await detectProjectV2(options); await detectProject(options);
}); });
program program
@@ -1,48 +0,0 @@
import detectPackageManager from "../core/detection/detectPackageManager";
import detectFramework from "../core/detection/detectFramework";
import detectLibrary from "../core/detection/detectLibrary";
import detectLanguage from "../core/detection/detectLanguage";
import { logger } from "../core/helpers/logger";
import path from "path";
import { ContractLibrariesType, contractLibraries } from "../core/types/ProjectType";
export async function detectProjectV2(options: any) {
logger.setSettings({
minLevel: options.debug ? "debug" : "info",
});
let projectPath = process.cwd();
if (options.path) {
logger.debug("Overriding project path to " + options.path);
const resolvedPath = (options.path as string).startsWith("/")
? options.path
: path.resolve(`${projectPath}/${options.path}`);
projectPath = resolvedPath;
}
logger.debug("Processing project at path " + projectPath);
const detectedPackageManager = await detectPackageManager(
projectPath,
options,
);
const detectedLanguage = await detectLanguage(projectPath, options);
const detectedLibrary = await detectLibrary(
projectPath,
options,
detectedPackageManager,
);
const detectedFramework = await detectFramework(
projectPath,
options,
detectedPackageManager,
);
const detectedAppType = contractLibraries.includes(detectedFramework as ContractLibrariesType) ? "contract" : "app";
logger.debug("Detected package manager: " + detectedPackageManager);
logger.debug("Detected library: " + detectedLibrary);
logger.debug("Detected language: " + detectedLanguage);
logger.debug("Detected framework: " + detectedFramework);
logger.debug("Detected app type: " + detectedAppType);
}
+136 -111
View File
@@ -1,17 +1,20 @@
import { ALWAYS_SUGGESTED } from "../constants/features";
import build from "../core/builder/build";
import detect from "../core/detection/detect";
import detectPackageManager from "../core/detection/detectPackageManager"; import detectPackageManager from "../core/detection/detectPackageManager";
import detectFramework from "../core/detection/detectFramework";
import detectLibrary from "../core/detection/detectLibrary";
import detectLanguage from "../core/detection/detectLanguage";
import { logger, spinner } from "../core/helpers/logger"; import { logger, spinner } from "../core/helpers/logger";
import path from "path";
import { ContractLibrariesType, contractLibraries } from "../core/types/ProjectType";
import { FeatureWithEnabled, detectFeatures } from "@thirdweb-dev/sdk";
import chalk from "chalk";
import ora from "ora";
import { ContractPayload } from "../core/interfaces/ContractPayload";
import { createContractsPrompt } from "../core/helpers/selector"; import { createContractsPrompt } from "../core/helpers/selector";
import { ContractFeatures, Feature } from "../core/interfaces/ContractFeatures"; import { ContractFeatures, Feature } from "../core/interfaces/ContractFeatures";
import { ContractPayload } from "../core/interfaces/ContractPayload";
import { getPkgManager } from "../create/helpers/get-pkg-manager";
import { detectFeatures, FeatureWithEnabled } from "@thirdweb-dev/sdk";
import chalk from "chalk";
import { existsSync, readFileSync } from "fs"; import { existsSync, readFileSync } from "fs";
import ora from "ora"; import { getPkgManager } from "../create/helpers/get-pkg-manager";
import path from "path"; import { ALWAYS_SUGGESTED } from "../constants/features";
import build from "../core/builder/build";
export async function detectProject(options: any) { export async function detectProject(options: any) {
logger.setSettings({ logger.setSettings({
@@ -30,115 +33,137 @@ export async function detectProject(options: any) {
logger.debug("Processing project at path " + projectPath); logger.debug("Processing project at path " + projectPath);
const packageManagerType = await detectPackageManager(projectPath, options); const detectedPackageManager = await detectPackageManager(
console.log(packageManagerType); projectPath,
const projectType = await detect(projectPath, options); options,
let compiledResult;
const compileLoader = spinner("Compiling project...");
try {
compiledResult = await build(projectPath, projectType, options);
} catch (e) {
compileLoader.fail("Compilation failed");
logger.error(e);
process.exit(1);
}
compileLoader.succeed("Compilation successful");
let selectedContracts: ContractPayload[] = [];
if (compiledResult.contracts.length === 1) {
selectedContracts = [compiledResult.contracts[0]];
} else {
if (options.all) {
selectedContracts = compiledResult.contracts;
} else {
const choices = compiledResult.contracts.map((c) => ({
name: c.name,
value: c,
}));
const prompt = createContractsPrompt(
choices,
"Choose which contracts to run detection on",
);
const selection: Record<string, ContractPayload> = await prompt.run();
selectedContracts = Object.keys(selection).map((key) => selection[key]);
}
}
let contractsWithFeatures: ContractFeatures[] = selectedContracts.map(
(contract) => {
const abi: Parameters<typeof detectFeatures>[0] = JSON.parse(
contract.metadata,
)["output"]["abi"];
const features = extractFeatures(detectFeatures(abi));
const enabledFeatures: Feature[] = features.enabledFeatures.map(
(feature) => ({
name: feature.name,
reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
}),
);
const suggestedFeatures: Feature[] = features.suggestedFeatures.map(
(feature) => ({
name: feature.name,
reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
}),
);
return {
name: contract.name,
enabledFeatures,
suggestedFeatures,
};
},
); );
const detectedLanguage = await detectLanguage(projectPath, options);
const detectedLibrary = await detectLibrary(
projectPath,
options,
detectedPackageManager,
);
const detectedFramework = await detectFramework(
projectPath,
options,
detectedPackageManager,
);
const detectedAppType = detectedFramework !== "none" ? contractLibraries.includes(detectedFramework as ContractLibrariesType) ? "contract" : "app" : "app";
const detectedContractLibrary = detectedAppType === "contract" ? detectedFramework as ContractLibrariesType : "none";
contractsWithFeatures.map((contractWithFeatures) => { logger.info("Detected package manager: " + detectedPackageManager);
logger.info(`\n`); logger.info("Detected library: " + detectedLibrary);
if (contractWithFeatures.enabledFeatures.length === 0) { logger.info("Detected language: " + detectedLanguage);
ora( logger.info("Detected framework: " + detectedFramework);
`No extensions detected on ${chalk.blueBright( logger.info("Detected app type: " + detectedAppType);
contractWithFeatures.name,
)}`, if (detectedAppType === "contract") {
).stopAndPersist({ symbol: "🔎" }); let compiledResult;
} else { const compileLoader = spinner("Compiling project...");
ora( try {
`Detected extension on ${chalk.blueBright(contractWithFeatures.name)}`, compiledResult = await build(projectPath, detectedContractLibrary, options);
).stopAndPersist({ symbol: "🔎" }); } catch (e) {
contractWithFeatures.enabledFeatures.map((feature) => { compileLoader.fail("Compilation failed");
logger.info(`✔️ ${chalk.green(feature.name)}`); logger.error(e);
}); process.exit(1);
} }
logger.info(``); compileLoader.succeed("Compilation successful");
ora(`Suggested extensions`).info();
contractWithFeatures.suggestedFeatures.map((feature) => {
logger.info(
`${chalk.dim(chalk.gray(`-`))} ${chalk.gray(
feature.name,
)} - ${chalk.dim(chalk.gray(feature.reference))}`,
);
});
let deployCmd = `npx thirdweb@latest deploy`; let selectedContracts: ContractPayload[] = [];
if (existsSync(projectPath + "/package.json")) { if (compiledResult.contracts.length === 1) {
const packageManager = getPkgManager(); selectedContracts = [compiledResult.contracts[0]];
const useYarn = packageManager === "yarn"; } else {
const pkgJson = JSON.parse( if (options.all) {
readFileSync(projectPath + "/package.json", "utf-8"), selectedContracts = compiledResult.contracts;
); } else {
if (pkgJson?.scripts?.deploy === deployCmd) { const choices = compiledResult.contracts.map((c) => ({
deployCmd = `${packageManager}${useYarn ? "" : " run"} deploy`; name: c.name,
value: c,
}));
const prompt = createContractsPrompt(
choices,
"Choose which contracts to run detection on",
);
const selection: Record<string, ContractPayload> = await prompt.run();
selectedContracts = Object.keys(selection).map((key) => selection[key]);
} }
} }
logger.info(``); let contractsWithFeatures: ContractFeatures[] = selectedContracts.map(
ora( (contract) => {
`Once you're done writing your contracts, you can run the following command to deploy them:`, const abi: Parameters<typeof detectFeatures>[0] = JSON.parse(
).info(); contract.metadata,
logger.info(``); )["output"]["abi"];
logger.info(` ${chalk.cyan(deployCmd)}`); const features = extractFeatures(detectFeatures(abi));
logger.info(``);
}); const enabledFeatures: Feature[] = features.enabledFeatures.map(
(feature) => ({
name: feature.name,
reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
}),
);
const suggestedFeatures: Feature[] = features.suggestedFeatures.map(
(feature) => ({
name: feature.name,
reference: `https://portal.thirdweb.com/interfaces/${feature.name.toLowerCase()}`,
}),
);
return {
name: contract.name,
enabledFeatures,
suggestedFeatures,
};
},
);
contractsWithFeatures.map((contractWithFeatures) => {
logger.info(`\n`);
if (contractWithFeatures.enabledFeatures.length === 0) {
ora(
`No extensions detected on ${chalk.blueBright(
contractWithFeatures.name,
)}`,
).stopAndPersist({ symbol: "🔎" });
} else {
ora(
`Detected extension on ${chalk.blueBright(contractWithFeatures.name)}`,
).stopAndPersist({ symbol: "🔎" });
contractWithFeatures.enabledFeatures.map((feature) => {
logger.info(`✔️ ${chalk.green(feature.name)}`);
});
}
logger.info(``);
ora(`Suggested extensions`).info();
contractWithFeatures.suggestedFeatures.map((feature) => {
logger.info(
`${chalk.dim(chalk.gray(`-`))} ${chalk.gray(
feature.name,
)} - ${chalk.dim(chalk.gray(feature.reference))}`,
);
});
let deployCmd = `npx thirdweb@latest deploy`;
if (existsSync(projectPath + "/package.json")) {
const packageManager = getPkgManager();
const useYarn = packageManager === "yarn";
const pkgJson = JSON.parse(
readFileSync(projectPath + "/package.json", "utf-8"),
);
if (pkgJson?.scripts?.deploy === deployCmd) {
deployCmd = `${packageManager}${useYarn ? "" : " run"} deploy`;
}
}
logger.info(``);
ora(
`Once you're done writing your contracts, you can run the following command to deploy them:`,
).info();
logger.info(``);
logger.info(` ${chalk.cyan(deployCmd)}`);
logger.info(``);
});
}
} }
function extractFeatures( function extractFeatures(
@@ -29,7 +29,6 @@ export default async function detect(
options: any, options: any,
detectedPackageManager: PackageManagerType, detectedPackageManager: PackageManagerType,
): Promise<FrameworkType> { ): Promise<FrameworkType> {
// We could optimize further if we want, by only running the detectors that match the package manager.
const frameworkDetectors: FrameworkDetector[] = [ const frameworkDetectors: FrameworkDetector[] = [
new BrownieDetector(), new BrownieDetector(),
new CRADetector(), new CRADetector(),
@@ -66,6 +65,10 @@ export default async function detect(
return possibleFrameworks[0]; return possibleFrameworks[0];
} }
if (possibleFrameworks.includes("expo") && possibleFrameworks.includes("react-native-cli")) {
return "expo";
}
info( info(
`Detected multiple possible frameworks: ${possibleFrameworks `Detected multiple possible frameworks: ${possibleFrameworks
.map((s) => `"${s}"`) .map((s) => `"${s}"`)
@@ -30,6 +30,10 @@ export default async function detect(
return possibleLanguages[0]; return possibleLanguages[0];
} }
if (possibleLanguages.includes("typescript") && possibleLanguages.includes("javascript")) {
return "typescript";
}
info( info(
`Detected multiple possible languages: ${possibleLanguages `Detected multiple possible languages: ${possibleLanguages
.map((s) => `"${s}"`) .map((s) => `"${s}"`)
@@ -36,6 +36,10 @@ export default async function detect(
return possibleLibraries[0]; return possibleLibraries[0];
} }
if (possibleLibraries.includes("react-native") && possibleLibraries.includes("react")) {
return "react-native";
}
info( info(
`Detected multiple possible libraries: ${possibleLibraries `Detected multiple possible libraries: ${possibleLibraries
.map((s) => `"${s}"`) .map((s) => `"${s}"`)
@@ -5,10 +5,12 @@ import inquirer from "inquirer";
import NPMDetector from "./packageManagers/npm"; import NPMDetector from "./packageManagers/npm";
import YarnDetector from "./packageManagers/yarn"; import YarnDetector from "./packageManagers/yarn";
import PnpmDetector from "./packageManagers/pnpm"; import PnpmDetector from "./packageManagers/pnpm";
import CondaDetector from "./packageManagers/conda";
import PipDetector from "./packageManagers/pip"; import PipDetector from "./packageManagers/pip";
import PipEnvDetector from "./packageManagers/pipenv"; import PipEnvDetector from "./packageManagers/pipenv";
import PoetryDetector from "./packageManagers/poetry"; import PoetryDetector from "./packageManagers/poetry";
import BrownieDetector from "./packageManagers/brownie";
import FoundryDetector from "./packageManagers/foundry";
import GoModulesDetector from "./packageManagers/goModules";
export default async function detect( export default async function detect(
path: string, path: string,
@@ -18,14 +20,18 @@ export default async function detect(
new NPMDetector(), new NPMDetector(),
new YarnDetector(), new YarnDetector(),
new PnpmDetector(), new PnpmDetector(),
new CondaDetector(),
new PipDetector(), new PipDetector(),
new PipEnvDetector(), new PipEnvDetector(),
new PoetryDetector(), new PoetryDetector(),
new GoModulesDetector(),
new BrownieDetector(),
new FoundryDetector(),
]; ];
const possiblePackageManagers = packageManagerDetectors const possiblePackageManagers = packageManagerDetectors
.filter((detector) => detector.matches(path)) .filter((detector) => {
return detector.matches(path);
})
.map((detector) => detector.packageManagerType); .map((detector) => detector.packageManagerType);
if (!possiblePackageManagers.length) { if (!possiblePackageManagers.length) {
@@ -36,6 +42,10 @@ export default async function detect(
return possiblePackageManagers[0]; return possiblePackageManagers[0];
} }
if (possiblePackageManagers.includes("brownie") && possiblePackageManagers.includes("pip")) {
return "brownie";
}
info( info(
`Detected multiple possible package managers: ${possiblePackageManagers `Detected multiple possible package managers: ${possiblePackageManagers
.map((s) => `"${s}"`) .map((s) => `"${s}"`)
@@ -20,10 +20,16 @@ export default class BrownieDetector implements FrameworkDetector {
existsSync(path + file), existsSync(path + file),
); );
const additionalDirectoriesToCheck = ["/build", "/contracts", "/reports"];
const additionalDirectoriesExist = additionalDirectoriesToCheck.every((dir) => {
return existsSync(path + dir);
});
return ( return (
dependencies.includes("brownie") || !!dependencies.find(dep => dep.includes("brownie")) ||
devDependencies.includes("brownie") || !!devDependencies.find(dep => dep.includes("brownie")) ||
additionalFilesExist || additionalFilesExist ||
additionalDirectoriesExist ||
false false
); );
} }
@@ -16,8 +16,8 @@ export default class CRADetector implements FrameworkDetector {
const packageJson = readFileSync(packageJsonPath); const packageJson = readFileSync(packageJsonPath);
const { dependencies, devDependencies } = parsePackageJson(packageJson); const { dependencies, devDependencies } = parsePackageJson(packageJson);
const craDependencyExists = const craDependencyExists =
dependencies["react-scripts"] || !!dependencies["react-scripts"] ||
devDependencies["react-scripts"] || !!devDependencies["react-scripts"] ||
false; false;
return craDependencyExists; return craDependencyExists;
@@ -18,8 +18,8 @@ export default class DjangoDetector implements FrameworkDetector {
); );
return ( return (
dependencies.includes("django") || !!dependencies.find(dep => dep.includes("Django")) ||
devDependencies.includes("django") || !!devDependencies.find(dep => dep.includes("Django")) ||
additionalFilesExist || additionalFilesExist ||
false false
); );
@@ -16,14 +16,14 @@ export default class ExpoDetector implements FrameworkDetector {
const packageJson = readFileSync(packageJsonPath); const packageJson = readFileSync(packageJsonPath);
const { dependencies, devDependencies } = parsePackageJson(packageJson); const { dependencies, devDependencies } = parsePackageJson(packageJson);
const additionalFilesToCheck = ["/app.json", "/app.config.js", "/assets"]; const additionalFilesToCheck = ["/app.json", "/app.config.js"];
const additionalFilesExist = additionalFilesToCheck.some((file) => const additionalFilesExist = additionalFilesToCheck.some((file) =>
existsSync(path + file), existsSync(path + file),
); );
const expoDependencyExists = const expoDependencyExists =
dependencies["expo"] || !!dependencies["expo"] ||
devDependencies["expo"] || !!devDependencies["expo"] ||
additionalFilesExist || additionalFilesExist ||
false; false;
@@ -12,14 +12,14 @@ export default class FastAPIDetector implements FrameworkDetector {
packageManager, packageManager,
); );
const additionalFilesToCheck = ["/app.py", "/main.py"]; const additionalFilesToCheck: string[] = [];
const additionalFilesExist = additionalFilesToCheck.some((file) => const additionalFilesExist = additionalFilesToCheck.some((file) =>
existsSync(path + file), existsSync(path + file),
); );
return ( return (
dependencies.includes("fastapi") || !!dependencies.find(dep => dep.includes("fastapi")) ||
devDependencies.includes("fastapi") || !!devDependencies.find(dep => dep.includes("fastapi")) ||
additionalFilesExist || additionalFilesExist ||
false false
); );
@@ -16,19 +16,14 @@ export default class FastifyDetector implements FrameworkDetector {
const packageJson = readFileSync(packageJsonPath); const packageJson = readFileSync(packageJsonPath);
const { dependencies, devDependencies } = parsePackageJson(packageJson); const { dependencies, devDependencies } = parsePackageJson(packageJson);
const additionalFilesToCheck = [ const additionalFilesToCheck: string[] = [];
"/server.js",
"/app.js",
"/server.ts",
"/app.ts",
];
const additionalFilesExist = additionalFilesToCheck.some((file) => const additionalFilesExist = additionalFilesToCheck.some((file) =>
existsSync(path + file), existsSync(path + file),
); );
const fastifyDependencyExists = const fastifyDependencyExists =
dependencies["fastify"] || !!dependencies["fastify"] ||
devDependencies["fastify"] || !!devDependencies["fastify"] ||
additionalFilesExist || additionalFilesExist ||
false; false;
@@ -12,14 +12,14 @@ export default class FlaskDetector implements FrameworkDetector {
packageManager, packageManager,
); );
const additionalFilesToCheck = ["/app.py", "/application.py"]; const additionalFilesToCheck: string[] = [];
const additionalFilesExist = additionalFilesToCheck.some((file) => const additionalFilesExist = additionalFilesToCheck.some((file) =>
existsSync(path + file), existsSync(path + file),
); );
return ( return (
dependencies.includes("flask") || !!dependencies.find(dep => dep.includes("Flask")) ||
devDependencies.includes("flask") || !!devDependencies.find(dep => dep.includes("Flask")) ||
additionalFilesExist || additionalFilesExist ||
false false
); );
@@ -22,8 +22,8 @@ export default class GatsbyDetector implements FrameworkDetector {
); );
const gatsbyDependencyExists = const gatsbyDependencyExists =
dependencies["gatsby"] || !!dependencies["gatsby"] ||
devDependencies["gatsby"] || !!devDependencies["gatsby"] ||
additionalFilesExist || additionalFilesExist ||
false; false;
@@ -16,14 +16,14 @@ export default class HardhatDetector implements FrameworkDetector {
const packageJson = readFileSync(packageJsonPath); const packageJson = readFileSync(packageJsonPath);
const { dependencies, devDependencies } = parsePackageJson(packageJson); const { dependencies, devDependencies } = parsePackageJson(packageJson);
const additionalFilesToCheck = ["/hardhat.config.js", "/contracts/"]; const additionalFilesToCheck = ["/hardhat.config.js"];
const additionalFilesExist = additionalFilesToCheck.some((file) => const additionalFilesExist = additionalFilesToCheck.some((file) =>
existsSync(path + file), existsSync(path + file),
); );
const hardhatDependencyExists = const hardhatDependencyExists =
dependencies["hardhat"] || !!dependencies["hardhat"] ||
devDependencies["hardhat"] || !!devDependencies["hardhat"] ||
additionalFilesExist || additionalFilesExist ||
false; false;
@@ -22,8 +22,8 @@ export default class NextDetector implements FrameworkDetector {
); );
const nextDependencyExists = const nextDependencyExists =
dependencies["next"] || !!dependencies["next"] ||
devDependencies["next"] || !!devDependencies["next"] ||
additionalFilesExist || additionalFilesExist ||
false; false;
@@ -18,8 +18,8 @@ export default class PopulusDetector implements FrameworkDetector {
); );
return ( return (
dependencies.includes("populus") || !!dependencies.find(dep => dep === "populus") ||
devDependencies.includes("populus") || !!devDependencies.find(dep => dep === "populus") ||
additionalFilesExist || additionalFilesExist ||
false false
); );

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