Merge pull request #1187 from onflow/brian-doyle/reorg-tutorials

Reorg EVM guides and move cross-vm items to tutorials

Author: briandoyle81

docs/evm/data-indexers.md renamed to docs/ecosystem/data-indexers.md

@@ -1,7 +1,7 @@
 ---
 title: Data Indexers
 sidebar_label: Data Indexers
-sidebar_position: 9
+sidebar_position: 4
 ---
 
 # Data Indexers

docs/ecosystem/faucets.md

@@ -72,7 +72,7 @@ From the Faucet's landing page, click on the "Create Account" button. You'll be
 
 Know that there is a distinction between Flow native accounts and EVM accounts. Native accounts allow you to interact with the Cadence runtime, while EVM accounts are used for interacting with Flow's EVM. To create an EVM account, you can use EVM tooling to generate an Ethereum Owned Account (EOA) and simply fund the associated address. Alternatively, you can create an EVM account controlled by your Flow native account - known as a Cadence Owned Account (COA) - in which case you'll need a Flow native account and should continue with the steps below.
 
-For more information interacting with EVM via COAs, see the [Interacting With COAs documentation](../evm/cadence/interacting-with-coa.md).
+For more information interacting with EVM via COAs, see the [Interacting With COAs documentation](../tutorials/cross-vm-apps/interacting-with-coa.md).
 
 :::
 

docs/evm/accounts.md

@@ -26,7 +26,7 @@ However, in order to leverage all the features of Cadence, developers will need
 
 🚨🚨🚨 **ASSET LOSS RISK** 🚨🚨🚨
 
-Cadence-Owned Accounts, easily identifiable by the leading zeroes (`0x00000000000000000000000`) **only exist on Flow**.  The keys to these addresses are generated in a way that is not compatible with other networks.
+Cadence-Owned Accounts, easily identifiable by the leading zeroes (`0x00000000000000000000000`) **only exist on Flow**. The keys to these addresses are generated in a way that is not compatible with other networks.
 
 As a result, any assets sent to one of these addresses on another network **will be lost permanently!**
 
@@ -46,7 +46,7 @@ COAs create powerful new opportunities to improve the UX, functionality and util
 
 - **Enhanced Composability**: Applications written in Solidity can be extended and composed upon within Cadence. This allows developers to build upon existing EVM applications and deliver a more feature-rich user experience.
 
-- **Atomic Interactions**: Developers are able to execute multiple EVM transactions atomically from a COA. This is particularly useful for applications that require multiple transactions to be executed within a single block, or require all prior transactions' state changes to revert if a single transaction in the batch fails. This is not possible natively using EOAs or with `UserOperations` when using the ERC-4337 standard; in both cases each individual transaction is distinct and cannot be reverted back once state has changed. 
+- **Atomic Interactions**: Developers are able to execute multiple EVM transactions atomically from a COA. This is particularly useful for applications that require multiple transactions to be executed within a single block, or require all prior transactions' state changes to revert if a single transaction in the batch fails. This is not possible natively using EOAs or with `UserOperations` when using the ERC-4337 standard; in both cases each individual transaction is distinct and cannot be reverted back once state has changed.
 
 - **Native Account Abstraction**: COAs are controlled by Cadence resources, which are in turn owned by Flow accounts. [Flow accounts](./accounts.md) have built-in support for multi-signature authentication, key rotation, and account recovery. As a Cadence resource, COAs naturally inherit [these features](../build/advanced-concepts/account-abstraction.md).
 
@@ -64,6 +64,6 @@ Because COAs are owned by Cadence resources, an EVM transaction is not required
 
 ### More Information
 
-To learn how to create and interact with COAs in Cadence, see the guide for [Interacting with COAs from Cadence](./cadence/interacting-with-coa.md).
+To learn how to create and interact with COAs in Cadence, see the guide for [Interacting with COAs from Cadence](../tutorials/cross-vm-apps/interacting-with-coa.md).
 
 For more information about Cadence Owned Accounts, see the [Flow EVM Support FLIP](https://github.com/onflow/flips/pull/225/files)

docs/evm/cadence/_category_.yml

@@ -1,7 +1,7 @@
 ---
 title: Ethers.js on Flow Blockchain
 sidebar_label: Ethers
-sidebar_position: 1
+sidebar_position: 8
 ---
 
 # Ethers.js

docs/evm/clients/_category_.yml

@@ -1,7 +1,7 @@
 ---
 title: Web3.js on Flow Blockchain
 sidebar_label: Web3.js
-sidebar_position: 2
+sidebar_position: 9
 ---
 
 # Web3.js

docs/evm/clients/ethers.md renamed to docs/evm/guides/ethers.md

@@ -39,7 +39,7 @@ creating a [Cadence-controlled EVM account (COA)]. Specifically, we will:
 - Wrap FLOW as WFLOW
 - Approve an ERC721 to transfer WFLOW in exchange for an NFT mint
 - Mint an ERC721 token - this ERC721 has a 50% chance of failing (using [onchain VRF] to determine success)
- 
+
 These operations let us focus on the **core concepts** of this guide:
 
 1. **Batching EVM transactions** using Cadence
@@ -114,7 +114,7 @@ interact with the `WFLOW` contract on Testnet. There are a number of ways we cou
 IDE, Foundry's CLI, Hardhat, etc. - but for the purposes of this guide, we'll use the [Flowscan EVM block explorer].
 
 Navigate to the WFLOW Testnet contract on Flowscan: [WFLOW]. Ensure you're on the `Write Contract` tab which allows you
-to interact with the contract's mutating functions. 
+to interact with the contract's mutating functions.
 
 Before you can interact with the contract, you need to connect your MetaMask wallet to the [Flowscan EVM block
 explorer]. Click the `Connect` button in the top right corner and follow the prompts to connect your MetaMask wallet.
@@ -230,7 +230,7 @@ import EVM from 0x8c5303eaa26202d6
 /// @param maybeMintERC721AddressHex: The EVM address hex of the ERC721 contract as a String
 ///
 transaction(wflowAddressHex: String, maybeMintERC721AddressHex: String) {
-    
+
     let coa: auth(EVM.Call) &EVM.CadenceOwnedAccount
     let mintCost: UFix64
     let wflowAddress: EVM.EVMAddress
@@ -349,11 +349,13 @@ transaction(wflowAddressHex: String, maybeMintERC721AddressHex: String) {
 }
 
 ```
+
 </details>
 
 You can run the transaction at the following link using the community-developed Flow Runner tool: [`wrap_and_mint.cdc`].
 
 This transaction takes two arguments:
+
 - WFLOW contract address: `0xd3bF53DAC106A0290B0483EcBC89d40FcC961f3e`
 - MaybeMintERC721 contract address: `0x2E2Ed0Cfd3AD2f1d34481277b3204d807Ca2F8c2`
 
@@ -412,7 +414,7 @@ But how does our Flow account interact with EVM from the Cadence runtime? As you
 COA](./interacting-with-coa.md) guide, we use a Cadence-owned account (COA) to interact with EVM contracts from Cadence.
 
 A COA is a [resource] providing an interface through which Cadence can interact with the EVM runtime. This is
-importantly ***in addition*** to the traditional routes you'd normally access normal EVMs - e.g. via the JSON-RPC API.
+importantly **_in addition_** to the traditional routes you'd normally access normal EVMs - e.g. via the JSON-RPC API.
 And with this interface, we can take advantage of all of the benefits of Cadence - namely here scripted transactions and
 conditional execution.
 
@@ -712,7 +714,7 @@ Ready to level up your Cadence skills? Take a look at [these Cadence tutorials].
 [Flow Wallet extension]: https://wallet.flow.com/download
 [Faucet guide]: ../../ecosystem/faucets.md
 [Cadence-controlled EVM account (COA)]: ./interacting-with-coa.md
-[onchain VRF]: ../guides/vrf.md
+[onchain VRF]: ../../evm/guides/vrf.md
 [Overview]: #overview
 [Testnet]: https://evm-testnet.flowscan.io/token/0xd3bF53DAC106A0290B0483EcBC89d40FcC961f3e?tab=contract
 [Mainnet]: https://evm.flowscan.io/token/0xd3bF53DAC106A0290B0483EcBC89d40FcC961f3e?tab=contract
@@ -726,12 +728,12 @@ Ready to level up your Cadence skills? Take a look at [these Cadence tutorials].
 [Flowscan Cadence]: https://testnet.flowscan.io/
 [resource]: https://cadence-lang.org/docs/solidity-to-cadence#resources
 [entitlement]: https://cadence-lang.org/docs/language/access-control#entitlements
-[How Flow EVM Works]: ../how-it-works.md
+[How Flow EVM Works]: ../../evm/how-it-works.md
 [Interacting with COAs]: ./interacting-with-coa.md
 [Cadence Transactions]: ../../build/basics/transactions.md
 [these Cadence tutorials]: https://cadence-lang.org/docs/tutorial/first-steps
 [`setup_coa.cdc`]: https://run.dnz.dev/snippet/4ec75e1f4165fa05
 [`fund_coa.cdc`]: https://run.dnz.dev/snippet/0e7370601bd9123b
 [`wrap_flow.cdc`]: https://run.dnz.dev/snippet/9dbfb784da5300fb
 [`approve_maybe_mint_erc721.cdc`]: https://run.dnz.dev/snippet/1b503d82f9a2c5a7
-[`mint.cdc`]: https://run.dnz.dev/snippet/fd7c4dda536d006e
+[`mint.cdc`]: https://run.dnz.dev/snippet/fd7c4dda536d006e