Skip to content

Commit

Permalink
Merge branch 'main' into endpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
Dr-Electron committed Jun 4, 2024
2 parents 3199461 + 379a01b commit 391f574
Show file tree
Hide file tree
Showing 24 changed files with 1,437 additions and 85 deletions.
4 changes: 4 additions & 0 deletions config/versionedConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ exports.buildPluginsConfig = [
icon: 'Identity',
subsection: 'build-layer-1',
versions: [
{
label: '1.3',
badges: ['IOTA', 'Shimmer'],
},
{
label: '1.2',
badges: ['IOTA', 'Shimmer'],
Expand Down
2 changes: 1 addition & 1 deletion docs/build/_partials/_metamask_buttons.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Networks } from '@theme/constant';
import Tabs from '@theme/Tabs';
import TabItem from '@theme/TabItem';

<Tabs groupId='network'>
<Tabs groupId='network' queryString>
<TabItem value='iota' label='IOTA EVM'>
<AddToMetaMaskButton {...Networks['iota']}/>
</TabItem>
Expand Down
2 changes: 1 addition & 1 deletion docs/build/_partials/_oracles_contract_data.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Networks } from '@theme/constant';
import Tabs from '@theme/Tabs';
import TabItem from '@theme/TabItem';

<Tabs groupId='network'>
<Tabs groupId='network' queryString>
<TabItem value='iota' label='IOTA EVM'>

| Contract Type | Contract Address |
Expand Down
24 changes: 12 additions & 12 deletions docs/build/isc/v1.1/docs/_partials/_hardhat_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Networks } from '@theme/constant';
import Tabs from '@theme/Tabs';
import TabItem from '@theme/TabItem';

<Tabs groupId='network'>
<Tabs groupId='network' queryString>
<TabItem value='iota_testnet' label='IOTA EVM Testnet'>

<CodeBlock language="js">
Expand All @@ -19,44 +19,44 @@ networks: {
</CodeBlock>

</TabItem>
<TabItem value='shimmer_testnet' label='ShimmerEVM Testnet'>
<TabItem value='iota' label='IOTA EVM'>

<CodeBlock language="js">
{`
networks: {
'shimmerevm-testnet': {
url: '${Networks['shimmer_testnet'].evm.core.rpcUrls[0]}',
chainId: ${parseInt(Networks['shimmer_testnet'].evm.core.chainId)},
'iotaevm': {
url: '${Networks['iota'].evm.core.rpcUrls[0]}',
chainId: ${parseInt(Networks['iota'].evm.core.chainId)},
accounts: [YOUR PRIVATE KEY],
},
}
`}
</CodeBlock>

</TabItem>
<TabItem value='iota' label='IOTA EVM'>
<TabItem value='shimmer' label='ShimmerEVM'>

<CodeBlock language="js">
{`
networks: {
'iotaevm': {
url: '${Networks['iota'].evm.core.rpcUrls[0]}',
chainId: ${parseInt(Networks['iota'].evm.core.chainId)},
'shimmerevm': {
url: '${Networks['shimmer'].evm.core.rpcUrls[0]}',
chainId: ${parseInt(Networks['shimmer'].evm.core.chainId)},
accounts: [YOUR PRIVATE KEY],
},
}
`}
</CodeBlock>

</TabItem>
<TabItem value='shimmer' label='ShimmerEVM'>
<TabItem value='shimmer_testnet' label='ShimmerEVM Testnet'>

<CodeBlock language="js">
{`
networks: {
'shimmerevm': {
url: '${Networks['shimmer'].evm.core.rpcUrls[0]}',
chainId: ${parseInt(Networks['shimmer'].evm.core.chainId)},
url: '${Networks['shimmer_testnet'].evm.core.rpcUrls[0]}',
chainId: ${parseInt(Networks['shimmer_testnet'].evm.core.chainId)},
accounts: [YOUR PRIVATE KEY],
},
}
Expand Down
2 changes: 0 additions & 2 deletions docs/build/isc/v1.1/docs/getting-started/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ 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 [IOTA EVM](/build/networks-endpoints#iotaevm) and [ShimmerEVM](/build/networks-endpoints#shimmerevm)
is 2.8 seconds.

### The Magic Contract

Expand Down
34 changes: 19 additions & 15 deletions docs/build/isc/v1.1/docs/getting-started/quick-start.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
description: This guide will help you quickly get started with the EVM Testnets
description: This guide will help you quickly get started with the EVM
image: /img/logo/WASP_logo_dark.png
tags:
- quickstart
Expand All @@ -19,9 +19,9 @@ import Tabs from '@theme/Tabs';
import TabItem from '@theme/TabItem';
import Link from '@docusaurus/Link';

# EVM Testnets Quickstart Guide
# EVM Quickstart Guide

This guide will help you quickly get started with our [EVM Testnets](/build/networks-endpoints), where you can deploy and interact with EVM-compatible smart contracts.
This guide will help you quickly get started with our EVM, where you can deploy and interact with EVM-compatible smart contracts.

## Prerequisites

Expand All @@ -39,34 +39,38 @@ Please read [the MetaMask section in the tools guide](tools.mdx#metamask) for a

:::

## Get Testnet Tokens
## Deploy and Interact with Smart Contracts

:::tip Fund your testnet account

If you want to fund your EVM testnet account, please refer to our [How To Get Funds guide](../how-tos/send-funds-from-L1-to-L2.mdx).

:::
If you are using one of the testnets you can just use the the toolkit to get testnet tokens.

1. Go to the [IOTA EVM](https://evm-toolkit.evm.testnet.iotaledger.net) or [ShimmerEVM](https://evm-toolkit.evm.testnet.shimmer.network/) Testnet Toolkit.
2. Connect your MetaMask wallet by clicking "Connect Wallet" or paste an EVM address.
3. Select the account you want to receive testnet tokens.
4. Click "Send funds" to get testnet tokens.

## Deploy and Interact with Smart Contracts
:::

You can now use your testnet tokens and simulated bridged tokens to deploy and interact with smart contracts on the testnets. Utilize popular development tools and frameworks, such as [Hardhat](https://hardhat.org/), or [Remix](https://remix.ethereum.org/), to build, test, and deploy your smart contracts.
You can now deploy and interact with smart contracts. Utilize popular development tools and frameworks, such as [Hardhat](https://hardhat.org/), or [Remix](https://remix.ethereum.org/), to build, test, and deploy your smart contracts.

<DeployAdmonition />

## Explore the Public Testnet
## Explore the Network

Visit the corresponding Testnet Block Explorer to monitor the chain, track transactions, and explore deployed smart contracts.
Visit the corresponding Block Explorer to monitor the chain, track transactions, and explore deployed smart contracts.

<Tabs groupId='network'>
<TabItem value='iotaEVMTestnet' label='IOTA EVM Testnet'>
<Tabs groupId='network' queryString>
<TabItem value='iota' label='IOTA EVM'>
<Link to={Networks['iota'].evm.core.blockExplorerUrls[0]}>Explorer</Link>
</TabItem>
<TabItem value='iota_testnet' label='IOTA EVM Testnet'>
<Link to={Networks['iota_testnet'].evm.core.blockExplorerUrls[0]}>Explorer</Link>
</TabItem>
<TabItem value='shimmerEVMTestnet' label='ShimmerEVM Testnet'>
<TabItem value='shimmer' label='ShimmerEVM'>
<Link to={Networks['shimmer'].evm.core.blockExplorerUrls[0]}>Explorer</Link>
</TabItem>
<TabItem value='shimmer_testnet' label='ShimmerEVM Testnet'>
<Link to={Networks['shimmer_testnet'].evm.core.blockExplorerUrls[0]}>Explorer</Link>
</TabItem>
</Tabs>
Expand All @@ -76,4 +80,4 @@ Visit the corresponding Testnet Block Explorer to monitor the chain, track trans
- [GitHub issues page for Wasp](https://github.com/iotaledger/wasp/issues)
- [Firefly](https://firefly.iota.org)

With this quickstart guide, you should now be able to set up and start exploring the [Testnet](/build/networks-endpoints). As you begin to deploy and interact with smart contracts, remember to provide feedback on any issues or improvements you discover to help make our EVM even better. Happy developing!
With this quickstart guide, you should now be able to set up and start exploring the EVM. As you begin to deploy and interact with smart contracts, remember to provide feedback on any issues or improvements you discover to help make our EVM even better. Happy developing!
20 changes: 10 additions & 10 deletions docs/build/isc/v1.1/docs/getting-started/tools.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,20 @@ chain ID after deployment.**

## Network RPCs

<Tabs>
<TabItem value='iotaEVM' label='IOTA EVM'>
<Tabs groupId='network' queryString>
<TabItem value='iota' label='IOTA EVM'>
<AddToMetaMaskButton {...Networks['iota']}/>
<NetworkInfo.Evm {...Networks['iota']}/>
</TabItem>
<TabItem value='iotaEVMTestnet' label='IOTA EVM Testnet'>
<TabItem value='iota_testnet' label='IOTA EVM Testnet'>
<AddToMetaMaskButton {...Networks['iota_testnet']}/>
<NetworkInfo.Evm {...Networks['iota_testnet']}/>
</TabItem>
<TabItem value='shimmerEVM' label='ShimmerEVM'>
<TabItem value='shimmer' label='ShimmerEVM'>
<AddToMetaMaskButton {...Networks['shimmer']}/>
<NetworkInfo.Evm {...Networks['shimmer']}/>
</TabItem>
<TabItem value='shimmerEVMTestnet' label='ShimmerEVM Testnet'>
<TabItem value='shimmer_testnet' label='ShimmerEVM Testnet'>
<AddToMetaMaskButton {...Networks['shimmer_testnet']}/>
<NetworkInfo.Evm {...Networks['shimmer_testnet']}/>
</TabItem>
Expand Down Expand Up @@ -117,20 +117,20 @@ To use your EVM chain with MetaMask, simply open up MetaMask and click on the ne
the bottom of this list, you will see the option `Add network`. On the new page you will see a list of popular network with the option `Add a network manually`.
For example this would be the configs to add our different [EVM chains](/build/networks-endpoints):

<Tabs>
<TabItem value='iotaEVM' label='IOTA EVM'>
<Tabs groupId='network' queryString>
<TabItem value='iota' label='IOTA EVM'>
<AddToMetaMaskButton {...Networks['iota']}/>
<NetworkInfo.Evm {...Networks['iota']}/>
</TabItem>
<TabItem value='iotaEVMTestnet' label='IOTA EVM Testnet'>
<TabItem value='iota_testnet' label='IOTA EVM Testnet'>
<AddToMetaMaskButton {...Networks['iota_testnet']}/>
<NetworkInfo.Evm {...Networks['iota_testnet']}/>
</TabItem>
<TabItem value='shimmerEVM' label='ShimmerEVM'>
<TabItem value='shimmer' label='ShimmerEVM'>
<AddToMetaMaskButton {...Networks['shimmer']}/>
<NetworkInfo.Evm {...Networks['shimmer']}/>
</TabItem>
<TabItem value='shimmerEVMTestnet' label='ShimmerEVM Testnet'>
<TabItem value='shimmer_testnet' label='ShimmerEVM Testnet'>
<AddToMetaMaskButton {...Networks['shimmer_testnet']}/>
<NetworkInfo.Evm {...Networks['shimmer_testnet']}/>
</TabItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ the [How to Create a Basic Solidity Contract Guide](create-a-basic-contract.md).

:::

<Tabs>
<Tabs groupId='tool' queryString>
<TabItem value='remix' label='Remix'>

Deploying a Solidity smart contract using Remix is a straightforward process that doesn't require any installation or
Expand Down
Loading

0 comments on commit 391f574

Please sign in to comment.