gnosischain · alebanzas · Nov 23, 2022 · Sep 15, 2022 · Sep 21, 2022 · Sep 23, 2022
diff --git a/docs/about/tokens/gno.md b/docs/about/tokens/gno.md
@@ -86,13 +86,13 @@ Check out [Chiado Testnet specs](/about/networks/chiado#gno-token) for more info
 
 #### mGNO token
 
-To create a more accurate ETH-mirrored environment, a minimum of 32 tokens are used for staking purposes on the Gnosis Beacon Chain. The mGNO token is a meta-token similar to a wrapped token created for this purpose. During deposits, 1 GNO is automatically converted to 32 mGNO. Check the [deposit process](/node/validator-deposits) for more details.
+To create a more accurate ETH-mirrored environment, a minimum of 32 tokens are used for staking purposes on the Gnosis Beacon Chain. The mGNO token is a meta-token similar to a wrapped token created for this purpose. During deposits, 1 GNO is automatically converted to 32 mGNO. Check the [deposit process](/node/deposit) for more details.
 
 - mGNO contract on Gnosis: [0x722fc4DAABFEaff81b97894fC623f91814a1BF68](https://gnosisscan.io/address/0x722fc4DAABFEaff81b97894fC623f91814a1BF68)
 
 #### Staking
 
-Stake your GNO tokens to secure Gnosis validating blocks as part of the PoS consensus. Check the [deposit process](/node/validator-deposits) for more details.
+Stake your GNO tokens to secure Gnosis validating blocks as part of the PoS consensus. Check the [deposit process](/node/deposit) for more details.
 
 Liquid staking providers allow anyone to stake without running the infrastructure themselves. Check the [Stakewise](/tools/beacon-chain/liquid-staking#tokens-sgno--rgno) page for more details on sGNO and rGNO tokens.
 

diff --git a/docs/node/README.md b/docs/node/README.md
@@ -1,35 +1,5 @@
 ---
-description: Gnosis Beacon Chain Documentation
-slug: ./
+title: Overview
 ---
 
-# Gnosis Beacon Chain
-
-Gnosis Beacon Chain (GBC) brings extendable and accelerated beacon-network functionality to the Ethereum ecosystem. Applications can iterate through real-world strategies, stage important applications, or choose to run DApps in a faster, lower-stakes environment while enjoying the benefits of massive scalability.
-
-GBC is optimized for certain parameters (block/epoch time) and can serve in a frontrunning capacity to important Ethereum consensus-layer updates. For example, the merge will first take place on testnets. Once thorough testing is complete, updates can then move to a production-level, real-world value environment (Gnosis Beacon Chain).
-
-Validating on the GBC only requires the equivalent of 1 [GNO](/about/tokens/gno), opening up validation opportunities for diverse groups of individuals across the globe. When you go to make the deposit, that 1 GNO is split into 32 mGNO to more closely mirror Ethereum, where you stake 32 ETH.
-
-## What is Staking?
-Currently, Gnosis uses Parity's [AuRa](https://openethereum.github.io/Aura) proof-of-authority consensus model. In this model, selected validators (selected through the POSDAO dPOS process) take turns signing blocks. However, after the merge, Gnosis will be running a consensus protocol known as [Proof of Stake](https://www.investopedia.com/terms/p/proof-stake-pos.asp). To secure the network and disincentivize bad actors from validating invalid or non-existent transactions, validators "stake" a non-trivial amount of assets. If they are caught lying by other validators, their stake gets "slashed" (taken away), and they can be permanently removed from the validator pool. In order for the network to be compromised, bad actors would have to control 51% of the staked assets, in what's known as a [51% attack](https://www.investopedia.com/terms/1/51-attack.asp). Therefore, the more validators, the more coins there are being staked, and the more expensive and infeasible a 51% attack becomes. In exchange for being a good validator, a portion of transaction fees are paid out. On Gnosis, rewards are paid out in mGNO (1 mGNO = 1/32 GNO).  
-
-## What is a Node?
-A 'node' on Gnosis is very similar to a node on Ethereum. [Read more here](https://ethereum.org/en/run-a-node/)
-
-## What is Meant by 'Consensus Layer' and 'Execution Layer'?
-The ***Consensus Layer*** is responsible for the blockchain's consensus. Pre-merge, this is known as the ***Beacon Chain***. This is where the validators check and make sure that blocks are valid. To run this, we can use clients such as [Lighthouse](https://github.com/sigp/lighthouse), [Prysm](https://github.com/prysmaticlabs/prysm), [Nimbus](https://github.com/status-im/nimbus-eth2), or [Teku](https://github.com/ConsenSys/teku).
-
-The ***Execution Layer*** is responsible for transaction bundling and execution. To run this, we use clients like Nethermind. 
-
-In order to check validity, the Consensus Layer sends a list of transactions and other data required to execute and validate them. The execution layer then assembles whats known as an execution block, verifies some pre-conditions, executes the transactions and then verifies the post-conditions. The result is then sent to the Consensus Layer. [This HackMD post](https://hackmd.io/@n0ble/ethereum_consensus_upgrade_mainnet_perspective) goes into more detail on how the layers interact. Note that any mention of transition from Proof of Work (PoW) does not apply to Gnosis. 
-
-
-:::tip
-🙋🏼‍♀️ Want to run a GBC validator node with ease? [DappNode](https://dappnode.io) provides hardware solutions and step-by-step setup, plus an opportunity to get up to 4 validators free with purchase. [Learn More](https://shop.dappnode.io/product/dappnodextreme-gnosis/).
-:::
-
-:::tip
-Liquid staking is the easiest way to participate, and you can do so with [Stakewise](https://app.stakewise.io). [Read more here](/tools/beacon-chain/liquid-staking).
-:::
-
+# Run Gnosis
diff --git a/docs/node/deposit.md b/docs/node/deposit.md
@@ -0,0 +1,5 @@
+---
+description: Deposit
+---
+
+# Deposit
diff --git a/docs/node/exit.md b/docs/node/exit.md
@@ -0,0 +1,5 @@
+---
+description: Exit
+---
+
+# Exit
diff --git a/docs/node/incentives.md b/docs/node/incentives.md
@@ -1,36 +1,5 @@
 ---
+description: Incentives
 ---
 
-# Incentives
-
-## Gnosis Beacon Chain Validator Rewards
-
-The minimum requirement to run a validator is 1 [GNO](/about/tokens/gno) (staked as 32 mGNO tokens).  Rewards are based on the number of validators securing the chain.
-
-| GNO staked | % of GNO validating | reward for validators | Total GNO rewards | Overall inflation p.a. |
-| ---------- | ------------------- | --------------------- | ----------------- | ---------------------- |
-| 4096       | 0.23%               | 83.85%                | 3434.496          | 0.19%                  |
-| 50000      | 2.78%               | 23.01%                | 11505             | 0.64%                  |
-| 100000     | 5.56%               | 16.65%                | 16650             | 0.93%                  |
-| 200000     | 11.11%              | 11.89%                | 23780             | 1.32%                  |
-| 400000     | 22.22%              | 8.45%                 | 33800             | 1.88%                  |
-| 800000     | 44.44%              | 5.99%                 | 47920             | 2.66%                  |
-| 1800000    | 100.00%             | 4.00%                 | 72000             | 4.00%                  |
-
-:::note
-[APY Calculator](https://www.desmos.com/calculator/7pzueggivw) for the rewards curve. The Y axis is APR and the X axis is the number of validators multiplied by 100.
-
-Following parameters set for the calculation.
-
-F:  Block reward factor = 25
-
-T: Time between blocks = 5
-
-S: Slots in an epoch= 16
-
-N: amount of validators required for the launch = 4096
-:::
-
-## Current Yield View
-
-To view the current validator reward percentage and other deposit statistics, see the [Gnosis Beacon Chain Dune Analytics dashboard](https://dune.xyz/maxaleks/Gnosis-Beacon-Chain-\(Deposits\)).
+# Incentives
diff --git a/docs/node/migrate.md b/docs/node/migrate.md
@@ -0,0 +1,5 @@
+---
+description: Migrate
+---
+
+# Migrate
diff --git a/docs/node/monitor.md b/docs/node/monitor.md
@@ -0,0 +1,5 @@
+---
+description: Monitor
+---
+
+# Monitor
diff --git a/docs/node/requirements.md b/docs/node/requirements.md
@@ -0,0 +1,5 @@
+---
+description: Requirements
+---
+
+# Requirements
diff --git a/docs/node/setup/README.md b/docs/node/setup/README.md
@@ -0,0 +1,11 @@
+---
+title: Setup
+---
+
+# Setup
+
+
+## Execution Layer
+
+
+## Consensus Layer
diff --git a/docs/node/setup/besu.md b/docs/node/setup/besu.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Besu
diff --git a/docs/node/setup/dappnode.md b/docs/node/setup/dappnode.md
@@ -0,0 +1,5 @@
+---
+description: DappNode
+---
+
+# DappNode
diff --git a/docs/node/setup/erigon.md b/docs/node/setup/erigon.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Erigon
diff --git a/docs/node/setup/generate-keys.md b/docs/node/setup/generate-keys.md
@@ -0,0 +1,5 @@
+---
+description: Generate Keys
+---
+
+# Generate Keys
diff --git a/docs/node/setup/geth.md b/docs/node/setup/geth.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Geth
diff --git a/docs/node/setup/lighthouse.md b/docs/node/setup/lighthouse.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Lighthouse
diff --git a/docs/node/setup/lodestar.md b/docs/node/setup/lodestar.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Lodestar
diff --git a/docs/node/setup/nethermind.md b/docs/node/setup/nethermind.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Nethermind
diff --git a/docs/node/setup/nimbus.md b/docs/node/setup/nimbus.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Nimbus
diff --git a/docs/node/setup/open-ethereum.md b/docs/node/setup/open-ethereum.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Open Ethereum
diff --git a/docs/node/setup/prysm.md b/docs/node/setup/prysm.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Prysm
diff --git a/docs/node/setup/teku.md b/docs/node/setup/teku.md
@@ -0,0 +1,5 @@
+---
+description: Setup
+---
+
+# Teku
diff --git a/docs/node/update.md b/docs/node/update.md
@@ -0,0 +1,5 @@
+---
+description: Update
+---
+
+# Update
diff --git a/docs/node/withdraw.md b/docs/node/withdraw.md
@@ -0,0 +1,5 @@
+---
+description: Withdraw
+---
+
+# Withdraw
diff --git a/docs/nodeOld/README.md b/docs/nodeOld/README.md
@@ -0,0 +1,35 @@
+---
+description: Gnosis Beacon Chain Documentation
+slug: ./
+---
+
+# Gnosis Beacon Chain
+
+Gnosis Beacon Chain (GBC) brings extendable and accelerated beacon-network functionality to the Ethereum ecosystem. Applications can iterate through real-world strategies, stage important applications, or choose to run DApps in a faster, lower-stakes environment while enjoying the benefits of massive scalability.
+
+GBC is optimized for certain parameters (block/epoch time) and can serve in a frontrunning capacity to important Ethereum consensus-layer updates. For example, the merge will first take place on testnets. Once thorough testing is complete, updates can then move to a production-level, real-world value environment (Gnosis Beacon Chain).
+
+Validating on the GBC only requires the equivalent of 1 [GNO](/about/tokens/gno), opening up validation opportunities for diverse groups of individuals across the globe. When you go to make the deposit, that 1 GNO is split into 32 mGNO to more closely mirror Ethereum, where you stake 32 ETH.
+
+## What is Staking?
+Currently, Gnosis uses Parity's [AuRa](https://openethereum.github.io/Aura) proof-of-authority consensus model. In this model, selected validators (selected through the POSDAO dPOS process) take turns signing blocks. However, after the merge, Gnosis will be running a consensus protocol known as [Proof of Stake](https://www.investopedia.com/terms/p/proof-stake-pos.asp). To secure the network and disincentivize bad actors from validating invalid or non-existent transactions, validators "stake" a non-trivial amount of assets. If they are caught lying by other validators, their stake gets "slashed" (taken away), and they can be permanently removed from the validator pool. In order for the network to be compromised, bad actors would have to control 51% of the staked assets, in what's known as a [51% attack](https://www.investopedia.com/terms/1/51-attack.asp). Therefore, the more validators, the more coins there are being staked, and the more expensive and infeasible a 51% attack becomes. In exchange for being a good validator, a portion of transaction fees are paid out. On Gnosis, rewards are paid out in mGNO (1 mGNO = 1/32 GNO).  
+
+## What is a Node?
+A 'node' on Gnosis is very similar to a node on Ethereum. [Read more here](https://ethereum.org/en/run-a-node/)
+
+## What is Meant by 'Consensus Layer' and 'Execution Layer'?
+The ***Consensus Layer*** is responsible for the blockchain's consensus. Pre-merge, this is known as the ***Beacon Chain***. This is where the validators check and make sure that blocks are valid. To run this, we can use clients such as [Lighthouse](https://github.com/sigp/lighthouse), [Prysm](https://github.com/prysmaticlabs/prysm), [Nimbus](https://github.com/status-im/nimbus-eth2), or [Teku](https://github.com/ConsenSys/teku).
+
+The ***Execution Layer*** is responsible for transaction bundling and execution. To run this, we use clients like Nethermind. 
+
+In order to check validity, the Consensus Layer sends a list of transactions and other data required to execute and validate them. The execution layer then assembles whats known as an execution block, verifies some pre-conditions, executes the transactions and then verifies the post-conditions. The result is then sent to the Consensus Layer. [This HackMD post](https://hackmd.io/@n0ble/ethereum_consensus_upgrade_mainnet_perspective) goes into more detail on how the layers interact. Note that any mention of transition from Proof of Work (PoW) does not apply to Gnosis. 
+
+
+:::tip
+🙋🏼‍♀️ Want to run a GBC validator node with ease? [DappNode](https://dappnode.io) provides hardware solutions and step-by-step setup, plus an opportunity to get up to 4 validators free with purchase. [Learn More](https://shop.dappnode.io/product/dappnodextreme-gnosis/).
+:::
+
+:::tip
+Liquid staking is the easiest way to participate, and you can do so with [Stakewise](https://app.stakewise.io). [Read more here](/tools/beacon-chain/liquid-staking).
+:::
+
diff --git a/docs/node/consensus-layer-validator.md → docs/nodeOld/consensus-layer-validator.md b/docs/node/consensus-layer-validator.md → docs/nodeOld/consensus-layer-validator.md
@@ -194,8 +194,8 @@ If you prefer a beginner-friendly walkthrough from start to finish, this excelle
 1. [Generate Validator Keystores and Deposit Data](#step-1-generate-validator-accounts-and-deposit-data): On an offline machine, generate up to 128 separate validator keys per node.
 2. [Choose your Gnosis Beacon Chain (GBC) Client:](#step-2-choose-your-beacon-chain-client--import-validator-keys) Choose to run either Prysm, Lighthouse or Nimbus. Add keystores and env variables.
 3. [Start up your GBC Node](#step-3-run-the-beacon-chain-node-with-the-attached-validator-process): Run in the docker container.
-4. [Deposit to your Validator(s)](/node/validator-deposits): Use the Deposit UI to convert GNO to mGNO (metaGNO for staking) and deposit to your validator.
-5. [View on Explorer](/node/monitoring-nodes): Wait \~1.5-2 hours for your validator(s) to go live and view at [https://beacon.gnosischain.com](https://beacon.gnosischain.com).
+4. [Deposit to your Validator(s)](/node/deposit): Use the Deposit UI to convert GNO to mGNO (metaGNO for staking) and deposit to your validator.
+5. [View on Explorer](/node/monitor): Wait \~1.5-2 hours for your validator(s) to go live and view at [https://beacon.gnosischain.com](https://beacon.gnosischain.com).
 
 ### Additional Software/Access Requirements
 
@@ -274,7 +274,7 @@ _`Want to learn more about Ethereum 2.0 keys and key generation?`_ 💡[Learn mo
 :::note
 To begin, determine which client you want to run, [Lighthouse](https://lighthouse.sigmaprime.io), [Prysm](https://prysmaticlabs.com) or [Nimbus](https://nimbus.guide/intro.html). Instructions differ for the 3 clients, **see below for instructions related to each implementation.**
 
-Make sure your machine conforms to the [Technical Requirements](/node/consensus-layer-validator#beacon-chain-node-requirements) for running a node, including opening the following pair of ports:
+Make sure your machine conforms to the [Technical Requirements](/node/requirements) for running a node, including opening the following pair of ports:
 
 * **12000 UDP, 13000 TCP**
 :::
@@ -339,13 +339,13 @@ A similar command can be used to look at the validator process logs: `docker-com
 
 ## Step 4) Make a Deposit
 
-Once your node has synced (can take a few hours depending on setup) and the node and validator are running without any errors, you are ready to make a deposit. To check if your validator is synced, open the logs and you should see a message saying that the validator is awaiting activation. Making deposits is a 2 part process. See the [Validator Deposits section](/node/validator-deposits) for details.
+Once your node has synced (can take a few hours depending on setup) and the node and validator are running without any errors, you are ready to make a deposit. To check if your validator is synced, open the logs and you should see a message saying that the validator is awaiting activation. Making deposits is a 2 part process. See the [Validator Deposits section](/node/deposit) for details.
 ##
 
 
 ## Connect to a Gnosis Node
 
-If you choose not to use the public RPC and want to connect to a different Gnosis node ([including a 3rd party provider](/node/execution-layer-validator)), set `XDAI_RPC_URL`=https://\&lt;your-endpoint&gt;
+If you choose not to use the public RPC and want to connect to a different Gnosis node ([including a 3rd party provider](/node/setup#execution-layer)), set `XDAI_RPC_URL`=https://\&lt;your-endpoint&gt;
 
 :::note
 If you are having issues connecting to a public RPC, you can try some of the other endpoints listed [here](/tools/rpc/).

diff --git a/docs/node/execution-layer-validator.md → docs/nodeOld/execution-layer-validator.md b/docs/node/execution-layer-validator.md → docs/nodeOld/execution-layer-validator.md
diff --git a/docs/node/get-started.md → docs/nodeOld/get-started.md b/docs/node/get-started.md → docs/nodeOld/get-started.md
@@ -8,7 +8,7 @@ Validators protect Gnosis by staking on the Gnosis Beacon Chain. There are sever
 
 ## Run Your Own Node
 
-Please view these [important notes](/node/consensus-layer-validator#before-starting) and [Technical Requirements](/node/consensus-layer-validator#beacon-chain-node-requirements) to learn more about expectations and what you will need to become a validator. Validating the GBC requires 1 [GNO](/about/tokens/gno) per validator process.
+Please view these [important notes](/nodeOld/consensus-layer-validator#before-starting) and [Technical Requirements](/nodeOld/consensus-layer-validator#beacon-chain-node-requirements) to learn more about expectations and what you will need to become a validator. Validating the GBC requires 1 [GNO](/about/tokens/gno) per validator process.
 
 :::note
 DappNode now supports the Gnosis Beacon Chain! If you would like to use their services for validation, please see the [guide and instructions here](https://forum.dappnode.io/t/how-to-setup-a-gnosis-beacon-chain-gbc-validator-on-dappnode/1351)

diff --git a/docs/nodeOld/incentives.md b/docs/nodeOld/incentives.md
@@ -0,0 +1,36 @@
+---
+---
+
+# Incentives
+
+## Gnosis Beacon Chain Validator Rewards
+
+The minimum requirement to run a validator is 1 [GNO](/about/tokens/gno) (staked as 32 mGNO tokens).  Rewards are based on the number of validators securing the chain.
+
+| GNO staked | % of GNO validating | reward for validators | Total GNO rewards | Overall inflation p.a. |
+| ---------- | ------------------- | --------------------- | ----------------- | ---------------------- |
+| 4096       | 0.23%               | 83.85%                | 3434.496          | 0.19%                  |
+| 50000      | 2.78%               | 23.01%                | 11505             | 0.64%                  |
+| 100000     | 5.56%               | 16.65%                | 16650             | 0.93%                  |
+| 200000     | 11.11%              | 11.89%                | 23780             | 1.32%                  |
+| 400000     | 22.22%              | 8.45%                 | 33800             | 1.88%                  |
+| 800000     | 44.44%              | 5.99%                 | 47920             | 2.66%                  |
+| 1800000    | 100.00%             | 4.00%                 | 72000             | 4.00%                  |
+
+:::note
+[APY Calculator](https://www.desmos.com/calculator/7pzueggivw) for the rewards curve. The Y axis is APR and the X axis is the number of validators multiplied by 100.
+
+Following parameters set for the calculation.
+
+F:  Block reward factor = 25
+
+T: Time between blocks = 5
+
+S: Slots in an epoch= 16
+
+N: amount of validators required for the launch = 4096
+:::
+
+## Current Yield View
+
+To view the current validator reward percentage and other deposit statistics, see the [Gnosis Beacon Chain Dune Analytics dashboard](https://dune.xyz/maxaleks/Gnosis-Beacon-Chain-\(Deposits\)).
diff --git a/docs/node/migrating-a-validator.md → docs/nodeOld/migrating-a-validator.md b/docs/node/migrating-a-validator.md → docs/nodeOld/migrating-a-validator.md
diff --git a/docs/node/monitoring-nodes.md → docs/nodeOld/monitoring-nodes.md b/docs/node/monitoring-nodes.md → docs/nodeOld/monitoring-nodes.md
diff --git a/docs/node/testnets/README.md → docs/nodeOld/testnets/README.md b/docs/node/testnets/README.md → docs/nodeOld/testnets/README.md
diff --git a/docs/node/testnets/consensus-layer.md → docs/nodeOld/testnets/consensus-layer.md b/docs/node/testnets/consensus-layer.md → docs/nodeOld/testnets/consensus-layer.md
diff --git a/docs/node/testnets/execution-layer.md → docs/nodeOld/testnets/execution-layer.md b/docs/node/testnets/execution-layer.md → docs/nodeOld/testnets/execution-layer.md