Update Network Information

docs/build/_partials/_metamask_buttons.mdx

@@ -4,6 +4,9 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 <Tabs groupId='network'>
+<TabItem value='iota' label='IOTA EVM'>
+<AddToMetaMaskButton {...Networks['iota']}/>
+</TabItem>
 <TabItem value='iota_testnet' label='IOTA EVM Testnet'>
 <AddToMetaMaskButton {...Networks['iota_testnet']}/>
 </TabItem>

docs/build/getting-started/networks-endpoints.mdx

@@ -41,6 +41,18 @@ This network runs under a [Coordinator PoA scheme](/learn/protocols/coordinator/
 
 <NetworkInfo.L1 {...Networks['iota']}/>
 
+### IOTA EVM
+
+[IOTA EVM](https://explorer.evm.iota.org) is the L2 EVM running on top of the IOTA network.
+
+<AddToMetaMaskButton {...Networks['iota']} />
+
+<NetworkInfo.Evm {...Networks['iota']}/>
+
+#### Additional Info
+
+<NetworkInfo.EvmCustom {...Networks['iota']}/>
+
 ## IOTA Testnet
 
 [The IOTA Testnet](https://explorer.iota.org/iota-testnet) acts as a test bed for builders without any real world value.

docs/build/getting-started/sidebars.ts

@@ -16,54 +16,136 @@ module.exports = {
       },
       items: [
         {
-          type: 'link',
-          label: 'IOTA Sandbox',
-          href: '/iota-sandbox/welcome',
-        },
-        {
-          type: 'link',
-          label: 'CLI Wallet',
-          href: '/cli-wallet/welcome',
-        },
-        {
-          type: 'link',
-          label: 'WASP CLI',
-          href: '/wasp/how-tos/wasp-cli',
-        },
-        {
-          label: 'Schema Tool',
-          type: 'link',
-          href: '/isc/schema/introduction',
+          type: 'category',
+          label: 'EVM Tools',
+          collapsed: false,
+          link: {
+            type: 'generated-index',
+            title: 'EVM Tools',
+            slug: '/tools/evm',
+          },
+          items: [
+            {
+              type: 'category',
+              label: 'IOTA',
+              collapsed: false,
+              link: {
+                type: 'generated-index',
+                title: 'IOTA EVM Tools',
+                slug: '/tools/evm/iota',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.iota.org',
+                },
+                {
+                  label: 'Toolkit',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.iotaledger.net',
+                },
+              ],
+            },
+            {
+              type: 'category',
+              label: 'IOTA Testnet',
+              collapsed: false,
+              link: {
+                type: 'generated-index',
+                title: 'IOTA Testnet EVM Tools',
+                slug: '/tools/evm/iota-testnet',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.testnet.iota.org',
+                },
+                {
+                  label: 'Toolkit & Faucet',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.testnet.iotaledger.net',
+                },
+              ],
+            },
+            {
+              type: 'category',
+              label: 'Shimmer',
+              collapsed: true,
+              link: {
+                type: 'generated-index',
+                title: 'ShimmerEVM Tools',
+                slug: '/tools/evm/shimmer',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.shimmer.network',
+                },
+                {
+                  label: 'Toolkit',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.shimmer.network',
+                },
+              ],
+            },
+            {
+              type: 'category',
+              label: 'Shimmer Testnet',
+              collapsed: true,
+              link: {
+                type: 'generated-index',
+                title: 'ShimmerEVM Testnet Tools',
+                slug: '/tools/evm/shimmer-testnet',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.testnet.shimmer.network',
+                },
+                {
+                  label: 'EVM Testnet Toolkit & Faucet',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.testnet.shimmer.network/',
+                },
+              ],
+            },
+            {
+              label: 'Oracles for IOTA EVM and ShimmerEVM',
+              type: 'doc',
+              id: 'oracles',
+            },
+            {
+              type: 'link',
+              label: 'WASP CLI',
+              description:
+                'Wasp CLI is a command line tool for interacting with the Wasp node.',
+              href: '/wasp/how-tos/wasp-cli',
+            },
+          ],
         },
         {
           label: 'Explorer',
           type: 'link',
           href: 'https://explorer.iota.org',
         },
         {
-          label: 'Shimmer EVM Explorer',
-          type: 'link',
-          href: 'https://explorer.evm.shimmer.network/',
-        },
-        {
-          label: 'Shimmer EVM Toolkit',
+          label: 'IOTA Testnet Faucet',
           type: 'link',
-          href: 'https://evm-toolkit.evm.shimmer.network/',
+          href: 'https://faucet.testnet.iotaledger.net',
         },
         {
-          label: 'Shimmer EVM Testnet Toolkit & Faucet',
           type: 'link',
-          href: 'https://evm-toolkit.evm.testnet.shimmer.network/',
-        },
-        {
-          label: 'Oracles for Shimmer EVM',
-          type: 'doc',
-          id: 'oracles',
+          label: 'CLI Wallet',
+          href: '/cli-wallet/welcome',
         },
         {
-          label: 'Testnet Faucet',
           type: 'link',
-          href: 'https://faucet.testnet.shimmer.network',
+          label: 'IOTA Sandbox',
+          href: '/iota-sandbox/welcome',
         },
       ],
     },

docs/build/iota-sandbox/docs/welcome.md

@@ -21,10 +21,9 @@ It is not for creating production-ready networks.
 
 :::
 
-:::tip Public Testnet
+:::tip Testnet
 
-If possible, 
-you should use the [public testnet](https://wiki.iota.org/build/networks-endpoints/#public-testnet)
+If possible, you should use one of the testnets(/build/networks-endpoints)
 where you can experiment with confidence and community support.
 
 :::

docs/build/isc/v1.0.0-rc.6/docs/_partials/_hardhat_config.md

@@ -4,6 +4,21 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 <Tabs groupId='network'>
+<TabItem value='iota_testnet' label='IOTA EVM Testnet'>
+
+<CodeBlock language="js">
+{`
+networks: {
+    'iotaevm-testnet': {
+        url: '${Networks['iota_testnet'].evm.rpcUrls[0]}',
+        chainId: ${parseInt(Networks['iota_testnet'].evm.chainId)},
+        accounts: [YOUR PRIVATE KEY],
+    },
+}
+`}
+</CodeBlock>
+
+</TabItem>
 <TabItem value='shimmer_testnet' label='ShimmerEVM Testnet'>
 
 <CodeBlock language="js">
@@ -19,14 +34,14 @@ networks: {
 </CodeBlock>
 
 </TabItem>
-<TabItem value='iota_testnet' label='IOTA EVM Testnet'>
+<TabItem value='iota' label='IOTA EVM'>
 
 <CodeBlock language="js">
 {`
 networks: {
-    'iotaevm-testnet': {
-        url: '${Networks['iota_testnet'].evm.rpcUrls[0]}',
-        chainId: ${parseInt(Networks['iota_testnet'].evm.chainId)},
+    'iotaevm': {
+        url: '${Networks['iota'].evm.rpcUrls[0]}',
+        chainId: ${parseInt(Networks['iota'].evm.chainId)},
         accounts: [YOUR PRIVATE KEY],
     },
 }

docs/build/isc/v1.0.0-rc.6/docs/getting-started/compatibility.md

@@ -35,7 +35,8 @@ Here are some of the most important properties and limitations of EVM support in
 
 There is no guaranteed _block time_. A new EVM "block" will be created only when an ISC block is created, and ISC does
 not enforce an average block time. This means that block times are variable; a new block will be created as soon as needed. 
-The average block time on [ShimmerEVM](/build/networks-endpoints#shimmerevm) is 2.8 seconds.
+The average block time on [IOTA EVM](/build/networks-endpoints#iotaevm) and [ShimmerEVM](/build/networks-endpoints#shimmerevm) 
+is 2.8 seconds.
 
 ### The Magic Contract
 

docs/build/isc/v1.0.0-rc.6/docs/getting-started/languages-and-vms.md

@@ -1,10 +1,7 @@
 import EVMCompatibility from '../_admonitions/_EVM_compatibility.md'
-import NetworkWarning from '../_admonitions/_network_warning.md'
 
 # Supported Virtual Machines & Languages
 
-<NetworkWarning/>
-
 The current release of IOTA Smart Contracts has support for [EVM/Solidity](#evmsolidity-based-smart-contracts) smart
 contracts, as well as experimental [Wasm](#wasm-vm-for-isc) smart contracts, providing compatibility with
 existing smart contracts and tooling from other EVM based chains like Ethereum. This allows us to offer the existing 

docs/build/isc/v1.0.0-rc.6/docs/getting-started/networks-and-chains.mdx

@@ -4,7 +4,7 @@ tags:
   - mainnet
   - shimmer
   - devnet
-  - public testnet
+  - EVM Testnet
   - reference
   - Endpoints
 ---
@@ -35,6 +35,69 @@ The other values (network name and currency symbol) can be whatever value you li
 
 :::
 
+## IOTA EVM
+
+[IOTA EVM](https://explorer.evm.iota.org) is the L2 EVM running on top of the IOTA network.
+
+<AddToMetaMaskButton {...Networks['iota']} />
+
+<NetworkInfo.Evm {...Networks['iota']}/>
+
+### Additional Info
+
+<NetworkInfo.EvmCustom {...Networks['iota']}/>
+
+## IOTA EVM Testnet
+
+<AddToMetaMaskButton {...Networks['iota_testnet']} />
+
+[The IOTA EVM Testnet](https://explorer.evm.testnet.iotaledger.net/) runs as a layer 2 on top
+of the [IOTA Testnet](/build/networks-endpoints#iota-testnet). This network uses ISC to facilitate
+
+:::info
+
+This network is subject to occasional resets (no data retention) which are usually announced with a one-week grace period.
+
+:::
+
+<NetworkInfo.Evm {...Networks['iota_testnet']} />
+
+:::note
+
+The other values (network name and currency symbol) can be whatever value you like.
+
+:::
+
+### Additional Info
+
+<NetworkInfo.EvmCustom {...Networks['iota_testnet']}/>
+
+## ShimmerEVM Testnet
+
+<AddToMetaMaskButton {...Networks['shimmer_testnet']} />
+
+[The ShimmerEVM Testnet](https://explorer.evm.testnet.shimmer.network/) runs as a layer 2 on top
+of the [Shimmer Testnet](/build/networks-endpoints#shimmer-testnet). This network uses ISC to facilitate
+an Ethereum Virtual Machine and has an enshrined bridge to layer 1.
+
+:::info
+
+This network is subject to occasional resets (no data retention) which are usually announced with a one-week grace period.
+
+:::
+
+<NetworkInfo.Evm {...Networks['shimmer_testnet']} />
+
+:::note
+
+The other values (network name and currency symbol) can be whatever value you like.
+
+:::
+
+### Additional Info
+
+<NetworkInfo.EvmCustom {...Networks['shimmer_testnet']}/>
+
 ## ShimmerEVM
 
 [ShimmerEVM](https://explorer.evm.shimmer.network/) is the L2 EVM running on top of the Shimmer network.
@@ -43,6 +106,10 @@ The other values (network name and currency symbol) can be whatever value you li
 
 <NetworkInfo.Evm {...Networks['shimmer']} />
 
+### Additional Info
+
+<NetworkInfo.EvmCustom {...Networks['shimmer']}/>
+
 ## ShimmerEVM Testnet
 
 <AddToMetaMaskButton {...Networks['shimmer_testnet']} />
@@ -65,8 +132,12 @@ The other values (network name and currency symbol) can be whatever value you li
 
 :::
 
+### Additional Info
+
+<NetworkInfo.EvmCustom {...Networks['shimmer_testnet']}/>
+
 ## Core Contracts
 
-[ShimmerEVM](#shimmerEVM) and the testnet networks have 7
+[IOTA EVM](#IOTAEVM), [ShimmerEVM](#shimmerEVM) and the testnet networks have 7
 [core contracts](../reference/core-contracts/overview.md) deployed, as well as the
 [Magic Contract](../reference/magic-contract/introduction.md).