aboutsummaryrefslogtreecommitdiffstats
path: root/core/vm
diff options
context:
space:
mode:
authorrjl493456442 <garyrong0905@gmail.com>2017-08-21 08:47:15 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-08-22 23:35:17 +0800
commit28aea46ac08579f3ecd1c35620915b8e1bfcc8b0 (patch)
treea2d00f77c624c5c255af1d05873eb3c5b0f17591 /core/vm
parent2fd5ba6bd41380cf0e21d3ec0ca4bbc4aa7b6c34 (diff)
downloaddexon-28aea46ac08579f3ecd1c35620915b8e1bfcc8b0.tar.gz
dexon-28aea46ac08579f3ecd1c35620915b8e1bfcc8b0.tar.zst
dexon-28aea46ac08579f3ecd1c35620915b8e1bfcc8b0.zip
core: implement Metropolis EIP 658, receipt status byte
Diffstat (limited to 'core/vm')
-rw-r--r--core/vm/evm.go6
-rw-r--r--core/vm/instructions.go2
2 files changed, 6 insertions, 2 deletions
diff --git a/core/vm/evm.go b/core/vm/evm.go
index 8d654c666..34933a1dc 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -158,7 +158,7 @@ func (evm *EVM) Call(caller ContractRef, addr common.Address, input []byte, gas
evm.Transfer(evm.StateDB, caller.Address(), to.Address(), value)
// initialise a new contract and set the code that is to be used by the
- // E The contract is a scoped evmironment for this execution context
+ // E The contract is a scoped environment for this execution context
// only.
contract := NewContract(caller, to, value, gas)
contract.SetCallCode(&addr, evm.StateDB.GetCodeHash(addr), evm.StateDB.GetCode(addr))
@@ -351,6 +351,10 @@ func (evm *EVM) Create(caller ContractRef, code []byte, gas uint64, value *big.I
contract.UseGas(contract.Gas)
}
}
+ // Assign err if contract code size exceeds the max while the err is still empty.
+ if maxCodeSizeExceeded && err == nil {
+ err = errMaxCodeSizeExceeded
+ }
return ret, contractAddr, contract.Gas, err
}
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index ece4d2229..b6d6e22c4 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -33,6 +33,7 @@ var (
errWriteProtection = errors.New("evm: write protection")
errReturnDataOutOfBounds = errors.New("evm: return data out of bounds")
errExecutionReverted = errors.New("evm: execution reverted")
+ errMaxCodeSizeExceeded = errors.New("evm: max code size exceeded")
)
func opAdd(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) {
@@ -619,7 +620,6 @@ func opCall(pc *uint64, evm *EVM, contract *Contract, memory *Memory, stack *Sta
if value.Sign() != 0 {
gas += params.CallStipend
}
-
ret, returnGas, err := evm.Call(contract, address, args, gas, value)
if err != nil {
stack.push(new(big.Int))