Skip to content

Commit

Permalink
Merge pull request ethereum#283 from ethereum/settings_patch_3
Browse files Browse the repository at this point in the history
Backport `master` into `dev` to resolve merge conflicts
  • Loading branch information
CarlBeek authored Aug 1, 2022
2 parents 5608c7c + 5c7f791 commit 259cfea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion staking_deposit/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class BaseChainSetting(NamedTuple):
MainnetSetting = BaseChainSetting(NETWORK_NAME=MAINNET, GENESIS_FORK_VERSION=bytes.fromhex('00000000'))
# Ropsten setting
RopstenSetting = BaseChainSetting(NETWORK_NAME=ROPSTEN, GENESIS_FORK_VERSION=bytes.fromhex('80000069'))
# Goreli setting
# Goerli setting
GoerliSetting = BaseChainSetting(NETWORK_NAME=GOERLI, GENESIS_FORK_VERSION=bytes.fromhex('00001020'))
# Merge Testnet (spec v1.1.9)
KilnSetting = BaseChainSetting(NETWORK_NAME=KILN, GENESIS_FORK_VERSION=bytes.fromhex('70000069'))
Expand Down

0 comments on commit 259cfea

Please sign in to comment.