From d206a96ec3083f9b0650479364ad45c711b621a4 Mon Sep 17 00:00:00 2001 From: sandakersmann Date: Mon, 22 Jun 2020 17:39:09 +0200 Subject: [PATCH 1/3] Increase default gas limit to 12.5M --- ethcore/res/instant_seal.json | 2 +- parity/cli/mod.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ethcore/res/instant_seal.json b/ethcore/res/instant_seal.json index b2199ebc35a..8b0df90c479 100644 --- a/ethcore/res/instant_seal.json +++ b/ethcore/res/instant_seal.json @@ -38,7 +38,7 @@ "timestamp": "0x00", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "extraData": "0x", - "gasLimit": "0x7A1200" + "gasLimit": "0xBEBC20" }, "accounts": { "0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } }, diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 6fa642deece..8e669109b8d 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -749,11 +749,11 @@ usage! { "--price-update-period=[T]", "T will be allowed to pass between each gas price update. T may be daily, hourly, a number of seconds, or a time string of the form \"2 days\", \"30 minutes\" etc..", - ARG arg_gas_floor_target: (String) = "8000000", or |c: &Config| c.mining.as_ref()?.gas_floor_target.clone(), + ARG arg_gas_floor_target: (String) = "12500000", or |c: &Config| c.mining.as_ref()?.gas_floor_target.clone(), "--gas-floor-target=[GAS]", "Amount of gas per block to target when sealing a new block.", - ARG arg_gas_cap: (String) = "10000000", or |c: &Config| c.mining.as_ref()?.gas_cap.clone(), + ARG arg_gas_cap: (String) = "15000000", or |c: &Config| c.mining.as_ref()?.gas_cap.clone(), "--gas-cap=[GAS]", "A cap on how large we will raise the gas limit per block due to transaction volume.", @@ -1862,7 +1862,7 @@ mod tests { arg_gas_price_percentile: 50usize, arg_usd_per_eth: "auto".into(), arg_price_update_period: "hourly".into(), - arg_gas_floor_target: "8000000".into(), + arg_gas_floor_target: "12500000".into(), arg_gas_cap: "10000000".into(), arg_extra_data: Some("Parity".into()), flag_tx_queue_no_unfamiliar_locals: false, From 214701ed0ec55eb403df3336a1401f16cbe1e9ec Mon Sep 17 00:00:00 2001 From: sandakersmann Date: Mon, 22 Jun 2020 17:45:08 +0200 Subject: [PATCH 2/3] Set arg_gas_cap to 15M --- parity/cli/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 8e669109b8d..538bdc095f5 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -1863,7 +1863,7 @@ mod tests { arg_usd_per_eth: "auto".into(), arg_price_update_period: "hourly".into(), arg_gas_floor_target: "12500000".into(), - arg_gas_cap: "10000000".into(), + arg_gas_cap: "15000000".into(), arg_extra_data: Some("Parity".into()), flag_tx_queue_no_unfamiliar_locals: false, flag_tx_queue_no_early_reject: false, From 2009a3c82450492f0810277106b2cf63dd4376de Mon Sep 17 00:00:00 2001 From: sandakersmann Date: Fri, 26 Jun 2020 03:29:03 +0200 Subject: [PATCH 3/3] Update tests with new gas_floor_target and gas_cap --- parity/cli/tests/config.full.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parity/cli/tests/config.full.toml b/parity/cli/tests/config.full.toml index f58fab3d8ad..1c6de0e945d 100644 --- a/parity/cli/tests/config.full.toml +++ b/parity/cli/tests/config.full.toml @@ -121,8 +121,8 @@ min_gas_price = 0 usd_per_tx = "0.0001" usd_per_eth = "auto" price_update_period = "hourly" -gas_floor_target = "8000000" -gas_cap = "10000000" +gas_floor_target = "12500000" +gas_cap = "15000000" tx_queue_size = 8192 tx_queue_locals = ["0xdeadbeefcafe0000000000000000000000000000"] tx_queue_strategy = "gas_factor"