From 8d6e4160686fe20aeb56d56b9d16032b338ab081 Mon Sep 17 00:00:00 2001 From: Bruno Skvorc Date: Fri, 12 Jul 2019 10:18:42 +0200 Subject: [PATCH 1/3] Minor updated in regards to testnet --- source/docs/building.md | 2 +- source/docs/t0.md | 6 +++--- source/docs/t1.md | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/source/docs/building.md b/source/docs/building.md index 7d30d78..f89a097 100644 --- a/source/docs/building.md +++ b/source/docs/building.md @@ -87,7 +87,7 @@ Use the output of the help command to pass desired values to the sim - change nu ### Nimbus Ethereum 2.0 Testnet -We have a publicly available testnet running between Nimbus nodes. Read all about it and learn how you can join it [here](/docs/t0.html). +We have a publicly available testnet running between Nimbus nodes. Read all about it and learn how you can join it [here](/docs/t0.html). There is also a cutting edge [testnet 1](/docs/t1.html) that's basically a testing ground for testnet 0. --- diff --git a/source/docs/t0.md b/source/docs/t0.md index 1d3326f..f182e09 100644 --- a/source/docs/t0.md +++ b/source/docs/t0.md @@ -15,7 +15,7 @@ Here is the full process if you're starting from scratch, without even Nim insta # Ensure you have rocksdb installed before running this! git clone https://github.com/status-im/nimbus cd nimbus -make update # this might take a few minutes +make update deps # this might take a few minutes # >>> WINDOWS ONLY <<< make fetch-dlls # WINDOWS ONLY @@ -30,7 +30,7 @@ Here is the full process if you've already run testnet0 before but might be stuc ```bash cd nimbus -make update # update dependencies +make update deps # update dependencies # >>> WINDOWS ONLY <<< make fetch-dlls # WINDOWS ONLY @@ -38,7 +38,7 @@ make fetch-dlls # WINDOWS ONLY cd vendor/nim-beacon-chain make clean-testnet0 testnet0 # clean cache and rebuild binary -./build/testnet0_node # this launches the testnet0-specific node you just built +./scripts/testnet0.sh # this launches the testnet0-specific node you just built ``` Congratulations, you should now be joining us - your node will start syncing with the current state of our beacon chain. Once you're in sync, you should also start proposing your own blocks and providing attestations - exciting! You are now among [Ethereum 2.0 Nimbus pioneers](https://gitcoin.co/kudos/1160/nimbus_pilot)! diff --git a/source/docs/t1.md b/source/docs/t1.md index a93eec2..a4a0284 100644 --- a/source/docs/t1.md +++ b/source/docs/t1.md @@ -3,6 +3,38 @@ id: t1 title: Joining Nimbus Testnet1 --- +Testnet1 is a cutting edge highly breakable in-flux testnet we use to test new features. If you do join, please [take the time to report any bugs](https://github.com/status-im/nim-beacon-chain/issues). + ## Joining Nimbus Testnet 1 -Testnet1 is under construction - announcement coming soon. \ No newline at end of file +_Note: Works only on non-Windows right now. If on Windows, consider using our [Vagrant box](https://github.com/status-im/nim-vagrant)._ + +Before following the instructions below, please make sure you have Go installed. Follow [official instructions](https://golang.org/doc/install) and make sure it's above version 1.12. This is required because we build the Libp2p Go daemon. + +```bash +git clone https://github.com/status-im/nimbus +cd nimbus +git fetch +git checkout devel +make update deps +cd vendor/nim-beacon-chain +make clean-testnet1 testnet1 +./scripts/testnet1.sh +``` + +Your node should be connecting to others now: + +```bash +DBG 2019-07-12 09:39:47+02:00 UPnP topics="nat" tid=8215 msg="Internet Gateway Device found but it's not connected. Trying anyway." +DBG 2019-07-12 09:39:47+02:00 UPnP: added port mapping topics="nat" tid=8215 externalPort=9100 internalPort=9100 protocol=TCP +DBG 2019-07-12 09:39:47+02:00 UPnP: added port mapping topics="nat" tid=8215 externalPort=9100 internalPort=9100 protocol=UDP +INF 2019-07-12 09:39:47+02:00 Starting the LibP2P daemon tid=8215 announcedAddresses=@[/ip4/0.0.0.0/tcp/9100] hostAddress=/ip4/0.0.0.0/tcp/9100 keyFile=/home/swader/.cache/nimbus/BeaconNode/testnet1/privkey.protobuf +INF 2019-07-12 09:39:48+02:00 Connecting to bootstrap nodes tid=8215 bootstrapNodes="@[{PeerID: '12D3KooWQmdmkcSdRaeLy8dMf9mCMeakJtxgHfX5qGAfqmvu7wTX' Addresses: ['/ip4/188.166.38.238/tcp/9100']}]" +DBG 2019-07-12 09:39:49+02:00 Peer connected. Initiating sync tid=8215 bestSlot=0 peer=12*vu7wTX remoteBestSlot=4552 +DBG 2019-07-12 09:39:49+02:00 Waiting for block headers tid=8215 fromPeer=12*vu7wTX peer=12*vu7wTX remoteBestSlot=4552 +DBG 2019-07-12 09:39:51+02:00 Block headers received. Requesting block bodies tid=8215 peer=12*vu7wTX +DBG 2019-07-12 09:39:57+02:00 Block received tid=8215 blck="(slot: 16, parent_root: \"4EDB527C\", state_root: \"27EEB0FE\", proposer_slashings_len: 0, attester_slashings_len: 0, attestations_len: 0, deposits_len: 0, voluntary_exits_len: 0, transfers_len: 0, signature: \"b5dbe5e4\")" blockRoot=76BE6B5D +DBG 2019-07-12 09:39:57+02:00 Advancing state with empty slots tid=8215 stateSlot=0 targetSlot=15 +INF 2019-07-12 09:39:57+02:00 Block resolved tid=8215 blck="(slot: 16, parent_root: \"4EDB527C\", state_root: \"27EEB0FE\", proposer_slashings_len: 0, attester_slashings_len: 0, attestations_len: 0, deposits_len: 0, voluntary_exits_len: 0, transfers_len: 0, signature: \"b5dbe5e4\")" blockRoot=76BE6B5D justifiedRoot=4EDB527C justifiedSlot=0 +DBG 2019-07-12 09:39:57+02:00 Block received +``` \ No newline at end of file From 1fb01e670e306d970a7857d882228410517c72a7 Mon Sep 17 00:00:00 2001 From: Bruno Skvorc Date: Fri, 12 Jul 2019 10:23:05 +0200 Subject: [PATCH 2/3] Added Eth1 subsection to guides --- source/_data/sidebar.yml | 1 + source/docs/eth1.md | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 source/docs/eth1.md diff --git a/source/_data/sidebar.yml b/source/_data/sidebar.yml index 82d725a..de9461a 100644 --- a/source/_data/sidebar.yml +++ b/source/_data/sidebar.yml @@ -8,6 +8,7 @@ docs: faq: faq.html contributor_guide: contributor_guide.html Guides: + Ethereum 1: eth1.html Testnet 0: t0.html Testnet 1: t1.html Custom Testnet: custom-nimbus-testnet.html diff --git a/source/docs/eth1.md b/source/docs/eth1.md new file mode 100644 index 0000000..e7cb00b --- /dev/null +++ b/source/docs/eth1.md @@ -0,0 +1,33 @@ +--- +id: eth1 +title: Ethereum 1 Nimbus +--- + +## Installing prerequisites + +If you are on Windows, instead of using the commands below you can also use our [pre-configured Vagrant box](https://github.com/status-im/nim-vagrant) if you prefer to run things in a Linux environment. + +We use Makefiles to quickly and easily build our binaries. Before you begin, please make sure you have [RocksDB installed](https://github.com/status-im/nimbus#rocksdb). On Windows, you can skip this step and instead rely on the "WINDOWS ONLY" part of the process below: + +```bash +git clone https://github.com/status-im/nimbus +cd nimbus +make update # Downloads and builds submodules, dependencies, and even Nim itself + +# >>> WINDOWS ONLY <<< +make fetch-dlls # WINDOWS ONLY +# >>> WINDOWS ONLY <<< + +./env.sh bash # Optional, but useful. Sets the current shell's environment to use the version of Nim language the `make update deps` command just built +``` + +### Building and Running Nimbus + +To run Nimbus in Ethereum 1.0 mode: + +```bash +make nimbus +./build/nimbus +``` + +Nimbus will now run and attempt to synchronize with the Ethereum 1.0 blockchain. It can currently reach block 1.5 million. \ No newline at end of file From 5c24438a541250a7a13b906167c6bbd8583912dd Mon Sep 17 00:00:00 2001 From: Bruno Skvorc Date: Fri, 12 Jul 2019 10:25:20 +0200 Subject: [PATCH 3/3] Language update --- themes/navy/languages/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/navy/languages/en.yml b/themes/navy/languages/en.yml index 8c8694a..965bdc8 100644 --- a/themes/navy/languages/en.yml +++ b/themes/navy/languages/en.yml @@ -34,3 +34,4 @@ sidebar: Testnet 1: Testnet 1 Custom Testnet: Custom Testnet Guides: Guides + Ethereum 1: Ethereum 1