forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-15 17:30:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

review feedback

Browse source
This commit is contained in:
Guillaume Ballet 2026-03-11 12:43:21 +01:00
parent 57cff66861
commit d86d56c8cf
No known key found for this signature in database
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmd/fetchpayload/main.go
View file

@ -90,7 +90,8 @@ func main() {
fatal("failed to fetch execution witness: %v", err) fatal("failed to fetch execution witness: %v", err)
} }
witness, err := fromExtWitness(&extWitness) witness := new(stateless.Witness)
err = witness.FromExtWitness(&extWitness)
if err != nil { if err != nil {
fatal("failed to convert witness: %v", err) fatal("failed to convert witness: %v", err)
} }
@ -154,23 +155,6 @@ func parseBlockNumber(s string) (*big.Int, error) {
return n, nil return n, nil
} }
// fromExtWitness converts the consensus ExtWitness into the internal Witness.
// Duplicated from core/stateless (unexported method) and cmd/keeper/getpayload_example.go.
func fromExtWitness(ext *stateless.ExtWitness) (*stateless.Witness, error) {
w := &stateless.Witness{}
w.Headers = ext.Headers
w.Codes = make(map[string]struct{}, len(ext.Codes))
for _, code := range ext.Codes {
w.Codes[string(code)] = struct{}{}
}
w.State = make(map[string]struct{}, len(ext.State))
for _, node := range ext.State {
w.State[string(node)] = struct{}{}
}
return w, nil
}
// jsonPayload is a JSON-friendly representation of Payload. It uses ExtWitness // jsonPayload is a JSON-friendly representation of Payload. It uses ExtWitness
// instead of the internal Witness (which has no JSON marshaling). // instead of the internal Witness (which has no JSON marshaling).
type jsonPayload struct { type jsonPayload struct {

6
core/stateless/encoding.go
View file

@ -40,8 +40,8 @@ func (w *Witness) ToExtWitness() *ExtWitness {
return ext return ext
} }
// fromExtWitness converts the consensus witness format into our internal one. // FromExtWitness converts the consensus witness format into our internal one.
func (w *Witness) fromExtWitness(ext *ExtWitness) error { func (w *Witness) FromExtWitness(ext *ExtWitness) error {
w.Headers = ext.Headers w.Headers = ext.Headers
w.Codes = make(map[string]struct{}, len(ext.Codes)) w.Codes = make(map[string]struct{}, len(ext.Codes))
@ -66,7 +66,7 @@ func (w *Witness) DecodeRLP(s *rlp.Stream) error {
if err := s.Decode(&ext); err != nil { if err := s.Decode(&ext); err != nil {
return err return err
} }
return w.fromExtWitness(&ext) return w.FromExtWitness(&ext)
} }
// ExtWitness is a witness RLP encoding for transferring across clients. // ExtWitness is a witness RLP encoding for transferring across clients.