diff --git a/README.md b/README.md index 0c1a45125..b9138dfe4 100644 --- a/README.md +++ b/README.md @@ -61,34 +61,27 @@ before proceeding: $ git checkout v0.6.1 ``` -Singlenode Testnet +Configuration Setup --- -The fullnode server is initialized with a ledger from stdin and -generates new ledger entries on stdout. To create the input ledger, we'll need -to create *the mint* and use it to generate a *genesis ledger*. It's done in -two steps because the mint-demo.json file contains private keys that will be -used later in this demo. +The network is initialized with a genesis ledger and leader/validator configuration files. +These files can be generated by running the following script. ```bash -$ echo 1000000000 | cargo run --release --bin solana-mint-demo > mint-demo.json -$ cat mint-demo.json | cargo run --release --bin solana-genesis-demo > genesis.log +$ ./multinode-demo/setup.sh ``` +Singlenode Testnet +--- + Before you start a fullnode, make sure you know the IP address of the machine you want to be the leader for the demo, and make sure that udp ports 8000-10000 are open on all the machines you want to test with. -Generate a leader configuration file with: - -```bash -$ cargo run --release --bin solana-fullnode-config -- -d > leader.json -``` - Now start the server: ```bash -$ ./multinode-demo/leader.sh > leader-txs.log +$ ./multinode-demo/leader.sh ``` To run a performance-enhanced fullnode on Linux, download `libcuda_verify_ed25519.a`. Enable @@ -107,14 +100,8 @@ Multinode Testnet To run a multinode testnet, after starting a leader node, spin up some validator nodes: -Generate the validator's configuration file: - ```bash -$ cargo run --release --bin solana-fullnode-config -- -b 9000 -d > validator.json -``` - -```bash -$ ./multinode-demo/validator.sh ubuntu@10.0.1.51:~/solana > validator-txs.log #The leader machine +$ ./multinode-demo/validator.sh ubuntu@10.0.1.51:~/solana #The leader machine ``` As with the leader node, you can run a performance-enhanced validator fullnode by adding diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh index 9a6b88b7d..6a9f72b48 100755 --- a/multinode-demo/leader.sh +++ b/multinode-demo/leader.sh @@ -7,4 +7,4 @@ set -x [[ $(uname) = Linux ]] && sudo sysctl -w net.core.rmem_max=26214400 cargo run --release --bin solana-fullnode -- \ - -l leader.json < genesis.log tx-*.log > tx-"$(date -u +%Y%m%d%k%M%S%N)" + -l leader.json < genesis.log tx-*.log > tx-"$(date -u +%Y%m%d%k%M%S%N)".log diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh index 1737d9e62..c2f5fa1da 100755 --- a/multinode-demo/setup.sh +++ b/multinode-demo/setup.sh @@ -6,4 +6,4 @@ cargo run --release --bin solana-mint-demo <<<"${TOKENS}" > mint-demo.json cargo run --release --bin solana-genesis-demo < mint-demo.json > genesis.log cargo run --release --bin solana-fullnode-config -- -d > leader.json -cargo run --release --bin solana-fullnode-config -- -d > validator.json +cargo run --release --bin solana-fullnode-config -- -b 9000 -d > validator.json