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

skip deny call if readonly #121

Merged
merged 4 commits into from
Dec 8, 2024
Merged

skip deny call if readonly #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6501f2
skip deny call if readonly
tak1827 Dec 6, 2024
2e7455c
denycall check in estimate gas
tak1827 Dec 6, 2024
7dba25c
improve print of To
tak1827 Dec 6, 2024
2e5208d
Merge branch 'main' into feat/deny-write-only
tak1827 Dec 6, 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
4 changes: 3 additions & 1 deletion core/vm/evm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ func (evm *EVM) Interpreter() *EVMInterpreter {
// execution error or failed value transfer.
func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas uint64, value *uint256.Int) (ret []byte, leftOverGas uint64, err error) {
// Fail if the address is not allowed to call
if IsDeniedToCall(evm.StateDB, addr) {
// Skip the check if this call is readonly (eth_call)
readOnly := evm.Config.NoBaseFee
if !readOnly && IsDeniedToCall(evm.StateDB, addr) {
return nil, 0, ErrUnauthorizedCall
}
// Fail if we're trying to execute above the call depth limit
Expand Down
7 changes: 6 additions & 1 deletion internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,11 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
if err != nil {
return 0, err
}
// Fail if the address is not allowed to call
to := args.To
if to != nil && vm.IsDeniedToCall(state, *to) {
return 0, fmt.Errorf("the calling contract is in denlylist. to: %s", to.Hex())
}
estimate, revert, err := gasestimator.Estimate(ctx, call, opts, gasCap)
if err != nil {
if len(revert) > 0 {
Expand Down Expand Up @@ -1867,7 +1872,7 @@ func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (c
}
// Fail if the address is not allowed to call
if to != nil && vm.IsDeniedToCall(state, *to) {
return common.Hash{}, fmt.Errorf("the calling contract is in denlylist. to: %s", to)
return common.Hash{}, fmt.Errorf("the calling contract is in denlylist. to: %s", to.Hex())
}

if err := b.SendTx(ctx, tx); err != nil {
Expand Down