Skip to content

Removing flags and data related to Ethereum testnets #1024

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.

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

Merged
merged 6 commits into from
May 6, 2020

Conversation

mrsmkl
Copy link
Contributor

@mrsmkl mrsmkl commented May 4, 2020

Description

Other changes

Tested

Related issues

Backwards compatibility

Copy link
Contributor

@kevjue kevjue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left some comments. PTAL.

@@ -238,7 +238,7 @@ func getGenesisAndKeys(n int, isFullChain bool) (*core.Genesis, []*ecdsa.Private
}

// generate genesis block
genesis := core.DefaultOttomanGenesisBlock()
genesis := core.DefaultGenesisBlock()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems to be a really big different between the default ottoman genesis block's extra data and the default genesis block's.

Do you know what that difference is?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly it's the mainnet genesis validators. They are replaced below in AppendValidatorsToGenesisBlock

@@ -181,7 +181,7 @@ func discv4Crawl(ctx *cli.Context) error {
}

func parseBootnodes(ctx *cli.Context) ([]*enode.Node, error) {
s := params.RinkebyBootnodes
s := params.AlfajoresBootnodes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason why you are using the Alfajores bootnodes here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like they just had some default here

},
Threshold: 2,
}

// TestnetChainConfig contains the chain parameters to run a node on the Ropsten test network.
TestnetChainConfig = &ChainConfig{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's used in tests.

@kevjue kevjue assigned mrsmkl and unassigned kevjue May 5, 2020
@mrsmkl mrsmkl assigned kevjue and unassigned mrsmkl May 5, 2020
Copy link
Contributor

@kevjue kevjue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@@ -33,6 +33,14 @@ var (
BaklavaGenesisHash = common.HexToHash("0x09bb180829b78343cc752e110c2ece86dad46904ffad9a5791b3440f140f1d7f")
)

var (
MainnetNetworkId = uint64(42220)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@kevjue kevjue assigned mrsmkl and unassigned kevjue May 6, 2020
@mrsmkl mrsmkl merged commit 2add2fa into master May 6, 2020
@mrsmkl mrsmkl deleted the mrsmkl/remove-eth-testnet-flags branch May 6, 2020 06:45
@mcortesi mcortesi added this to the 1.0.2 milestone Sep 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants