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.

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

Fix config toml, go generate #614

Merged
merged 7 commits into from
Feb 5, 2024
Merged

Fix config toml, go generate #614

merged 7 commits into from
Feb 5, 2024

Conversation

meowsbits
Copy link
Member

Fixes #613

  • fix ethconfig.Config field data types for ECBP fields. These were *big.Int and should have been *uint64. These data types percolate through backend.go.
	// Manual configuration field for ECBP1100 activation number. Used for modifying genesis config via CLI flag.
	ECBP1100 *uint64 `toml:",omitempty"`
	// Manual configuration field for ECBP1100's disablement block number. Used for modifying genesis config via CLI flag.
	OverrideECBP1100Deactivate *uint64 `toml:",omitempty"`
  • go generate files were not up to date, so I ran `go generate -skip=trezor ./...
    • and then manually edit gen_genesis.go to re-implement the config type switch between core-geth and go-ethereum config types (yuck!)
  • install workflow_dispatch run trigger for the go-generate-check workflow, in addition to the existing pull_request

…CBP config fields (*big.Int -> *uint64)

Date: 2024-02-05 09:53:17-07:00
Signed-off-by: meows <[email protected]>
…o-ethereum config types

Date: 2024-02-05 09:54:38-07:00
Signed-off-by: meows <[email protected]>
…dd missing omitempty tags

Date: 2024-02-05 10:01:44-07:00
Signed-off-by: meows <[email protected]>
Date: 2024-02-05 10:04:07-07:00
Signed-off-by: meows <[email protected]>
…tch for core-geth vs. go-ethereum config types

Date: 2024-02-05 10:04:35-07:00
Signed-off-by: meows <[email protected]>
Date: 2024-02-05 10:06:16-07:00
Signed-off-by: meows <[email protected]>
eth/ethconfig/gen_config.go Show resolved Hide resolved
…CBP1100

Date: 2024-02-05 11:00:37-07:00
Signed-off-by: meows <[email protected]>
@meowsbits meowsbits merged commit 10f96b3 into master Feb 5, 2024
7 checks passed
@meowsbits meowsbits deleted the fix-config-toml branch February 5, 2024 18:31
@ziogaschr ziogaschr mentioned this pull request Feb 5, 2024
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.

dumpconfig creates an invalid config.toml (ECBP1100 cannot umarshal <nil> into a *big.Int)
2 participants