Skip to content

internal/ethapi/override: added support for more granular storage slot override #32874

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

internal/ethapi/override: added support for more granular storage slot override #32874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions internal/ethapi/override/override.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type OverrideAccount struct {
Balance *hexutil.Big `json:"balance"`
State map[common.Hash]common.Hash `json:"state"`
StateDiff map[common.Hash]common.Hash `json:"stateDiff"`
StateDiffMask map[common.Hash]common.Hash `json:"stateDiffMask"`
MovePrecompileTo *common.Address `json:"movePrecompileToAddress"`
}

Expand Down Expand Up @@ -98,8 +99,8 @@ func (diff *StateOverride) Apply(statedb *state.StateDB, precompiles vm.Precompi
u256Balance, _ := uint256.FromBig((*big.Int)(account.Balance))
statedb.SetBalance(addr, u256Balance, tracing.BalanceChangeUnspecified)
}
if account.State != nil && account.StateDiff != nil {
return fmt.Errorf("account %s has both 'state' and 'stateDiff'", addr.Hex())
if account.State != nil && (account.StateDiff != nil || account.StateDiffMask != nil) {
return fmt.Errorf("account %s has both 'state' and 'stateDiff' or 'stateDiffMask'", addr.Hex())
}
// Replace entire state if caller requires.
if account.State != nil {
Expand All @@ -108,7 +109,15 @@ func (diff *StateOverride) Apply(statedb *state.StateDB, precompiles vm.Precompi
// Apply state diff into specified accounts.
if account.StateDiff != nil {
for key, value := range account.StateDiff {
statedb.SetState(addr, key, value)
if mask, ok := account.StateDiffMask[key]; !ok {
statedb.SetState(addr, key, value)
} else {
curSlotVal := statedb.GetState(addr, key)
for i := range curSlotVal {
curSlotVal[i] = ^mask[i]&curSlotVal[i] | value[i]
}
statedb.SetState(addr, key, curSlotVal)
}
}
}
}
Expand Down
Loading