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

suave_structs.go: Marshal bytes to hexstring #206

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

suave_structs.go: Marshal bytes to hexstring #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a7d39e
suave_structs.go: Marshal bytes to hexstring
jinmel Feb 23, 2024
90c099e
Json Marshal / Unmarshal for suave_structs
jinmel Feb 24, 2024
ef99fa4
fix failing test
jinmel Feb 24, 2024
ce4994a
move withdrawals back
jinmel Feb 24, 2024
b6f0b61
one liner for suavedevtools command
jinmel Feb 24, 2024
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
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ devtools:

suavedevtools:
go run ./suave/gen/main.go -write
cd core/types && \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you use // go:generate to do this? https://github.com/flashbots/suave-execution-geth/blob/feature/e2e-block-building-builderapi/suave/builder/api/api.go#L15

go run github.com/fjl/gencodec -type BuildBlockArgs -field-override buildBlockArgsMarshaling -out gen_build_block_args_json.go && \
go run github.com/fjl/gencodec -type DataRecord -field-override dataRecordMarshaling -out gen_data_record_json.go && \
go run github.com/fjl/gencodec -type HttpRequest -field-override httpRequestMarshaling -out gen_http_request_json.go && \
go run github.com/fjl/gencodec -type SimulatedLog -field-override simulatedLogMarshaling -out gen_simulated_log_json.go

devnet-up:
docker-compose -f ./suave/devenv/docker-compose.yml up -d --build
Expand Down
97 changes: 97 additions & 0 deletions core/types/gen_build_block_args_json.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions core/types/gen_data_record_json.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions core/types/gen_http_request_json.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions core/types/gen_simulated_log_json.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 38 additions & 1 deletion core/types/suave_structs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions core/types/withdrawal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,12 @@ package types
import (
"bytes"

"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/rlp"
)

//go:generate go run github.com/fjl/gencodec -type Withdrawal -field-override withdrawalMarshaling -out gen_withdrawal_json.go
//go:generate go run ../../rlp/rlpgen -type Withdrawal -out gen_withdrawal_rlp.go

// field type overrides for gencodec
type withdrawalMarshaling struct {
Index hexutil.Uint64
Validator hexutil.Uint64
Amount hexutil.Uint64
}

// Withdrawals implements DerivableList for withdrawals.
type Withdrawals []*Withdrawal

Expand Down
Loading
Loading