Version Packages (#1446)

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

packages/auth/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @thirdweb-dev/auth
 
+## 3.2.26
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @thirdweb-dev/wallets@1.1.9
+
+## 3.2.25
+
+### Patch Changes
+
+- Updated dependencies [[`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb)]:
+  - @thirdweb-dev/wallets@1.1.8
+
 ## 3.2.24
 
 ### Patch Changes

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/auth",
-  "version": "3.2.24",
+  "version": "3.2.26",
   "main": "dist/thirdweb-dev-auth.cjs.js",
   "module": "dist/thirdweb-dev-auth.esm.js",
   "browser": {

packages/chains/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @thirdweb-dev/chains
 
+## 0.1.41
+
+### Patch Changes
+
+- [#1436](https://github.com/thirdweb-dev/js/pull/1436) [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Updated chains
+
+- [#1432](https://github.com/thirdweb-dev/js/pull/1432) [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5) Thanks [@jnsdls](https://github.com/jnsdls)! - update chains
+
 ## 0.1.40
 
 ### Patch Changes

packages/chains/chains/1379.ts

@@ -1,6 +1,6 @@
 import type { Chain } from "../src/types";
 export default {
-  "name": "Kalar Chain Mainnet",
+  "name": "Kalar Chain",
   "chain": "KLC",
   "icon": {
     "url": "ipfs://bafkreihfoy2kgf2rebaoicso7z5h7ju46z6gtr64mskkths3qbfkrtnkjm",
@@ -10,7 +10,7 @@ export default {
   },
   "rpc": [
     "https://kalar-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
-    "http://rpc-api.kalarchain.tech"
+    "https://rpc-api.kalarchain.tech"
   ],
   "faucets": [],
   "nativeCurrency": {

packages/chains/chains/1875.ts

@@ -0,0 +1,34 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "WhiteBIT Network",
+  "chain": "WBT",
+  "rpc": [
+    "https://whitebit-network.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.whitebit.network"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "WhiteBIT Coin",
+    "symbol": "WBT",
+    "decimals": 18
+  },
+  "infoURL": "https://whitebit.network",
+  "shortName": "wbt",
+  "chainId": 1875,
+  "networkId": 1875,
+  "icon": {
+    "url": "ipfs://Qmbi6cqsQyDjkQSoxbNTTUy8WGyVEFqCtATX2aF4KLmCcZ",
+    "width": 512,
+    "height": 512,
+    "format": "png"
+  },
+  "explorers": [
+    {
+      "name": "wb-explorer",
+      "url": "https://explorer.whitebit.network",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": false,
+  "slug": "whitebit-network"
+} as const satisfies Chain;

packages/chains/chains/3441005.ts

@@ -0,0 +1,42 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Manta Pacific Testnet",
+  "chain": "Manta Pacific",
+  "rpc": [
+    "https://manta-pacific-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://manta-testnet.calderachain.xyz/http"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Manta",
+    "symbol": "MANTA",
+    "decimals": 18
+  },
+  "features": [
+    {
+      "name": "EIP155"
+    },
+    {
+      "name": "EIP1559"
+    }
+  ],
+  "infoURL": "https://manta-testnet.caldera.dev/",
+  "shortName": "manta",
+  "chainId": 3441005,
+  "networkId": 3441005,
+  "icon": {
+    "url": "ipfs://QmTckcVTViRZ3NqT36MTt8AvgBSmudrbgU3pi8AaNtthoV",
+    "width": 834,
+    "height": 834,
+    "format": "png"
+  },
+  "explorers": [
+    {
+      "name": "manta-testnet Explorer",
+      "url": "https://manta-testnet.calderaexplorer.xyz",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "manta-pacific-testnet"
+} as const satisfies Chain;

packages/chains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/chains",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "main": "dist/thirdweb-dev-chains.cjs.js",
   "module": "dist/thirdweb-dev-chains.esm.js",
   "browser": {

packages/cli/CHANGELOG.md

@@ -1,5 +1,24 @@
 # thirdweb
 
+## 0.11.9
+
+### Patch Changes
+
+- [#1442](https://github.com/thirdweb-dev/js/pull/1442) [`7f54012e`](https://github.com/thirdweb-dev/js/commit/7f54012ec648b727b60784990e71b0efb4690934) Thanks [@Marfuen](https://github.com/Marfuen)! - - Warn users on windows to not use the powershell as there are some compatibility issues with it at the moment.
+  - Warn users if they are pasting a client id instead of a secret key.
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+
+## 0.11.8
+
+### Patch Changes
+
+- [#1443](https://github.com/thirdweb-dev/js/pull/1443) [`8c0dc9c8`](https://github.com/thirdweb-dev/js/commit/8c0dc9c88084efcd184a416ed372c50c2fb8a209) Thanks [@nessup](https://github.com/nessup)! - Switch IPFS download domain used in CLI
+
+- Updated dependencies [[`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744), [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4), [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405), [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907), [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/sdk@3.10.44
+  - @thirdweb-dev/chains@0.1.41
+
 ## 0.11.7
 
 ### Patch Changes

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thirdweb",
   "main": "dist/cli/index.js",
-  "version": "0.11.7",
+  "version": "0.11.9",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/cli/src/auth/index.ts

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import prompts from "prompts";
 import Cache, { CacheEntry } from "sync-disk-cache";
 import { ApiResponse } from "../lib/types";
+import os from "os";
 
 export async function loginUser(
   cache: Cache,
@@ -40,6 +41,10 @@ export function getSession(cache: Cache) {
 
 export async function createSession(cache: Cache) {
   try {
+    const isWindows = os.type() === "Windows_NT";
+    if (isWindows) {
+      console.log(chalk.yellow("Windows detected: if you are using powershell, there are some known issues with it that we are actively working on, please use git bash or the command prompt. Thank you for your understanding."));
+    }
     const response = await prompts({
       type: "invisible",
       name: "apiSecretKey",
@@ -48,6 +53,20 @@ export async function createSession(cache: Cache) {
       )}`,
     });
 
+    const keyPassed = response.apiSecretKey;
+    if (!keyPassed) {
+      console.log(chalk.red("You need to pass an API secret key"));
+      process.exit(1);
+    }
+
+    if (keyPassed.length === 32) {
+      console.log(chalk.red(`This is not a valid secret key. To get your secret key
+1. Create an API key at https://thirdweb.com/create-api-key 
+2. Store and copy your Secret Key. This will be shown only once.
+3. Paste it in the CLI when prompted`));
+      process.exit(1);
+    }
+
     try {
       await validateKey(response.apiSecretKey);
     } catch (error) {

packages/cli/src/deploy/app.ts

@@ -70,10 +70,7 @@ export async function deployApp(
 
   try {
     const uri = await upload(storage, distPath);
-    return `${uri.replace(
-      "ipfs://",
-      "https://ipfs-public.thirdwebcdn.com/ipfs/",
-    )}`;
+    return storage.resolveScheme(uri);
   } catch (err) {
     console.error("Can't upload project", err);
     return Promise.reject("Can't upload project");

packages/contracts-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @thirdweb-dev/contracts-js
 
+## 1.3.11
+
+### Patch Changes
+
+- [#1432](https://github.com/thirdweb-dev/js/pull/1432) [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5) Thanks [@jnsdls](https://github.com/jnsdls)! - upgrade contracts package
+
 ## 1.3.10
 
 ### Patch Changes

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

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

packages/contracts-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/contracts-js",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "main": "dist/thirdweb-dev-contracts-js.cjs.js",
   "module": "dist/thirdweb-dev-contracts-js.esm.js",
   "browser": {
@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/contracts-js",
   "dependencies": {
-    "@thirdweb-dev/contracts": "3.8.1-0"
+    "@thirdweb-dev/contracts": "3.8.3"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.22.9",

packages/react-core/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @thirdweb-dev/react-core
 
+## 3.14.26
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+  - @thirdweb-dev/wallets@1.1.9
+
+## 3.14.25
+
+### Patch Changes
+
+- [#1423](https://github.com/thirdweb-dev/js/pull/1423) [`2283d210`](https://github.com/thirdweb-dev/js/commit/2283d21027503e047c25df5ebb21bdde0734be9e) Thanks [@nkrishang](https://github.com/nkrishang)! - Create useAccountAdmins hook
+
+- [#1429](https://github.com/thirdweb-dev/js/pull/1429) [`ab36d84f`](https://github.com/thirdweb-dev/js/commit/ab36d84f1ce5647fa52475b4a35ea29d5007ad9b) Thanks [@iketw](https://github.com/iketw)! - Pass secretKey in the React SDK for server-side rendering
+
+- [#1437](https://github.com/thirdweb-dev/js/pull/1437) [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf) Thanks [@farhanW3](https://github.com/farhanW3)! - Updated the error messages
+
+- Updated dependencies [[`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744), [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4), [`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405), [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907), [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/sdk@3.10.44
+  - @thirdweb-dev/wallets@1.1.8
+  - @thirdweb-dev/chains@0.1.41
+
 ## 3.14.24
 
 ### Patch Changes

packages/react-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react-core",
-  "version": "3.14.24",
+  "version": "3.14.26",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-core",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/react-core/src/core/providers/thirdweb-provider.tsx

@@ -161,6 +161,7 @@ export const ThirdwebProviderCore = <TChains extends Chain[]>({
           storageInterface={props.storageInterface}
           authConfig={props.authConfig}
           clientId={props.clientId}
+          secretKey={props.secretKey}
         >
           <ThirdwebAuthProvider value={props.authConfig}>
             {props.children}

packages/react-core/src/core/providers/thirdweb-wallet-provider.tsx

@@ -321,6 +321,7 @@ export function ThirdwebWalletProvider(
               },
             );
           } catch (e) {
+            console.error("Failed to auto connect wallet");
             console.error(e);
             setConnectionStatus("disconnected");
             return;
@@ -349,6 +350,7 @@ export function ThirdwebWalletProvider(
         });
         setConnectedWallet(wallet, walletInfo.connectParams, true);
       } catch (e) {
+        console.error("Failed to auto connect wallet");
         console.error(e);
         lastConnectedWalletStorage.removeItem(
           LAST_CONNECTED_WALLET_STORAGE_KEY,

packages/react-core/src/evm/hooks/async/account.ts

@@ -21,13 +21,14 @@ import type {
   SmartContract,
 } from "@thirdweb-dev/sdk";
 import invariant from "tiny-invariant";
+import { WalletAddress } from "../../types";
 
 /** **********************/
 /**       READ HOOKS    **/
 /** **********************/
 
 /**
- * Get all accounts
+ * Get all signers of account
  *
  * @example
  * ```javascript
@@ -50,7 +51,7 @@ export function useAccountSigners(
       requiredParamInvariant(contract, "No Contract instance provided");
       invariant(
         contract.account.getAllSigners,
-        "Contract instance does not support contract.account.getSignersWithRestrictions",
+        "Contract instance does not support contract.account.getAllSigners",
       );
       return contract.account.getAllSigners();
     },
@@ -58,6 +59,71 @@ export function useAccountSigners(
   );
 }
 
+/**
+ * Get all admins of account
+ *
+ * @example
+ * ```javascript
+ * const { data: accounts, isLoading, error } = useAccountSigners(contract);
+ * ```
+ *
+ * @param contract - an instance of a account
+ * @returns a response object that includes an array of all admins of the provided account
+ * @twfeature Account
+ * @see {@link https://portal.thirdweb.com/react/react.useaccountadmins?utm_source=sdk | Documentation}
+ * @beta
+ */
+export function useAccountAdmins(
+  contract: RequiredParam<SmartContract>,
+): UseQueryResult<WalletAddress[]> {
+  const contractAddress = contract?.getAddress();
+  return useQueryWithNetwork(
+    cacheKeys.contract.account.signers(contractAddress),
+    () => {
+      requiredParamInvariant(contract, "No Contract instance provided");
+      invariant(
+        contract.account.getAllAdmins,
+        "Contract instance does not support contract.account.getAllAdmins",
+      );
+      return contract.account.getAllAdmins();
+    },
+    { enabled: !!contract },
+  );
+}
+
+/**
+ * Get all signers and admins of account
+ *
+ * @example
+ * ```javascript
+ * const { data: accounts, isLoading, error } = useAccountSigners(contract);
+ * ```
+ *
+ * @param contract - an instance of a account
+ * @returns a response object that includes an array of all admins of the provided account
+ * @twfeature Account
+ * @see {@link https://portal.thirdweb.com/react/react.useaccountadmins?utm_source=sdk | Documentation}
+ * @beta
+ */
+export function useAccountAdminsAndSigners(
+  contract: RequiredParam<SmartContract>,
+): UseQueryResult<SignerWithPermissions[]> {
+  const contractAddress = contract?.getAddress();
+  return useQueryWithNetwork(
+    cacheKeys.contract.account.signers(contractAddress),
+    () => {
+      requiredParamInvariant(contract, "No Contract instance provided");
+      invariant(
+        contract.account.getAllAdminsAndSigners,
+        "Contract instance does not support contract.account.getAllAdminsAndSigners",
+      );
+
+      return contract.account.getAllAdminsAndSigners();
+    },
+    { enabled: !!contract },
+  );
+}
+
 /** **********************/
 /**     WRITE HOOKS     **/
 /** **********************/

packages/react-core/src/evm/index.ts

@@ -203,7 +203,12 @@ export {
 } from "./hooks/async/account-factory";
 
 // account
-export { useAccountSigners, useSetAccountSigners } from "./hooks/async/account";
+export {
+  useAccountSigners,
+  useSetAccountSigners,
+  useAccountAdmins,
+  useAccountAdminsAndSigners,
+} from "./hooks/async/account";
 
 // thirdweb hooks (work as long as at least `<ThirdwebSdkProvider>` is used)
 

packages/react-core/src/evm/providers/thirdweb-sdk-provider.tsx

@@ -21,6 +21,7 @@ const WrappedThirdwebSDKProvider = <TChains extends Chain[]>({
   signer,
   children,
   clientId,
+  secretKey,
 }: React.PropsWithChildren<
   { supportedChains: Readonly<TChains> } & Omit<
     ThirdwebSDKProviderProps<TChains>,
@@ -92,7 +93,7 @@ const WrappedThirdwebSDKProvider = <TChains extends Chain[]>({
       // sdk from chainId
       sdk_ = new ThirdwebSDK(
         chainId,
-        { ...mergedOptions, clientId },
+        { ...mergedOptions, clientId, secretKey },
         storageInterface,
       );
     }
@@ -113,7 +114,14 @@ const WrappedThirdwebSDKProvider = <TChains extends Chain[]>({
     (sdk_ as any)._chainId = chainId;
 
     return sdk_;
-  }, [activeChainId, supportedChains, sdkOptions, storageInterface, clientId]);
+  }, [
+    activeChainId,
+    supportedChains,
+    sdkOptions,
+    storageInterface,
+    clientId,
+    secretKey,
+  ]);
 
   useEffect(() => {
     // if we have an sdk and a signer update the signer
@@ -163,7 +171,7 @@ export const ThirdwebSDKProvider = <TChains extends Chain[]>({
 }: React.PropsWithChildren<ThirdwebSDKProviderProps<TChains>>) => {
   if (!clientId) {
     checkClientIdOrSecretKey(
-      "No clientId provided in ThirdwebSDK. You will have limited access to thirdweb's services for storage, RPC, and account abstraction. You can get a clientId from https://thirdweb.com/create-api-key",
+      "No API key. Please provide a clientId. It is required to access thirdweb's services. You can create a key at https://thirdweb.com/create-api-key",
       clientId,
       undefined,
     );

packages/react-core/src/evm/providers/types.ts

@@ -45,4 +45,7 @@ export interface ThirdwebSDKProviderProps<TChains extends Chain[]>
 
   // client Id for thirdweb services
   clientId?: string;
+
+  // pass in a secret key when doing server side rendering
+  secretKey?: string;
 }

packages/react-native-compat/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @thirdweb-dev/react-native-compat
 
+## 0.2.45
+
+## 0.2.44
+
 ## 0.2.43
 
 ## 0.2.42

packages/react-native-compat/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thirdweb-dev/react-native-compat",
   "description": "Shims for Thirdweb in React Native Projects",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "author": "thirdweb eng <[email protected]>",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native-compat",
   "license": "Apache-2.0",

packages/react-native/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @thirdweb-dev/react-native
 
+## 0.2.45
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+  - @thirdweb-dev/react-core@3.14.26
+  - @thirdweb-dev/wallets@1.1.9
+
+## 0.2.44
+
+### Patch Changes
+
+- [#1429](https://github.com/thirdweb-dev/js/pull/1429) [`ab36d84f`](https://github.com/thirdweb-dev/js/commit/ab36d84f1ce5647fa52475b4a35ea29d5007ad9b) Thanks [@iketw](https://github.com/iketw)! - Pass secretKey in the React SDK for server-side rendering
+
+- Updated dependencies [[`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744), [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4), [`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298), [`2283d210`](https://github.com/thirdweb-dev/js/commit/2283d21027503e047c25df5ebb21bdde0734be9e), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`ab36d84f`](https://github.com/thirdweb-dev/js/commit/ab36d84f1ce5647fa52475b4a35ea29d5007ad9b), [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405), [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907), [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/sdk@3.10.44
+  - @thirdweb-dev/wallets@1.1.8
+  - @thirdweb-dev/react-core@3.14.25
+  - @thirdweb-dev/chains@0.1.41
+
 ## 0.2.43
 
 ### Patch Changes

packages/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react-native",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react-native",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/react-native/src/evm/providers/thirdweb-provider.tsx

@@ -18,7 +18,10 @@ import { walletIds } from "@thirdweb-dev/wallets";
 import { ThirdwebStorage } from "../../core/storage/storage";
 
 interface ThirdwebProviderProps<TChains extends Chain[]>
-  extends Omit<ThirdwebProviderCoreProps<TChains>, "supportedWallets"> {
+  extends Omit<
+    ThirdwebProviderCoreProps<TChains>,
+    "supportedWallets" | "secretKey"
+  > {
   /**
    * Wallets that will be supported by the dApp
    * @defaultValue [MetaMaskWallet, CoinbaseWallet]

packages/react/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @thirdweb-dev/react
 
+## 3.14.26
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+  - @thirdweb-dev/react-core@3.14.26
+  - @thirdweb-dev/wallets@1.1.9
+
+## 3.14.25
+
+### Patch Changes
+
+- [#1429](https://github.com/thirdweb-dev/js/pull/1429) [`ab36d84f`](https://github.com/thirdweb-dev/js/commit/ab36d84f1ce5647fa52475b4a35ea29d5007ad9b) Thanks [@iketw](https://github.com/iketw)! - Pass secretKey in the React SDK for server-side rendering
+
+- [#1430](https://github.com/thirdweb-dev/js/pull/1430) [`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576) Thanks [@MananTank](https://github.com/MananTank)! - - Add base-gor as a valid safe address prefix
+  - Log failed to autoconnect error on react-core too
+- Updated dependencies [[`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744), [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4), [`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298), [`2283d210`](https://github.com/thirdweb-dev/js/commit/2283d21027503e047c25df5ebb21bdde0734be9e), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`ab36d84f`](https://github.com/thirdweb-dev/js/commit/ab36d84f1ce5647fa52475b4a35ea29d5007ad9b), [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405), [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907), [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/sdk@3.10.44
+  - @thirdweb-dev/wallets@1.1.8
+  - @thirdweb-dev/react-core@3.14.25
+  - @thirdweb-dev/chains@0.1.41
+
 ## 3.14.24
 
 ### Patch Changes

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/react",
-  "version": "3.14.24",
+  "version": "3.14.26",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/react",
   "author": "thirdweb eng <[email protected]>",
   "license": "Apache-2.0",

packages/react/src/evm/providers/thirdweb-provider.tsx

@@ -56,7 +56,6 @@ interface ThirdwebProviderProps<TChains extends Chain[]>
 export const ThirdwebProvider = <
   TChains extends Chain[] = typeof defaultChains,
 >({
-  clientId: clientId,
   supportedWallets,
   theme,
   children,
@@ -69,7 +68,6 @@ export const ThirdwebProvider = <
       <ThemeProvider theme={theme === "dark" ? darkTheme : lightTheme}>
         <ThirdwebProviderCore
           theme={theme}
-          clientId={clientId}
           supportedWallets={wallets}
           {...restProps}
         >

packages/react/src/wallet/wallets/safe/SelectAccount.tsx

@@ -39,6 +39,7 @@ export const gnosisAddressPrefixToChainId = {
   bnb: 56,
   oeth: 10,
   gor: 5,
+  "base-gor": 84531,
 } as const;
 
 export const SelectAccount: React.FC<{

packages/sdk/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @thirdweb-dev/sdk
 
+## 3.10.45
+
+### Patch Changes
+
+- [#1449](https://github.com/thirdweb-dev/js/pull/1449) [`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Revert sanitizing inputs
+
+## 3.10.44
+
+### Patch Changes
+
+- [#1444](https://github.com/thirdweb-dev/js/pull/1444) [`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Optimize claimConditions.getAll()
+
+- [#1438](https://github.com/thirdweb-dev/js/pull/1438) [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Add sdk.deployer.deployOpenEdition() convenience function
+
+- [#1441](https://github.com/thirdweb-dev/js/pull/1441) [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Sanitize NFT description input strings
+
+- [#1433](https://github.com/thirdweb-dev/js/pull/1433) [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405) Thanks [@iketw](https://github.com/iketw)! - Pass empty string when clientId is undefined
+
+- [#1439](https://github.com/thirdweb-dev/js/pull/1439) [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Expose deployPublishContract alias
+
+- [#1437](https://github.com/thirdweb-dev/js/pull/1437) [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf) Thanks [@farhanW3](https://github.com/farhanW3)! - Updated the error messages
+
+- Updated dependencies [[`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/chains@0.1.41
+  - @thirdweb-dev/contracts-js@1.3.11
+
 ## 3.10.43
 
 ### Patch Changes

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/sdk",
-  "version": "3.10.43",
+  "version": "3.10.45",
   "description": "The main thirdweb SDK.",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/sdk",
   "license": "Apache-2.0",

packages/sdk/src/evm/constants/urls.ts

@@ -60,7 +60,7 @@ export function getChainProvider(
   // if we still don't have an url fall back to just using the chainId or slug in the rpc and try that
   if (!rpcUrl) {
     rpcUrl = `https://${chainId || network}.rpc.thirdweb.com/${
-      options.clientId
+      options.clientId || ""
     }`;
   }
 

packages/sdk/src/evm/core/classes/account.ts

@@ -270,6 +270,39 @@ export class Account<TContract extends IAccountCore>
     );
   }
 
+  /**
+   * Get all admins and non-admin signers with permissions to use the account.
+   *
+   * @example
+   * ```javascript
+   * const allAdminsAndSigners = await contract.account.getAllAdminsAndSigners();
+   * ```
+   *
+   * @returns all admins and non-admin signers with permissions to use the account.
+   *
+   * @twfeature Account
+   */
+  public async getAllAdminsAndSigners(): Promise<SignerWithPermissions[]> {
+    const allAdmins = await this.getAllAdmins();
+    const transformedAdmins: SignerWithPermissions[] = allAdmins.map(
+      (admin) => {
+        return {
+          isAdmin: true,
+          signer: admin,
+          permissions: {
+            startDate: new Date(0),
+            expirationDate: new Date(0),
+            nativeTokenLimitPerTransaction: BigNumber.from(0),
+            approvedCallTargets: [],
+          },
+        };
+      },
+    );
+    const allSigners = await this.getAllSigners();
+
+    return [...transformedAdmins, ...allSigners];
+  }
+
   /*********************************
    * WRITE FUNCTIONS
    ********************************/

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

@@ -158,14 +158,17 @@ export class DropClaimConditions<
         await this.contractWrapper.readContract.claimCondition();
       const startId = currentStartId.toNumber();
       const count = countBn.toNumber();
-      const conditions: AbstractClaimConditionContractStruct[] = [];
+      const conditions: Promise<AbstractClaimConditionContractStruct>[] = [];
       for (let i = startId; i < startId + count; i++) {
-        conditions.push(await this.get(i));
+        conditions.push(this.get(i));
       }
-      const metadata = await this.metadata.get();
-      const decimals = await this.getTokenDecimals();
+      const [metadata, decimals, ...fetchedConditions] = await Promise.all([
+        this.metadata.get(),
+        this.getTokenDecimals(),
+        ...conditions,
+      ]);
       return Promise.all(
-        conditions.map((c) =>
+        fetchedConditions.map((c) =>
           transformResultToClaimCondition(
             c,
             decimals,

packages/sdk/src/evm/core/sdk.ts

@@ -89,6 +89,7 @@ import type {
   DeployOptions,
   DeployMetadata,
   DeployEvent,
+  OpenEditionContractDeployMetadata,
 } from "../types/deploy";
 import type { ContractWithMetadata } from "../types/registry";
 import { DeploySchemaForPrebuiltContractType } from "../contracts";
@@ -113,6 +114,7 @@ import { LoyaltyCardContractDeploy } from "../schema/contracts/loyalty-card";
 import { getDefaultTrustedForwarders } from "../constants";
 import { checkClientIdOrSecretKey } from "../../core/utils/apiKey";
 import { getProcessEnv } from "../../core/utils/process";
+import { DropErc721ContractSchema } from "../schema";
 
 /**
  * The main entry point for the thirdweb SDK
@@ -263,11 +265,11 @@ export class ThirdwebSDK extends RPCConnectionHandler {
     storage?: IThirdwebStorage,
   ) {
     const apiKeyType = typeof window !== "undefined" ? "clientId" : "secretKey";
-    checkClientIdOrSecretKey(
-      `No ${apiKeyType} provided in ThirdwebSDK. You will have limited access to thirdweb's services for storage, RPC, and account abstraction. You can get a ${apiKeyType} from https://thirdweb.com/create-api-key`,
-      options.clientId,
-      options.secretKey,
-    );
+    let warnMessage = `No API key. Please provide a ${apiKeyType}. It is required to access thirdweb's services. You can create a key at https://thirdweb.com/create-api-key`;
+    if (typeof window === "undefined" && !options.secretKey) {
+      warnMessage = `Please provide a secret key instead of the clientId. Create a new API Key at https://thirdweb.com/create-api-key`;
+    }
+    checkClientIdOrSecretKey(warnMessage, options.clientId, options.secretKey);
 
     if (isChainConfig(network)) {
       options = {
@@ -1021,6 +1023,63 @@ export class ContractDeployer extends RPCConnectionHandler {
     },
   );
 
+  /**
+   * Deploys a new OpenEditionERC721 contract
+   *
+   * @remarks Deploys a OpenEdition contract and returns the address of the deployed contract
+   *
+   * @example
+   * ```javascript
+   * const contractAddress = await sdk.deployer.deployOpenEdition({
+   *   name: "My Open Edition",
+   *   primary_sale_recipient: "your-address",
+   * });
+   * ```
+   * @param metadata - the contract metadata
+   * @returns the address of the deployed contract
+   */
+  deployOpenEdition = /* @__PURE__ */ buildDeployTransactionFunction(
+    async (
+      metadata: OpenEditionContractDeployMetadata,
+      options?: DeployOptions,
+    ): Promise<DeployTransaction> => {
+      const parsedMetadata = await DropErc721ContractSchema.deploy.parseAsync(
+        metadata,
+      );
+      const contractURI = await this.storage.upload(parsedMetadata);
+
+      const chainId = (await this.getProvider().getNetwork()).chainId;
+      const trustedForwarders = getDefaultTrustedForwarders(chainId);
+      // add default forwarders to any custom forwarders passed in
+      if (
+        metadata.trusted_forwarders &&
+        metadata.trusted_forwarders.length > 0
+      ) {
+        trustedForwarders.push(...metadata.trusted_forwarders);
+      }
+
+      const signerAddress = await this.getSigner()?.getAddress();
+
+      const deployArgs = [
+        signerAddress,
+        parsedMetadata.name,
+        parsedMetadata.symbol,
+        contractURI,
+        trustedForwarders,
+        parsedMetadata.primary_sale_recipient,
+        parsedMetadata.fee_recipient,
+        parsedMetadata.seller_fee_basis_points,
+      ];
+
+      return await this.deployReleasedContract.prepare(
+        THIRDWEB_DEPLOYER,
+        "OpenEditionERC721",
+        deployArgs,
+        options,
+      );
+    },
+  );
+
   /**
    * Deploys a new SignatureDrop contract
    *
@@ -1457,6 +1516,8 @@ export class ContractDeployer extends RPCConnectionHandler {
    * @param publisherAddress the address of the publisher
    * @param contractName the name of the contract to deploy
    * @param constructorParams the constructor params to pass to the contract
+   *
+   * @deprecated use deployPublishedContract instead
    */
   deployReleasedContract = /* @__PURE__ */ buildDeployTransactionFunction(
     async (
@@ -1479,6 +1540,16 @@ export class ContractDeployer extends RPCConnectionHandler {
     },
   );
 
+  /**
+   * Deploy any published contract by its name
+   * @param publisherAddress the address of the publisher
+   * @param contractName the name of the contract to deploy
+   * @param constructorParams the constructor params to pass to the contract
+   * @param version Optional: the version of the contract to deploy or "latest"
+   * @param options Optional: the deploy options
+   */
+  deployPublishedContract = this.deployReleasedContract;
+
   /**
    * Deploy a proxy contract of a given implementation via the given factory
    * @param factoryAddress

packages/sdk/src/evm/types/account.ts

@@ -23,6 +23,7 @@ export type SignerPermissionsInput = z.input<typeof SignerPermissionsSchema>;
 export type SignerPermissionsOutput = z.output<typeof SignerPermissionsSchema>;
 
 export type SignerWithPermissions = {
+  isAdmin?: boolean;
   signer: string;
   permissions: SignerPermissions;
 };

packages/sdk/src/evm/types/deploy/deploy-metadata.ts

@@ -58,6 +58,53 @@ export interface NFTContractDeployMetadata {
   app_uri?: string;
 }
 
+/**
+ * Options for deploying an OpenEdition contract
+ * @public
+ */
+export interface OpenEditionContractDeployMetadata {
+  /**
+   * name of the contract
+   */
+  name: string;
+  /**
+   * Optional description of the contract
+   */
+  description?: string;
+  /**
+   * Optional image for the contract
+   */
+  image?: FileOrBufferOrString;
+  /**
+   * Optional url for the contract
+   */
+  external_link?: string;
+  /**
+   * Symbol for the NFTs
+   */
+  symbol?: string;
+  /**
+   * Custom gasless trusted forwarder addresses
+   */
+  trusted_forwarders?: AddressOrEns[];
+  /**
+   * The address that will receive the proceeds from primary sales
+   */
+  primary_sale_recipient: AddressOrEns;
+  /**
+   * The address that will receive the proceeds from secondary sales (royalties)
+   */
+  fee_recipient?: AddressOrEns;
+  /**
+   * The percentage (in basis points) of royalties for secondary sales
+   */
+  seller_fee_basis_points?: number;
+  /**
+   * The default app for this contract
+   */
+  app_uri?: string;
+}
+
 /**
  * Options for deploying a Token contract
  * @public

packages/service-utils/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @thirdweb-dev/service-utils
 
+## 0.3.1
+
+### Patch Changes
+
+- [#1447](https://github.com/thirdweb-dev/js/pull/1447) [`b103872d`](https://github.com/thirdweb-dev/js/commit/b103872daff87b032082a433713d16b9dee13082) Thanks [@nessup](https://github.com/nessup)! - Export extractAuthorizationData for CF Workers
+
+## 0.3.0
+
+### Minor Changes
+
+- [#1424](https://github.com/thirdweb-dev/js/pull/1424) [`d01e6396`](https://github.com/thirdweb-dev/js/commit/d01e6396d176a162aaacb10792f0d9abade62a1f) Thanks [@arcoraven](https://github.com/arcoraven)! - Add helper to publish usage events from backend services
+
+### Patch Changes
+
+- [#1440](https://github.com/thirdweb-dev/js/pull/1440) [`5ec0f064`](https://github.com/thirdweb-dev/js/commit/5ec0f064d27acbd5225934dfe8ea2cd2c5af3997) Thanks [@arcoraven](https://github.com/arcoraven)! - [service-utils] Switch to aws4fetch to call AWS services
+
+- [#1437](https://github.com/thirdweb-dev/js/pull/1437) [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf) Thanks [@farhanW3](https://github.com/farhanW3)! - Updated the error messages
+
+- [#1435](https://github.com/thirdweb-dev/js/pull/1435) [`2a3cd62d`](https://github.com/thirdweb-dev/js/commit/2a3cd62dc9af6accae5c2c48ef4956d139a637e4) Thanks [@arcoraven](https://github.com/arcoraven)! - Use string type for gasPricePerUnit
+
 ## 0.2.5
 
 ### Patch Changes

packages/service-utils/README.md

@@ -1 +1,7 @@
-### todo
+# Service Utils
+
+This repository contains utilities that handle common requirements for thirdweb services.
+
+- `/cf-worker`: for use only in Cloudflare Worker services
+- `/node`: for use in self-hosted services
+- `/core`: for use in any service

packages/service-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/service-utils",
-  "version": "0.2.5",
+  "version": "0.3.1",
   "main": "dist/thirdweb-dev-service-utils.cjs.js",
   "module": "dist/thirdweb-dev-service-utils.esm.js",
   "exports": {
@@ -41,6 +41,7 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230724.0",
     "@preconstruct/cli": "2.7.0",
+    "@smithy/types": "^2.0.2",
     "@thirdweb-dev/tsconfig": "workspace:*",
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.1",
@@ -61,5 +62,9 @@
     "build": "tsc && preconstruct build",
     "push": "yalc push",
     "test": "jest"
+  },
+  "dependencies": {
+    "aws4fetch": "^1.0.17",
+    "zod": "^3.20.2"
   }
 }

packages/service-utils/src/cf-worker/index.ts

@@ -12,6 +12,7 @@ import type { AuthorizationResult } from "../core/authorize/types";
 import type { CoreAuthInput } from "../core/types";
 
 export * from "../core/services";
+export * from "./usage";
 
 type WorkerServiceConfig = CoreServiceConfig & {
   kvStore: KVNamespace;
@@ -72,7 +73,7 @@ export async function authorizeWorker(
   });
 }
 
-async function extractAuthorizationData(
+export async function extractAuthorizationData(
   authInput: AuthInput,
 ): Promise<AuthorizationInput> {
   const requestUrl = new URL(authInput.req.url);

packages/service-utils/src/cf-worker/usage.ts

@@ -0,0 +1,96 @@
+import { AwsClient } from "aws4fetch";
+import { z } from "zod";
+
+// Initialize a singleton for aws usage.
+let _aws: AwsClient | undefined;
+function getAws(options: ConstructorParameters<typeof AwsClient>[0]) {
+  if (!_aws) {
+    _aws = new AwsClient(options);
+  }
+  return _aws;
+}
+
+/**
+ * Types
+ */
+const usageEventSchema = z.object({
+  source: z.enum([
+    "wallet",
+    "rpc",
+    "storage",
+    "bundler",
+    "paymaster",
+    "relayer",
+  ]),
+  action: z.string(),
+  accountId: z.string(),
+
+  // Optional
+  apiKeyId: z.string().optional(),
+  creatorWalletAddress: z.string().optional(),
+  clientId: z.string().optional(),
+  walletAddress: z.string().optional(),
+  chainId: z.number().int().positive().optional(),
+  provider: z.string().optional(),
+  mimeType: z.string().optional(),
+  fileSize: z.number().int().nonnegative().optional(),
+  fileCid: z.string().optional(),
+  transactionHash: z.string().optional(),
+  gasLimit: z.number().nonnegative().optional(),
+  gasPricePerUnit: z.string().optional(),
+});
+export type UsageEvent = z.infer<typeof usageEventSchema>;
+
+/**
+ * Publish usage events. Provide the relevant fields for your application.
+ *
+ * Usage in Cloudflare Workers:
+ *    ctx.waitUntil(
+ *      publishUsageEvents(
+ *        [event1, event2],
+ *        { queueUrl, accessKeyId, secretAccessKey },
+ *      )
+ *    )
+ *
+ * @param usageEvents
+ * @param config
+ */
+export async function publishUsageEvents(
+  usageEvents: UsageEvent[],
+  config: {
+    queueUrl: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    region?: string;
+  },
+): Promise<string> {
+  const {
+    queueUrl,
+    accessKeyId,
+    secretAccessKey,
+    region = "us-west-2",
+  } = config;
+
+  const entries = usageEvents.map((event) => ({
+    Id: crypto.randomUUID(),
+    MessageBody: JSON.stringify(event),
+  }));
+
+  const aws = getAws({
+    accessKeyId,
+    secretAccessKey,
+    region,
+  });
+  const res = await aws.fetch(`https://sqs.${region}.amazonaws.com`, {
+    headers: {
+      "X-Amz-Target": "AmazonSQS.SendMessageBatch",
+      "X-Amz-Date": new Date().toISOString(),
+      "Content-Type": "application/x-amz-json-1.0",
+    },
+    body: JSON.stringify({
+      QueueUrl: queueUrl,
+      Entries: entries,
+    }),
+  });
+  return await res.text();
+}

packages/service-utils/src/core/authorize/client.test.ts

@@ -74,7 +74,7 @@ describe("authorizeClient", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      "The bundleId: com.foo.bar, is not authorized for this key. Please update your key permissions on the thirdweb dashboard",
+      "Invalid request: Unauthorized Bundle ID: com.foo.bar. You can view the restrictions on this API key at https://thirdweb.com/create-api-key",
     );
     expect(result.errorCode).toBe("BUNDLE_UNAUTHORIZED");
     expect(result.status).toBe(401);
@@ -93,7 +93,7 @@ describe("authorizeClient", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      "The secret is invalid. Please check you secret-key",
+      "Incorrect key provided. You can view your active API keys at https://thirdweb.com/dashboard/settings",
     );
     expect(result.errorCode).toBe("SECRET_INVALID");
     expect(result.status).toBe(401);
@@ -112,7 +112,7 @@ describe("authorizeClient", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      "The domain: unauthorized.com, is not authorized for this key. Please update your key permissions on the thirdweb dashboard",
+      "Invalid request: Unauthorized domain: unauthorized.com. You can view the restrictions on this API key at https://thirdweb.com/create-api-key",
     );
     expect(result.errorCode).toBe("ORIGIN_UNAUTHORIZED");
     expect(result.status).toBe(401);

packages/service-utils/src/core/authorize/client.ts

@@ -35,7 +35,8 @@ export function authorizeClient(
     if (secretHash !== providedSecretHash) {
       return {
         authorized: false,
-        errorMessage: "The secret is invalid. Please check you secret-key",
+        errorMessage:
+          "Incorrect key provided. You can view your active API keys at https://thirdweb.com/dashboard/settings",
         errorCode: "SECRET_INVALID",
         status: 401,
       };
@@ -77,7 +78,7 @@ export function authorizeClient(
 
     return {
       authorized: false,
-      errorMessage: `The domain: ${origin}, is not authorized for this key. Please update your key permissions on the thirdweb dashboard`,
+      errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
       errorCode: "ORIGIN_UNAUTHORIZED",
       status: 401,
     };
@@ -100,7 +101,7 @@ export function authorizeClient(
 
     return {
       authorized: false,
-      errorMessage: `The bundleId: ${bundleId}, is not authorized for this key. Please update your key permissions on the thirdweb dashboard`,
+      errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
       errorCode: "BUNDLE_UNAUTHORIZED",
       status: 401,
     };

packages/service-utils/src/core/authorize/service.test.ts

@@ -80,7 +80,7 @@ describe("authorizeService", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      'The service "rpc" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.',
+      "Invalid request: Unauthorized service: rpc. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key",
     );
     expect(result.errorCode).toBe("SERVICE_UNAUTHORIZED");
     expect(result.status).toBe(403);
@@ -101,7 +101,7 @@ describe("authorizeService", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      'The service "storage" action "unauthorized-action" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.',
+      "Invalid request: Unauthorized action: storage unauthorized-action. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key",
     );
     expect(result.errorCode).toBe("SERVICE_ACTION_UNAUTHORIZED");
     expect(result.status).toBe(403);
@@ -119,7 +119,7 @@ describe("authorizeService", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      'The target address: unauthorized-target, for service "storage" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.',
+      "Invalid request: Unauthorized address: storage unauthorized-target. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key",
     );
     expect(result.errorCode).toBe("SERVICE_TARGET_ADDRESS_UNAUTHORIZED");
     expect(result.status).toBe(403);
@@ -137,7 +137,7 @@ describe("authorizeService", () => {
     ) as any;
     expect(result.authorized).toBe(false);
     expect(result.errorMessage).toBe(
-      'The target address: target1,target2,target3, for service "storage" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.',
+      "Invalid request: Unauthorized address: storage target1,target2,target3. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key",
     );
     expect(result.errorCode).toBe("SERVICE_TARGET_ADDRESS_UNAUTHORIZED");
     expect(result.status).toBe(403);

packages/service-utils/src/core/authorize/service.ts

@@ -16,7 +16,7 @@ export function authorizeService(
   if (!service) {
     return {
       authorized: false,
-      errorMessage: `The service "${serviceConfig.serviceScope}" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.`,
+      errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope}. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key`,
       errorCode: "SERVICE_UNAUTHORIZED",
       status: 403,
     };
@@ -30,7 +30,7 @@ export function authorizeService(
     if (!isActionAllowed) {
       return {
         authorized: false,
-        errorMessage: `The service "${serviceConfig.serviceScope}" action "${serviceConfig.serviceAction}" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.`,
+        errorMessage: `Invalid request: Unauthorized action: ${serviceConfig.serviceScope} ${serviceConfig.serviceAction}. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key`,
         errorCode: "SERVICE_ACTION_UNAUTHORIZED",
         status: 403,
       };
@@ -52,7 +52,7 @@ export function authorizeService(
     ) {
       return {
         authorized: false,
-        errorMessage: `The target address: ${checkedAddresses}, for service "${serviceConfig.serviceScope}" is not authorized for this key. Please update your key permissions on the thirdweb dashboard.`,
+        errorMessage: `Invalid request: Unauthorized address: ${serviceConfig.serviceScope} ${checkedAddresses}. You can view the restrictions on this API key in your dashboard:  https://thirdweb.com/create-api-key`,
         errorCode: "SERVICE_TARGET_ADDRESS_UNAUTHORIZED",
         status: 403,
       };

packages/service-utils/src/index.ts

@@ -1,2 +1,2 @@
-// only exports the public service definitions
+// Exports the public service definitions.
 export * from "./core/services";

packages/unity-js-bridge/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @thirdweb-dev/unity-js-bridge
 
+## 0.2.63
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+  - @thirdweb-dev/wallets@1.1.9
+  - @thirdweb-dev/auth@3.2.26
+
+## 0.2.62
+
+### Patch Changes
+
+- Updated dependencies [[`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744), [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4), [`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405), [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907), [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/sdk@3.10.44
+  - @thirdweb-dev/wallets@1.1.8
+  - @thirdweb-dev/chains@0.1.41
+  - @thirdweb-dev/auth@3.2.25
+
 ## 0.2.61
 
 ### Patch Changes

packages/unity-js-bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/unity-js-bridge",
-  "version": "0.2.61",
+  "version": "0.2.63",
   "main": "dist/thirdweb-unity-bridge.js",
   "repository": "https://github.com/thirdweb-dev/js/tree/main/packages/unity-js-bridge",
   "license": "Apache-2.0",

packages/wallets/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @thirdweb-dev/wallets
 
+## 1.1.9
+
+### Patch Changes
+
+- Updated dependencies [[`2a91113a`](https://github.com/thirdweb-dev/js/commit/2a91113a760733fcff2aec90041f69e15de33905)]:
+  - @thirdweb-dev/sdk@3.10.45
+
+## 1.1.8
+
+### Patch Changes
+
+- [#1430](https://github.com/thirdweb-dev/js/pull/1430) [`a9f2ff73`](https://github.com/thirdweb-dev/js/commit/a9f2ff73c9f83f05c3e2d3c53b23b2843e8a2576) Thanks [@MananTank](https://github.com/MananTank)! - Handle error on Metamask Disconnect properly
+
+- [#1436](https://github.com/thirdweb-dev/js/pull/1436) [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Better gas estimations pre account deploy
+
+- Updated dependencies [[`a5d0be93`](https://github.com/thirdweb-dev/js/commit/a5d0be939a143095e769b68cf86360bfe4720744), [`c0a6d2f1`](https://github.com/thirdweb-dev/js/commit/c0a6d2f18231310d143c9b0cb1b2ff59315087a4), [`becbb637`](https://github.com/thirdweb-dev/js/commit/becbb637367285ed3d8d7d131e1020bf23e38298), [`fd981655`](https://github.com/thirdweb-dev/js/commit/fd9816556fe595b0c764e34dbcf15b0ad1677edb), [`c9bf4f05`](https://github.com/thirdweb-dev/js/commit/c9bf4f05c161707c6eb799ecef82f462e4a82405), [`67b145b9`](https://github.com/thirdweb-dev/js/commit/67b145b94dafb2fb1d90553ed4829f0ed22e2907), [`5ee700e8`](https://github.com/thirdweb-dev/js/commit/5ee700e80438650fa253c25c0bee6658ce68d2cf), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5), [`9f5adc5c`](https://github.com/thirdweb-dev/js/commit/9f5adc5c5c2782ffb878759df481e5fb1e1740e5)]:
+  - @thirdweb-dev/sdk@3.10.44
+  - @thirdweb-dev/chains@0.1.41
+  - @thirdweb-dev/contracts-js@1.3.11
+
 ## 1.1.7
 
 ### Patch Changes

packages/wallets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdweb-dev/wallets",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "main": "dist/thirdweb-dev-wallets.cjs.js",
   "module": "dist/thirdweb-dev-wallets.esm.js",
   "types": "dist/thirdweb-dev-wallets.cjs.d.ts",

packages/wallets/src/evm/connectors/injected/index.ts

@@ -417,9 +417,13 @@ export class InjectedConnector extends WagmiConnector<
     if ((error as ProviderRpcError).code === 1013) {
       const provider = await this.getProvider();
       if (provider) {
-        const isAuthorized = await this.getAccount();
-        if (isAuthorized) {
-          return;
+        try {
+          const isAuthorized = await this.getAccount();
+          if (isAuthorized) {
+            return;
+          }
+        } catch {
+          // If we can't get the account anymore, continue with disconnect
         }
       }
     }

packages/wallets/src/evm/connectors/smart-wallet/lib/base-api.ts

@@ -206,9 +206,16 @@ export abstract class BaseAccountAPI {
     let callGasLimit;
     const isPhantom = await this.checkAccountPhantom();
     if (isPhantom) {
-      // when the account is not deployed yet, the estimation will return something like 25k gas (revert cost)
-      // there's no way to know the actual cost, so we just use a fixed value of 500k which should cover most txcosts.
-      callGasLimit = BigNumber.from(500_000);
+      // when the account is not deployed yet, we simulate the call to the target contract directly
+      callGasLimit = await this.provider.estimateGas({
+        from: this.getAccountAddress(),
+        to: detailsForUserOp.target,
+        data: detailsForUserOp.data,
+      });
+      // if the estimation is too low, we use a fixed value of 500k
+      if (callGasLimit.lt(30000)) {
+        callGasLimit = BigNumber.from(500000);
+      }
     } else {
       callGasLimit =
         parseNumber(detailsForUserOp.gasLimit) ??

packages/wallets/src/evm/utils/url.ts

@@ -1,3 +1,6 @@
 export function isTwUrl(url: string): boolean {
-    return new URL(url).hostname.endsWith('.thirdweb.com');
-}
+  const host = new URL(url).hostname;
+  return (
+    host.endsWith(".thirdweb.com") || host === "localhost" || host === "0.0.0.0"
+  );
+}