grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6092 from paritytech/returndata-fix

Browse Source 
Place RETURNDATA behind block number gate
This commit is contained in:
Robert Habermeier 2017-07-19 15:26:28 +02:00 committed by GitHub
commit 253bc333c7
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethcore/evm/src/interpreter/mod.rs
View File

@ -211,6 +211,7 @@ impl<Cost: CostType> Interpreter<Cost> {
if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) || if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) ||
(instruction == instructions::CREATE2 && !schedule.have_create2) || (instruction == instructions::CREATE2 && !schedule.have_create2) ||
(instruction == instructions::STATICCALL && !schedule.have_static_call) || (instruction == instructions::STATICCALL && !schedule.have_static_call) ||
((instruction == instructions::RETURNDATACOPY || instruction == instructions::RETURNDATASIZE) && !schedule.have_return_data) ||
(instruction == instructions::REVERT && !schedule.have_revert) { (instruction == instructions::REVERT && !schedule.have_revert) {
return Err(evm::Error::BadInstruction { return Err(evm::Error::BadInstruction {

5
ethcore/evm/src/schedule.rs
View File

@ -107,6 +107,8 @@ pub struct Schedule {
pub blockhash_gas: usize, pub blockhash_gas: usize,
/// Static Call opcode enabled. /// Static Call opcode enabled.
pub have_static_call: bool, pub have_static_call: bool,
/// RETURNDATA and RETURNDATASIZE opcodes enabled.
pub have_return_data: bool,
/// Kill basic accounts below this balance if touched. /// Kill basic accounts below this balance if touched.
pub kill_dust: CleanDustMode, pub kill_dust: CleanDustMode,
} }
@ -140,6 +142,7 @@ impl Schedule {
have_delegate_call: true, have_delegate_call: true,
have_create2: false, have_create2: false,
have_revert: false, have_revert: false,
have_return_data: false,
stack_limit: 1024, stack_limit: 1024,
max_depth: 1024, max_depth: 1024,
tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0], tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],
@ -190,6 +193,7 @@ impl Schedule {
schedule.have_create2 = true; schedule.have_create2 = true;
schedule.have_revert = true; schedule.have_revert = true;
schedule.have_static_call = true; schedule.have_static_call = true;
schedule.have_return_data = true;
schedule.blockhash_gas = 350; schedule.blockhash_gas = 350;
schedule schedule
} }
@ -200,6 +204,7 @@ impl Schedule {
have_delegate_call: hdc, have_delegate_call: hdc,
have_create2: false, have_create2: false,
have_revert: false, have_revert: false,
have_return_data: false,
stack_limit: 1024, stack_limit: 1024,
max_depth: 1024, max_depth: 1024,
tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0], tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],

2
ethcore/res/ethereum/tests

@ -1 +1 @@
Subproject commit 4e8b9be3fba16ec32e0cdf50b8f9329826283aaa Subproject commit ef191fdc61cf76cdb9cdc147465fb447304b0ed2

1
ethcore/src/spec/spec.rs
View File

@ -100,6 +100,7 @@ impl CommonParams {
schedule.have_create2 = block_number >= self.eip86_transition; schedule.have_create2 = block_number >= self.eip86_transition;
schedule.have_revert = block_number >= self.eip140_transition; schedule.have_revert = block_number >= self.eip140_transition;
schedule.have_static_call = block_number >= self.eip214_transition; schedule.have_static_call = block_number >= self.eip214_transition;
schedule.have_return_data = block_number >= self.eip211_transition;
if block_number >= self.eip210_transition { if block_number >= self.eip210_transition {
schedule.blockhash_gas = 350; schedule.blockhash_gas = 350;
} }