Fix check of EIP-3607 transaction for internal calls #1018
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, we will skip the checks for the EIP-3607.
|
@sorpaas PTAL |
koushiro
commented
Mar 14, 2023
frame/evm/src/runner/stack.rs
Outdated
Comment on lines
133
to
150
| // Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. | ||
| // If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, | ||
| // we will skip the checks for the EIP-3607. | ||
| if is_transactional { | ||
| // EIP-3607: https://eips.ethereum.org/EIPS/eip-3607 | ||
| // Do not allow transactions for which `tx.sender` has any code deployed. | ||
| // | ||
| // We extend the principle of this EIP to also prevent `tx.sender` to be the address | ||
| // of a precompile. While mainnet Ethereum currently only has stateless precompiles, | ||
| // projects using Frontier can have stateful precompiles that can manage funds or | ||
| // which calls other contracts that expects this precompile address to be trustworthy. | ||
| if !<AccountCodes<T>>::get(source).is_empty() || precompiles.is_precompile(source) { | ||
| return Err(RunnerError { | ||
| error: Error::<T>::TransactionMustComeFromEOA, | ||
| weight, | ||
| }); | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| // Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. | |
| // If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, | |
| // we will skip the checks for the EIP-3607. | |
| if is_transactional { | |
| // EIP-3607: https://eips.ethereum.org/EIPS/eip-3607 | |
| // Do not allow transactions for which `tx.sender` has any code deployed. | |
| // | |
| // We extend the principle of this EIP to also prevent `tx.sender` to be the address | |
| // of a precompile. While mainnet Ethereum currently only has stateless precompiles, | |
| // projects using Frontier can have stateful precompiles that can manage funds or | |
| // which calls other contracts that expects this precompile address to be trustworthy. | |
| if !<AccountCodes<T>>::get(source).is_empty() || precompiles.is_precompile(source) { | |
| return Err(RunnerError { | |
| error: Error::<T>::TransactionMustComeFromEOA, | |
| weight, | |
| }); | |
| } | |
| } | |
| // Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. | |
| // If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, | |
| // we will skip the checks for the EIP-3607. | |
| // | |
| // EIP-3607: https://eips.ethereum.org/EIPS/eip-3607 | |
| // Do not allow transactions for which `tx.sender` has any code deployed. | |
| // | |
| // We extend the principle of this EIP to also prevent `tx.sender` to be the address | |
| // of a precompile. While mainnet Ethereum currently only has stateless precompiles, | |
| // projects using Frontier can have stateful precompiles that can manage funds or | |
| // which calls other contracts that expects this precompile address to be trustworthy. | |
| if is_transactional && !<AccountCodes<T>>::get(source).is_empty() || precompiles.is_precompile(source) { | |
| return Err(RunnerError { | |
| error: Error::<T>::TransactionMustComeFromEOA, | |
| weight, | |
| }); | |
| } |
There was a problem hiding this comment.
There was a problem hiding this comment.
Good question, I'd say in non-transactional context we don't care, @nanocryk to confirm
There was a problem hiding this comment.
Sounds good to me
@nanocryk so calling non-transactional call with stateful precompiles as the source will be fine, right?
There was a problem hiding this comment.
Please apply the other suggestions and change this to a single if statement.
|
Once this PR is merged, @sorpaas can you cherry-pick it to the polkadot-v0.9.36, polkadot-v0.9.37 and polkadot-v0.9.38 branches？ |
koushiro
changed the title
sorpaas
reviewed
Mar 14, 2023
frame/evm/src/runner/stack.rs
Outdated
Comment on lines
133
to
150
| // Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. | ||
| // If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, | ||
| // we will skip the checks for the EIP-3607. | ||
| if is_transactional { | ||
| // EIP-3607: https://eips.ethereum.org/EIPS/eip-3607 | ||
| // Do not allow transactions for which `tx.sender` has any code deployed. | ||
| // | ||
| // We extend the principle of this EIP to also prevent `tx.sender` to be the address | ||
| // of a precompile. While mainnet Ethereum currently only has stateless precompiles, | ||
| // projects using Frontier can have stateful precompiles that can manage funds or | ||
| // which calls other contracts that expects this precompile address to be trustworthy. | ||
| if !<AccountCodes<T>>::get(source).is_empty() || precompiles.is_precompile(source) { | ||
| return Err(RunnerError { | ||
| error: Error::<T>::TransactionMustComeFromEOA, | ||
| weight, | ||
| }); | ||
| } | ||
| } |
There was a problem hiding this comment.
Please apply the other suggestions and change this to a single if statement.
sorpaas
approved these changes
Mar 15, 2023
Dinonard
pushed a commit
to AstarNetwork/frontier
that referenced
this pull request
Mar 22, 2023
* Improve check of EIP-3607 Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, we will skip the checks for the EIP-3607. * fix eip-3607 tests * apply review suggtions
tgmichel
pushed a commit
to moonbeam-foundation/frontier
that referenced
this pull request
Apr 12, 2023
* Improve check of EIP-3607 Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction. If the source of this EVM operation is from an internal call, like from `eth_call` or `eth_estimateGas` RPC, we will skip the checks for the EIP-3607. * fix eip-3607 tests * apply review suggtions
Closed
37 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only check the restrictions of EIP-3607 if the source of the EVM operation is from an external transaction.
If the source of this EVM operation is from an internal call, like from
eth_calloreth_estimateGasRPC, we will skip the checks for the EIP-3607.related PR and discuss: #905
cc @tgmichel @nanocryk