Skip to content

fix: EthCall UnmarshalJSON compatible Input field #6506

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

Merged
merged 2 commits into from
Oct 30, 2025
Merged

fix: EthCall UnmarshalJSON compatible Input field #6506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73b426e
fix: EthCall UnmarshalJSON compatible Input field
simlecode Oct 29, 2025
dc96b00
chore: fix lint
simlecode Oct 29, 2025
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: 3 additions & 2 deletions venus-devtool/state-type-gen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ var stateTypesOpt = option{
// venus-shared/actors/types
var sharedTypesOpt = option{
skipStructs: map[string]struct{}{
"ActorV5": {},
"TempEthCall": {},
"ActorV5": {},
"EthCallDecode": {},
"EthCallRaw": {},
},
skipAllVar: false,
skipVars: []string{"Eip155ChainID"},
Expand Down
18 changes: 15 additions & 3 deletions venus-shared/actors/types/eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,13 +308,25 @@ func (c *EthCall) ToFilecoinMessage() (*Message, error) {
}

func (c *EthCall) UnmarshalJSON(b []byte) error {
type TempEthCall EthCall
var params TempEthCall
type EthCallRaw EthCall // Avoid a recursive call.
type EthCallDecode struct {
// The field should be "input" by spec, but many clients use "data" so we support
// both, but prefer "input".
Input *EthBytes `json:"input"`
EthCallRaw
}

var params EthCallDecode
if err := json.Unmarshal(b, &params); err != nil {
return err
}
*c = EthCall(params)

// If input is specified, prefer it.
if params.Input != nil {
params.Data = *params.Input
}

*c = EthCall(params.EthCallRaw)
return nil
}

Expand Down
Loading