Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport master into dev to resolve merge conflicts #283

Merged
merged 10 commits into from
Aug 1, 2022
Merged

Backport master into dev to resolve merge conflicts #283

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ce8cbb6
Merge pull request #252 from ethereum/dev
CarlBeek Mar 29, 2022
9b03623
Merge pull request #259 from ethereum/dev
CarlBeek May 24, 2022
9ab0b05
Merge pull request #261 from ethereum/dev
hwwhww May 24, 2022
7087718
Add Sepolia support and remove Kintsugi support
hwwhww Jun 10, 2022
70cadd6
Merge pull request #265 from ethereum/sepolia
CarlBeek Jun 13, 2022
cad017c
replace backslashes with forwardslashes
lightclient Jun 18, 2022
371f660
Merge pull request #266 from lightclient/patch-1
djrtwo Jul 18, 2022
7371d69
Revert "Replace backslashes with forwardslashes"
hwwhww Aug 1, 2022
89bb3cd
Merge pull request #281 from ethereum/revert-266-patch-1
CarlBeek Aug 1, 2022
cef5e0f
resolve merge conflicts
CarlBeek Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion staking_deposit/settings.py
View file
Open in desktop
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