diff --git a/fluffy/README.md b/fluffy/README.md index e58a20db5..ecd7de460 100644 --- a/fluffy/README.md +++ b/fluffy/README.md @@ -55,14 +55,9 @@ make fluffy ### Run a Fluffy client on the public testnet -There is a public [Portal testnet](https://github.com/ethereum/portal-network-specs/blob/master/testnet.md#portal-network-testnet) which contains nodes of different clients. -We run a fleet of Fluffy nodes that are part of this testnet. - -Provide the `--network:testnet0` option to join this network. - ```bash -# Connect to the Portal testnet and enable the JSON-RPC APIs -./build/fluffy --network:testnet0 --rpc --table-ip-limit:1024 --bucket-ip-limit:24 +# Connect to the Portal testnet bootstrap nodes and enable the JSON-RPC APIs +./build/fluffy --rpc --table-ip-limit:1024 --bucket-ip-limit:24 ``` The `table-ip-limit` and `bucket-ip-limit` options are needed to allow more @@ -70,6 +65,12 @@ nodes with the same IPs in the routing tables. The default limits are there as security measure. It is currently needed to increase the limits for the testnet because the fleet of Fluffy nodes runs on only 2 machines / network interfaces. +There is a public [Portal testnet](https://github.com/ethereum/portal-network-specs/blob/master/testnet.md#portal-network-testnet) +which contains nodes of different clients. + +Fluffy will default join the network through these bootstrap nodes. +You can also explicitly provide the `--network:testnet0` option to join this +network, or `--network:none` to not connect to any of these bootstrapn odes. > **_Note:_** The `--network` option selects automatically a static set of specific bootstrap nodes belonging to a "testnet". Currently `testnet0` is the diff --git a/fluffy/conf.nim b/fluffy/conf.nim index d0b3aca0f..340710ce3 100644 --- a/fluffy/conf.nim +++ b/fluffy/conf.nim @@ -83,7 +83,7 @@ type desc: "Select which Portal network to join. This will set the " & "network specific bootstrap nodes automatically" - defaultValue: PortalNetwork.none + defaultValue: PortalNetwork.testnet0 name: "network" }: PortalNetwork # Note: This will add bootstrap nodes for both Discovery v5 network and each diff --git a/fluffy/docs/content_seeding.md b/fluffy/docs/content_seeding.md index f064928e5..61f55570b 100644 --- a/fluffy/docs/content_seeding.md +++ b/fluffy/docs/content_seeding.md @@ -34,7 +34,7 @@ Run Fluffy and trigger the propagation of data with the `portal_history_propagateEpochAccumulators` JSON-RPC API call: ```bash -./build/fluffy --network:testnet0 --rpc --table-ip-limit:1024 --bucket-ip-limit:24 +./build/fluffy --rpc --table-ip-limit:1024 --bucket-ip-limit:24 # From another terminal curl -s -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":"1","method":"portal_history_propagateEpochAccumulators","params":["./user_data_dir/"]}' http://localhost:8545 | jq @@ -47,7 +47,7 @@ accumulators are available on the history network: Make sure you still have a fluffy instance running, if not run: ```bash -./build/fluffy --network:testnet0 --rpc --table-ip-limit:1024 --bucket-ip-limit:24 +./build/fluffy --rpc --table-ip-limit:1024 --bucket-ip-limit:24 ``` Run the `content_verifier` tool and see if all epoch accumulators are found: @@ -79,7 +79,7 @@ Ethereum JSON-RPC endpoint. `portal_history_propagate` JSON-RPC API call: ```bash -./build/fluffy --network:testnet0 --table-ip-limit:1024 --bucket-ip-limit:24 --log-level:info --rpc +./build/fluffy --table-ip-limit:1024 --bucket-ip-limit:24 --log-level:info --rpc # From another shell curl -s -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":"1","method":"portal_history_propagate","params":["./user_data_dir/eth-history-data.json"]}' http://localhost:8545 | jq @@ -92,7 +92,7 @@ curl -s -X POST -H 'Content-Type: application/json' -d '{"jsonrpc":"2.0","id":"1 Run a Fluffy node with the JSON-RPC API enabled. ```bash -./build/fluffy --network:testnet0 --rpc --table-ip-limit:1024 --bucket-ip-limit:24 +./build/fluffy --rpc --table-ip-limit:1024 --bucket-ip-limit:24 ``` Build & run the `beacon_chain_bridge`: