Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Implement CREATE2 gas changes and fix some potential overflowing #9694

Merged
merged 4 commits into from
Oct 4, 2018
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Split CREATE and CREATE2 in gasometer
sorpaas committed Oct 4, 2018

Verified

This commit was signed with the committer’s verified signature.
not-an-aardvark Teddy Katz
commit e06fd538396436b9bbe4a294caae8d3b4b2033c8
25 changes: 14 additions & 11 deletions ethcore/evm/src/interpreter/gasometer.rs
Original file line number Diff line number Diff line change
@@ -231,20 +231,23 @@ impl<Gas: evm::CostType> Gasometer<Gas> {

Request::GasMemProvide(gas, mem, Some(requested))
},
instructions::CREATE | instructions::CREATE2 => {
instructions::CREATE {
let start = stack.peek(1);
let len = stack.peek(2);

let gas = match instruction {
instructions::CREATE => Gas::from(schedule.create_gas),
instructions::CREATE2 => {
let base = Gas::from(schedule.create_gas);
let word = overflowing!(add_gas_usize(Gas::from_u256(*len)?, 31)) >> 5;
let word_gas = overflowing!(Gas::from(schedule.sha3_word_gas).overflow_mul(word));
overflowing!(base.overflow_add(word_gas))
},
_ => unreachable!("CREATE/CREATE2 branch is checked above; qed"),
};
let gas = Gas::from(schedule.create_gas);
let mem = mem_needed(start, len)?;

Request::GasMemProvide(gas, mem, None)
},
instructions::CREATE2 => {
let start = stack.peek(1);
let len = stack.peek(2);

let base = Gas::from(schedule.create_gas);
let word = overflowing!(add_gas_usize(Gas::from_u256(*len)?, 31)) >> 5;
let word_gas = overflowing!(Gas::from(schedule.sha3_word_gas).overflow_mul(word));
let gas = overflowing!(base.overflow_add(word_gas));
let mem = mem_needed(start, len)?;

Request::GasMemProvide(gas, mem, None)