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

core/vm: make contract creation failed if address collisions #15038

Closed
wants to merge 1 commit into from
Closed

core/vm: make contract creation failed if address collisions #15038

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions core/vm/evm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ type (
GetHashFunc func(uint64) common.Hash
)

const emptyNonce uint64 = 0

// run runs the given contract and takes care of running precompiles with a fallback to the byte code interpreter.
func run(evm *EVM, snapshot int, contract *Contract, input []byte) ([]byte, error) {
if contract.CodeAddr != nil {
Expand Down Expand Up @@ -314,7 +316,18 @@ func (evm *EVM) Create(caller ContractRef, code []byte, gas uint64, value *big.I

snapshot := evm.StateDB.Snapshot()
contractAddr = crypto.CreateAddress(caller.Address(), nonce)

// When a contract creation is on an account with non-zero nonce or non-empty code,
// the creation fails as if init code execution resulted in an exceptional halt.
// This applies to contract creation triggered by a contract creation transaction
// and by CREATE instruction.
if evm.StateDB.GetNonce(contractAddr) > emptyNonce || evm.StateDB.GetCode(contractAddr) != nil {
// In case of address collision, all gas remained will been consumed.
return nil, common.Address{}, 0, errAddressCollision
}

evm.StateDB.CreateAccount(contractAddr)

if evm.ChainConfig().IsEIP158(evm.BlockNumber) {
evm.StateDB.SetNonce(contractAddr, 1)
}
Expand Down
1 change: 1 addition & 0 deletions core/vm/instructions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var (
errReturnDataOutOfBounds = errors.New("evm: return data out of bounds")
errExecutionReverted = errors.New("evm: execution reverted")
errMaxCodeSizeExceeded = errors.New("evm: max code size exceeded")
errAddressCollision = errors.New("evm: contract address collision")
)

func opAdd(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
Expand Down