Version Packages (#858)

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

packages/chains/chains/1071.ts

@@ -0,0 +1,38 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "ShimmerEVM Testnet",
+  "title": "ShimmerEVM Testnet",
+  "chain": "ShimmerEVM",
+  "icon": {
+    "url": "ipfs://bafkreibky2sy6qhi6arktayvologkrgu5kudpgdxfkx4uosbvmstz7v4di",
+    "width": 720,
+    "height": 720,
+    "format": "png"
+  },
+  "rpc": [
+    "https://shimmerevm-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://json-rpc.evm.testnet.shimmer.network"
+  ],
+  "faucets": [
+    "https://evm-toolkit.evm.testnet.shimmer.network",
+    "https://evm-faucet.testnet.shimmer.network"
+  ],
+  "nativeCurrency": {
+    "name": "SMR",
+    "symbol": "SMR",
+    "decimals": 18
+  },
+  "infoURL": "https://shimmer.network",
+  "shortName": "shimmerevm-testnet",
+  "chainId": 1071,
+  "networkId": 1071,
+  "explorers": [
+    {
+      "name": "explorer",
+      "url": "https://explorer.evm.testnet.shimmer.network",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": true,
+  "slug": "shimmerevm-testnet"
+} as const satisfies Chain;

packages/chains/chains/138.ts

@@ -0,0 +1,47 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Defi Oracle Meta Mainnet",
+  "chain": "dfiometa",
+  "icon": {
+    "url": "ipfs://QmYrMRnjQJcNkYq9AvZ2FQ9kzYj9szzP4YDmyNA1ybd8xE",
+    "width": 1000,
+    "height": 1043,
+    "format": "png"
+  },
+  "rpc": [
+    "https://defi-oracle-meta.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.public-0138.defi-oracle.io",
+    "wss://rpc.public-0138.defi-oracle.io"
+  ],
+  "features": [
+    {
+      "name": "EIP155"
+    },
+    {
+      "name": "EIP1559"
+    }
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Ether",
+    "symbol": "ETH",
+    "decimals": 18
+  },
+  "infoURL": "https://defi-oracle.io/",
+  "shortName": "dfio-meta-main",
+  "chainId": 138,
+  "networkId": 1,
+  "slip44": 60,
+  "ens": {
+    "registry": "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85"
+  },
+  "explorers": [
+    {
+      "name": "Quorum Explorer",
+      "url": "https://public-0138.defi-oracle.io",
+      "standard": "none"
+    }
+  ],
+  "testnet": false,
+  "slug": "defi-oracle-meta"
+} as const satisfies Chain;

packages/chains/chains/2138.ts

@@ -0,0 +1,47 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Defi Oracle Meta Testnet",
+  "chain": "dfiometatest",
+  "icon": {
+    "url": "ipfs://QmYrMRnjQJcNkYq9AvZ2FQ9kzYj9szzP4YDmyNA1ybd8xE",
+    "width": 1000,
+    "height": 1043,
+    "format": "png"
+  },
+  "rpc": [
+    "https://defi-oracle-meta-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://rpc.public-2138.defi-oracle.io",
+    "wss://rpc.public-2138.defi-oracle.io"
+  ],
+  "features": [
+    {
+      "name": "EIP155"
+    },
+    {
+      "name": "EIP1559"
+    }
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "testEther",
+    "symbol": "tETH",
+    "decimals": 18
+  },
+  "infoURL": "https://defi-oracle.io/",
+  "shortName": "dfio-meta-test",
+  "chainId": 2138,
+  "networkId": 21,
+  "slip44": 60,
+  "ens": {
+    "registry": "0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85"
+  },
+  "explorers": [
+    {
+      "name": "Quorum Explorer",
+      "url": "https://public-2138.defi-oracle.io",
+      "standard": "none"
+    }
+  ],
+  "testnet": true,
+  "slug": "defi-oracle-meta-testnet"
+} as const satisfies Chain;

packages/chains/chains/224168.ts

@@ -0,0 +1,34 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Taf ECO Chain Mainnet",
+  "chain": "Taf ECO Chain",
+  "icon": {
+    "url": "ipfs://bafkreigpxhu7glccsislhjqpl5fnsfmj2io4cy33blhky642uiuyojossy",
+    "width": 400,
+    "height": 400,
+    "format": "png"
+  },
+  "rpc": [
+    "https://taf-eco-chain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://mainnet.tafchain.com/v1"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Taf ECO Chain Mainnet",
+    "symbol": "TAFECO",
+    "decimals": 18
+  },
+  "infoURL": "https://www.tafchain.com",
+  "shortName": "TAFECO",
+  "chainId": 224168,
+  "networkId": 224168,
+  "explorers": [
+    {
+      "name": "Taf ECO Chain Mainnet",
+      "url": "https://ecoscan.tafchain.com",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": false,
+  "slug": "taf-eco-chain"
+} as const satisfies Chain;

packages/chains/chains/2357.ts

@@ -0,0 +1,38 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "WEMIX Kanvas Sepolia",
+  "title": "WEMIX Kanvas Testnet Sepolia",
+  "chainId": 2357,
+  "shortName": "kanvas-aqua",
+  "chain": "ETH",
+  "networkId": 2357,
+  "nativeCurrency": {
+    "name": "Sepolia Ether",
+    "symbol": "ETH",
+    "decimals": 18
+  },
+  "rpc": [
+    "https://wemix-kanvas-sepolia.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://api.aqua.wemixkanvas.io"
+  ],
+  "faucets": [],
+  "infoURL": "https://wemixkanvas.io",
+  "explorers": [
+    {
+      "name": "blockscout",
+      "url": "https://blockscout.aqua.wemixkanvas.io",
+      "standard": "EIP3091"
+    }
+  ],
+  "parent": {
+    "type": "L2",
+    "chain": "eip155-11155111",
+    "bridges": [
+      {
+        "url": "https://wemixkanvas.io/bridge"
+      }
+    ]
+  },
+  "testnet": true,
+  "slug": "wemix-kanvas-sepolia"
+} as const satisfies Chain;

packages/chains/chains/47.ts

@@ -0,0 +1,36 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Acria IntelliChain",
+  "chain": "AIC",
+  "rpc": [
+    "https://acria-intellichain.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://aic.acria.ai"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "ACRIA",
+    "symbol": "ACRIA",
+    "decimals": 18
+  },
+  "features": [
+    {
+      "name": "EIP155"
+    },
+    {
+      "name": "EIP1559"
+    }
+  ],
+  "infoURL": "https://acria.ai",
+  "shortName": "aic",
+  "chainId": 47,
+  "networkId": 47,
+  "explorers": [
+    {
+      "name": "Acria IntelliChain-Explorer",
+      "url": "https://explorer.acria.ai",
+      "standard": "EIP3091"
+    }
+  ],
+  "testnet": false,
+  "slug": "acria-intellichain"
+} as const satisfies Chain;

packages/chains/chains/7701.ts

@@ -0,0 +1,28 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "Canto Tesnet",
+  "chain": "Canto",
+  "rpc": [
+    "https://canto-tesnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://testnet-archive.plexnode.wtf"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "Testnet Canto",
+    "symbol": "CANTO",
+    "decimals": 18
+  },
+  "infoURL": "https://canto.io",
+  "shortName": "TestnetCanto",
+  "chainId": 7701,
+  "networkId": 7701,
+  "explorers": [
+    {
+      "name": "Canto Testnet EVM Explorer (Blockscout)",
+      "url": "https://testnet.tuber.build",
+      "standard": "none"
+    }
+  ],
+  "testnet": true,
+  "slug": "canto-tesnet"
+} as const satisfies Chain;

packages/chains/chains/910.ts

@@ -0,0 +1,21 @@
+import type { Chain } from "../src/types";
+export default {
+  "name": "DecentraBone Layer1 Testnet",
+  "chain": "DBONE",
+  "rpc": [
+    "https://decentrabone-layer1-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
+    "https://layer1test.decentrabone.com"
+  ],
+  "faucets": [],
+  "nativeCurrency": {
+    "name": "DecentraBone",
+    "symbol": "DBONE",
+    "decimals": 18
+  },
+  "infoURL": "https://decentrabone.com",
+  "shortName": "DBONE",
+  "chainId": 910,
+  "networkId": 910,
+  "testnet": true,
+  "slug": "decentrabone-layer1-testnet"
+} as const satisfies Chain;

packages/cli/CHANGELOG.md

@@ -1,5 +1,13 @@
 # thirdweb
 
+## 0.10.8
+
+### Patch Changes
+
+- [#857](https://github.com/thirdweb-dev/js/pull/857) [`3a0e904f`](https://github.com/thirdweb-dev/js/commit/3a0e904fc2bae5134ba3bf65ba666c3360e4fced) Thanks [@adam-maj](https://github.com/adam-maj)! - Add skip intro flag to generate command and fix ABI cache regex
+
+- [#860](https://github.com/thirdweb-dev/js/pull/860) [`058e4357`](https://github.com/thirdweb-dev/js/commit/058e4357c783911a6cab6b38c6eebbb3277dfe93) Thanks [@iketw](https://github.com/iketw)! - [CLI] Only checks ruby version and attempts to run pod install if the platform is macOS
+
 ## 0.10.7
 
 ### Patch Changes

packages/cli/package.json

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

packages/cli/src/create/helpers/create-app.ts

@@ -62,6 +62,24 @@ export async function createApp({
     }
   }
 
+  const isReactNative =
+    template?.includes("react-native") || framework === "react-native";
+  function isReactNativeCLI() {
+    return (
+      isReactNative &&
+      (language === "typescript" || (template && !template.includes("expo")))
+    );
+  }
+
+  function isMacOS() {
+    return process.platform === "darwin";
+  }
+
+  if (isReactNativeCLI() && isMacOS()) {
+    // fail early if the user doesn't have the right version of Ruby installed on macOS
+    await checkRubyVersion();
+  }
+
   const root = path.resolve(appPath);
 
   if (!(await isWriteable(path.dirname(root)))) {
@@ -98,20 +116,6 @@ export async function createApp({
     );
   }
 
-  const isReactNative =
-    template?.includes("react-native") || framework === "react-native";
-  function isReactNativeCLI() {
-    return (
-      isReactNative &&
-      (language === "typescript" || (template && !template.includes("expo")))
-    );
-  }
-
-  if (isReactNativeCLI()) {
-    // fail early if the user doesn't have the right version of Ruby installed
-    await checkRubyVersion();
-  }
-
   if (template) {
     /**
      * If a template repository is provided, clone it.
@@ -199,7 +203,7 @@ export async function createApp({
     console.log();
   }
 
-  if (isReactNativeCLI()) {
+  if (isReactNativeCLI() && isMacOS()) {
     await podInstall(root, isOnline);
   }
 

packages/cli/src/generate/command.ts

@@ -97,7 +97,7 @@ export async function generate(options: GenerateOptions) {
     }
 
     const file = fs.readFileSync(filePath, "utf-8");
-    const abiRegex = /GENERATED_ABI = \{.*\}/s;
+    const abiRegex = /GENERATED_ABI = \{.*\};\n\n/s;
     const contractAbis = metadata.reduce((acc, contract) => {
       acc[contract.address] = contract.metadata.abi;
       return acc;
@@ -105,8 +105,9 @@ export async function generate(options: GenerateOptions) {
     const updatedAbis = JSON.stringify(contractAbis, null, 2);
     const updatedFile = file.replace(
       abiRegex,
-      `GENERATED_ABI = ${updatedAbis}`,
+      `GENERATED_ABI = ${updatedAbis};\n\n`,
     );
+
     fs.writeFileSync(filePath, updatedFile);
   });
 
@@ -141,8 +142,8 @@ export async function generate(options: GenerateOptions) {
 
   const postinstall = packageJson.scripts?.postinstall
     ? packageJson.scripts.postinstall +
-      ` && npx thirdweb generate --skip-update-check`
-    : `npx thirdweb generate --skip-update-check`;
+      ` && export THIRDWEB_CLI_SKIP_INTRO=true && npx thirdweb generate --skip-update-check`
+    : `export THIRDWEB_CLI_SKIP_INTRO=true && npx thirdweb generate --skip-update-check`;
 
   fs.writeFileSync(
     packageJsonPath,