Skip to content

London: EIP-3529 #3

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

Merged
birchmd merged 4 commits into from
Sep 7, 2021
Merged

London: EIP-3529 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c66240
Add MAX_REFUND_QUOTIENT parameter
birchmd Aug 25, 2021
33737b6
Reduce SSTORE_CLEARS_SCHEDULE value
birchmd Aug 25, 2021
6d2be2c
Remove the SELFDESTRUCT refund.
birchmd Aug 25, 2021
5251f48
Avoid some runtime arithmetic
birchmd Aug 25, 2021
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
28 changes: 6 additions & 22 deletions gasometer/src/costs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,10 @@ pub fn sstore_refund(original: H256, current: H256, new: H256, config: &Config)
}

if original == new {
let (gas_sstore_reset, gas_sload) = if config.increase_state_access_gas {
(
config.gas_sstore_reset - config.gas_sload_cold,
config.gas_storage_read_warm,
)
} else {
(config.gas_sstore_reset, config.gas_sload)
};
Comment on lines -42 to -49
Copy link
Copy Markdown
Member Author

@birchmd birchmd Aug 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I decided that doing this arithmetic at runtime was sub-optimal, so I pushed it into constructing the config itself with an addition const fn that takes some arguments. Computing these derived parameters at the level of constructing the config also makes the change to refund_sstore_clears in EIP-3529 cleaner.

if original == H256::default() {
refund += (config.gas_sstore_set - gas_sload) as i64;
refund += (config.gas_sstore_set - config.gas_sload) as i64;
} else {
refund += (gas_sstore_reset - gas_sload) as i64;
refund += (config.gas_sstore_reset - config.gas_sload) as i64;
}
}

Expand Down Expand Up @@ -214,37 +206,29 @@ pub fn sstore_cost(
is_cold: bool,
config: &Config,
) -> Result<u64, ExitError> {
let (gas_sload, gas_sstore_reset) = if config.increase_state_access_gas {
(
config.gas_storage_read_warm,
config.gas_sstore_reset - config.gas_sload_cold,
)
} else {
(config.gas_sload, config.gas_sstore_reset)
};
let gas_cost = if config.sstore_gas_metering {
if config.sstore_revert_under_stipend && gas <= config.call_stipend {
return Err(ExitError::OutOfGas);
}

if new == current {
gas_sload
config.gas_sload
} else {
if original == current {
if original == H256::zero() {
config.gas_sstore_set
} else {
gas_sstore_reset
config.gas_sstore_reset
}
} else {
gas_sload
config.gas_sload
}
}
} else {
if current == H256::zero() && new != H256::zero() {
config.gas_sstore_set
} else {
gas_sstore_reset
config.gas_sstore_reset
}
};
Ok(
Expand Down
2 changes: 1 addition & 1 deletion gasometer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ impl<'config> Inner<'config> {
} => costs::sstore_refund(original, current, new, self.config),
GasCost::Suicide {
already_removed, ..
} => costs::suicide_refund(already_removed),
} if !self.config.decrease_clears_refund => costs::suicide_refund(already_removed),
_ => 0,
}
}
Expand Down
94 changes: 41 additions & 53 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ pub struct Config {
pub gas_sstore_reset: u64,
/// Gas paid for sstore refund.
pub refund_sstore_clears: i64,
/// EIP-3529
pub max_refund_quotient: u64,
/// Gas paid for BALANCE opcode.
pub gas_balance: u64,
/// Gas paid for SLOAD opcode.
Expand Down Expand Up @@ -209,6 +211,8 @@ pub struct Config {
pub sstore_revert_under_stipend: bool,
/// EIP-2929
pub increase_state_access_gas: bool,
/// EIP-3529
pub decrease_clears_refund: bool,
/// EIP-3541
pub disallow_executable_format: bool,
/// Whether to throw out of gas error when
Expand Down Expand Up @@ -265,6 +269,7 @@ impl Config {
gas_sstore_set: 20000,
gas_sstore_reset: 5000,
refund_sstore_clears: 15000,
max_refund_quotient: 2,
gas_suicide: 0,
gas_suicide_new_account: 0,
gas_call: 40,
Expand All @@ -280,6 +285,7 @@ impl Config {
sstore_gas_metering: false,
sstore_revert_under_stipend: false,
increase_state_access_gas: false,
decrease_clears_refund: false,
disallow_executable_format: false,
err_on_call_with_more_gas: true,
empty_considered_exists: true,
Expand Down Expand Up @@ -314,6 +320,7 @@ impl Config {
gas_sstore_set: 20000,
gas_sstore_reset: 5000,
refund_sstore_clears: 15000,
max_refund_quotient: 2,
gas_suicide: 5000,
gas_suicide_new_account: 25000,
gas_call: 700,
Expand All @@ -329,6 +336,7 @@ impl Config {
sstore_gas_metering: true,
sstore_revert_under_stipend: true,
increase_state_access_gas: false,
decrease_clears_refund: false,
disallow_executable_format: false,
err_on_call_with_more_gas: false,
empty_considered_exists: false,
Expand All @@ -354,64 +362,43 @@ impl Config {

/// Berlin hard fork configuration.
pub const fn berlin() -> Config {
Config {
gas_ext_code: 0,
gas_ext_code_hash: 0,
gas_balance: 0,
gas_sload: 0,
gas_sload_cold: 2100,
gas_sstore_set: 20000,
gas_sstore_reset: 5000,
refund_sstore_clears: 15000,
gas_suicide: 5000,
gas_suicide_new_account: 25000,
gas_call: 0,
gas_expbyte: 50,
gas_transaction_create: 53000,
gas_transaction_call: 21000,
gas_transaction_zero_data: 4,
gas_transaction_non_zero_data: 16,
gas_access_list_address: 2400,
gas_access_list_storage_key: 1900,
gas_account_access_cold: 2600,
gas_storage_read_warm: 100,
sstore_gas_metering: true,
sstore_revert_under_stipend: true,
increase_state_access_gas: true,
disallow_executable_format: false,
err_on_call_with_more_gas: false,
empty_considered_exists: false,
create_increase_nonce: true,
call_l64_after_gas: true,
stack_limit: 1024,
memory_limit: usize::MAX,
call_stack_limit: 1024,
create_contract_limit: Some(0x6000),
call_stipend: 2300,
has_delegate_call: true,
has_create2: true,
has_revert: true,
has_return_data: true,
has_bitwise_shifting: true,
has_chain_id: true,
has_self_balance: true,
has_ext_code_hash: true,
has_base_fee: false,
estimate: false,
}
Self::config_with_derived_values(100, 2100, 1900, false, false)
}

/// london hard fork configuration.
pub const fn london() -> Config {
Self::config_with_derived_values(100, 2100, 1900, true, true)
}

const fn config_with_derived_values(
gas_storage_read_warm: u64,
gas_sload_cold: u64,
gas_access_list_storage_key: u64,
decrease_clears_refund: bool,
has_base_fee: bool,
) -> Config {
// See https://eips.ethereum.org/EIPS/eip-2929
let gas_sload = gas_storage_read_warm;
let gas_sstore_reset = 5000 - gas_sload_cold;

// See https://eips.ethereum.org/EIPS/eip-3529
let refund_sstore_clears = if decrease_clears_refund {
(gas_sstore_reset + gas_access_list_storage_key) as i64
} else {
15000
};
let max_refund_quotient = if decrease_clears_refund { 5 } else { 2 };

Config {
gas_ext_code: 0,
gas_ext_code_hash: 0,
gas_balance: 0,
gas_sload: 0,
gas_sload_cold: 2100,
gas_sload,
gas_sload_cold,
gas_sstore_set: 20000,
gas_sstore_reset: 5000,
refund_sstore_clears: 15000,
gas_sstore_reset,
refund_sstore_clears,
max_refund_quotient,
gas_suicide: 5000,
gas_suicide_new_account: 25000,
gas_call: 0,
Expand All @@ -421,13 +408,14 @@ impl Config {
gas_transaction_zero_data: 4,
gas_transaction_non_zero_data: 16,
gas_access_list_address: 2400,
gas_access_list_storage_key: 1900,
gas_access_list_storage_key,
gas_account_access_cold: 2600,
gas_storage_read_warm: 100,
gas_storage_read_warm,
sstore_gas_metering: true,
sstore_revert_under_stipend: true,
increase_state_access_gas: true,
disallow_executable_format: true,
decrease_clears_refund,
disallow_executable_format: false,
err_on_call_with_more_gas: false,
empty_considered_exists: false,
create_increase_nonce: true,
Expand All @@ -445,7 +433,7 @@ impl Config {
has_chain_id: true,
has_self_balance: true,
has_ext_code_hash: true,
has_base_fee: true,
has_base_fee,
estimate: false,
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/executor/stack/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ impl<'config, S: StackState<'config>> StackExecutor<'config, S> {
pub fn used_gas(&self) -> u64 {
self.state.metadata().gasometer.total_used_gas()
- min(
self.state.metadata().gasometer.total_used_gas() / 2,
self.state.metadata().gasometer.total_used_gas() / self.config.max_refund_quotient,
self.state.metadata().gasometer.refunded_gas() as u64,
)
}
Expand Down