forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up sanitizeCall

Browse source 
Co-authored-by: Gary Rong <garyrong0905@gmail.com>
This commit is contained in:
Sina Mahmoodi 2024-08-19 13:09:32 +02:00
parent 73ff7e51f6
commit 5d8c058fd4
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
internal/ethapi/simulate.go
View file

@ -264,18 +264,15 @@ func (sim *simulator) sanitizeCall(call *TransactionArgs, state *state.StateDB,
nonce := state.GetNonce(call.from()) nonce := state.GetNonce(call.from())
call.Nonce = (*hexutil.Uint64)(&nonce) call.Nonce = (*hexutil.Uint64)(&nonce)
} }
var gas uint64
if call.Gas != nil {
gas = uint64(*call.Gas)
}
if *gasUsed+gas > blockContext.GasLimit {
return &blockGasLimitReachedError{fmt.Sprintf("block gas limit reached: %d >= %d", gasUsed, blockContext.GasLimit)}
}
// Let the call run wild unless explicitly specified. // Let the call run wild unless explicitly specified.
if call.Gas == nil { if call.Gas == nil {
remaining := blockContext.GasLimit - *gasUsed remaining := blockContext.GasLimit - *gasUsed
call.Gas = (*hexutil.Uint64)(&remaining) call.Gas = (*hexutil.Uint64)(&remaining)
} }
if *gasUsed+uint64(*call.Gas) > blockContext.GasLimit {
return &blockGasLimitReachedError{fmt.Sprintf("block gas limit reached: %d >= %d", gasUsed, blockContext.GasLimit)}
}
if err := call.CallDefaults(sim.gp.Gas(), header.BaseFee, sim.chainConfig.ChainID); err != nil { if err := call.CallDefaults(sim.gp.Gas(), header.BaseFee, sim.chainConfig.ChainID); err != nil {
return err return err
} }

4
internal/ethapi/simulate_test.go
View file

@ -88,8 +88,8 @@ func TestSimulateSanitizeBlockOrder(t *testing.T) {
if b.BlockOverrides.Time == nil { if b.BlockOverrides.Time == nil {
t.Fatalf("testcase %d: block time not set", i) t.Fatalf("testcase %d: block time not set", i)
} }
if (uint64)(*b.BlockOverrides.Time) != tc.expected[bi].timestamp { if uint64(*b.BlockOverrides.Time) != tc.expected[bi].timestamp {
t.Errorf("testcase %d: block timestamp mismatch. Want %d, have %d", i, tc.expected[bi].timestamp, (uint64)(*b.BlockOverrides.Time)) t.Errorf("testcase %d: block timestamp mismatch. Want %d, have %d", i, tc.expected[bi].timestamp, uint64(*b.BlockOverrides.Time))
} }
have := b.BlockOverrides.Number.ToInt().Uint64() have := b.BlockOverrides.Number.ToInt().Uint64()
if have != tc.expected[bi].number { if have != tc.expected[bi].number {