diff --git a/Makefile b/Makefile index 193cba95b..1ad0c721d 100644 --- a/Makefile +++ b/Makefile @@ -188,7 +188,7 @@ testnet0 testnet1: | beacon_node signing_process $(GOERLI_TESTNETS_PARAMS) $(NODE_PARAMS) # https://www.gnu.org/software/make/manual/html_node/Multi_002dLine.html -define CONNECT_TO_NETWORK = +define CONNECT_TO_NETWORK mkdir -p build/data/shared_$(1)_$(NODE_ID) scripts/make_prometheus_config.sh \ @@ -204,7 +204,7 @@ define CONNECT_TO_NETWORK = $(GOERLI_TESTNETS_PARAMS) $(NODE_PARAMS) endef -define CONNECT_TO_NETWORK_IN_DEV_MODE = +define CONNECT_TO_NETWORK_IN_DEV_MODE mkdir -p build/data/shared_$(1)_$(NODE_ID) scripts/make_prometheus_config.sh \ @@ -219,7 +219,7 @@ define CONNECT_TO_NETWORK_IN_DEV_MODE = $(GOERLI_TESTNETS_PARAMS) --dump $(NODE_PARAMS) endef -define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT = +define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT # if launching a VC as well - send the BN looking nowhere for validators/secrets mkdir -p build/data/shared_$(1)_$(NODE_ID)/empty_dummy_folder @@ -246,7 +246,7 @@ define CONNECT_TO_NETWORK_WITH_VALIDATOR_CLIENT = --rpc-port=$$(( $(BASE_RPC_PORT) +$(NODE_ID) )) endef -define MAKE_DEPOSIT_DATA = +define MAKE_DEPOSIT_DATA build/beacon_node deposits create \ --network=$(1) \ --new-wallet-file=build/data/shared_$(1)_$(NODE_ID)/wallet.json \ @@ -256,7 +256,7 @@ define MAKE_DEPOSIT_DATA = --count=$(VALIDATORS) endef -define MAKE_DEPOSIT = +define MAKE_DEPOSIT build/beacon_node deposits create \ --network=$(1) \ --out-deposits-file=nbc-$(1)-deposits.json \ @@ -273,7 +273,7 @@ define MAKE_DEPOSIT = --ask-for-key endef -define CLEAN_NETWORK = +define CLEAN_NETWORK rm -rf build/data/shared_$(1)*/db rm -rf build/data/shared_$(1)*/dump rm -rf build/data/shared_$(1)*/*.log diff --git a/beacon_chain/keystore_management.nim b/beacon_chain/keystore_management.nim index a7afa1d46..b167c92b9 100644 --- a/beacon_chain/keystore_management.nim +++ b/beacon_chain/keystore_management.nim @@ -431,7 +431,7 @@ proc createWalletInteractively*( echo80 "Please back up the seed phrase now to a safe location as " & "if you are protecting a sensitive password. The seed phrase " & - "can be used to withdrawl funds from your wallet." + "can be used to withdraw funds from your wallet." echo "" echo "Did you back up your seed recovery phrase?\p" & diff --git a/docs/the_nimbus_book/src/create_wallet_and_deposit.md b/docs/the_nimbus_book/src/create_wallet_and_deposit.md index f96fc9307..55ba2737e 100644 --- a/docs/the_nimbus_book/src/create_wallet_and_deposit.md +++ b/docs/the_nimbus_book/src/create_wallet_and_deposit.md @@ -6,7 +6,7 @@ In this chapter, we'll take you through how to create an [EIP-2386](https://gith > **Note:** this page is primarily aimed at users who wish to run multiple validators on several machines. If you simply wish to get one validator up and running with Nimbus, or run several validators on a single machine, we recommend following our [become a Medalla validator](./medalla.md) guide instead. -For our purposes, a wallet is the [EIP-2386](https://github.com/ethereum/EIPs/blob/4494da0966afa7318ec0157948821b19c4248805/EIPS/eip-2386.md) JSON file which contains an encrypted seed, a name, and a counter (`nextaccount`) that allows for generating validator keystores incrementally as outlined in [EIP-2334](https://eips.ethereum.org/EIPS/eip-2334) (Deterministic Account Hierarchy). It's sometimes referred to as a wallestore. +For our purposes, a wallet is the [EIP-2386](https://github.com/ethereum/EIPs/blob/4494da0966afa7318ec0157948821b19c4248805/EIPS/eip-2386.md) JSON file which contains an encrypted seed, a name, and a counter (`nextaccount`) that allows for generating validator keystores incrementally as outlined in [EIP-2334](https://eips.ethereum.org/EIPS/eip-2334) (Deterministic Account Hierarchy). It's sometimes referred to as a walletstore. Such a wallet can create (and restore) keys from a *seed* and a *path*. The encrypted seed is stored in the wallet (it needs to be accessible to create new keys). Further, the wallet also has a mechanism (a `nextaccount` index) for maintaining state about which keys have been generated (to help ensure you don't duplicate a key by accident). diff --git a/docs/the_nimbus_book/src/spadina.md b/docs/the_nimbus_book/src/spadina.md index 5dd5f7a7b..495875663 100644 --- a/docs/the_nimbus_book/src/spadina.md +++ b/docs/the_nimbus_book/src/spadina.md @@ -88,7 +88,7 @@ This tutorial assumes basic knowledge of the [command line](https://www.learneno INF 2020-09-27 17:33:56.912+02:00 Eth1 block processed tid=8490483 file=mainchain_monitor.nim:717 block=3423176:0ac7969b totalDeposits=1 ``` - > **Note:** as it stands, Nimbus defaults to using Infura to keep track of eth1 deposits. However we are well aware that Infura is less than ideal from a decentralisation perspective. As such we are in the process of changing the default to [Geth](https://geth.ethereum.org/docs/install-and-build/installing-geth) (with Infura as a fallback). For some rough notes on how to use Geth with Nimbus, see [here]() (we will be adding more complete instructions to this book very soon). + > **Note:** as it stands, Nimbus defaults to using Infura to keep track of eth1 deposits. However we are well aware that Infura is less than ideal from a decentralisation perspective. As such we are in the process of changing the default to [Geth](https://geth.ethereum.org/docs/install-and-build/installing-geth) (with Infura as a fallback). For some rough notes on how to use Geth with Nimbus, see [here](https://gist.github.com/onqtam/aaf883d46f4dab1311ca9c160df12fe4) (we will be adding more complete instructions to this book very soon). ## 4. Keep an eye on your validator