Merge pull request #5362 from sacherjj/update-capacity-2.1.0

Updating values for 8s blocks

Author: sacherjj

Makefile

@@ -131,7 +131,7 @@ lint-smart-contracts:
 
 .PHONY: audit-rs
 audit-rs:
-	$(CARGO) audit --ignore RUSTSEC-2024-0437 --ignore RUSTSEC-2025-0022
+	$(CARGO) audit --ignore RUSTSEC-2024-0437 --ignore RUSTSEC-2025-0022 --ignore RUSTSEC-2025-0055
 
 .PHONY: audit
 audit: audit-rs

resources/integration-test/chainspec.toml

@@ -27,7 +27,7 @@ maximum_net_message_size = 25_165_824
 era_duration = '120 minutes'
 # Minimum number of blocks per era.  An era will take longer than `era_duration` if that is necessary to reach the
 # minimum height.
-minimum_era_height = 20
+minimum_era_height = 100
 # Minimum difference between a block's and its child's timestamp.
 minimum_block_time = '8000 ms'
 # Number of slots available in validator auction.
@@ -90,7 +90,7 @@ finders_fee = [1, 5]
 # The proportion of baseline rewards going to reward finality signatures specifically.
 finality_signature_proportion = [95, 100]
 # Lookback interval indicating which past block we are looking at to reward.
-signature_rewards_max_delay = 3
+signature_rewards_max_delay = 6
 # Allows transfers between accounts in the blockchain network.
 #
 # Setting this to false restricts normal accounts from sending tokens to other accounts, allowing transfers only to administrators.
@@ -188,9 +188,9 @@ max_ttl = '2 hours'
 # The maximum number of approvals permitted in a single block.
 block_max_approval_count = 2600
 # Maximum block size in bytes including transactions contained by the block.  0 means unlimited.
-max_block_size = 5_242_880
+max_block_size = 2_621_400
 # The upper limit of total gas of all transactions in a block.
-block_gas_limit = 1_625_000_000_000
+block_gas_limit = 812_500_000_000
 # The minimum amount in motes for a valid native transfer.
 native_transfer_minimum_motes = 2_500_000_000
 # The maximum value to which `transaction_acceptor.timestamp_leeway` can be set in the config.toml file.
@@ -216,13 +216,13 @@ vm_casper_v2 = false
 # [2] -> Max args length size in bytes for a given transaction in a certain lane
 # [3] -> Transaction gas limit for a given transaction in a certain lane
 # [4] -> The maximum number of transactions the lane can contain
-native_mint_lane = [0, 2048, 1024, 100_000_000, 650]
-native_auction_lane = [1, 3096, 2048, 2_500_000_000, 650]
+native_mint_lane = [0, 2048, 1024, 100_000_000, 325]
+native_auction_lane = [1, 3096, 2048, 2_500_000_000, 325]
 install_upgrade_lane = [2, 750_000, 2048, 1_000_000_000_000, 1]
 wasm_lanes = [
     [3, 750_000, 2048, 1_000_000_000_000, 1],
     [4, 131_072, 1024, 100_000_000_000, 2],
-    [5, 65_536, 512, 5_000_000_000, 80]
+    [5, 65_536, 512, 5_000_000_000, 40]
 ]
 
 [transactions.deploy]

resources/integration-test/config-example.toml

@@ -46,15 +46,15 @@ max_attempts = 3
 # Default delay for the control events that have no dedicated delay requirements.
 control_logic_default_delay = '1 second'
 
-# Flag which forces the node to resync all of the blocks.
+# Flag which forces the node to resync all the blocks.
 force_resync = false
 
 # A timeout for the ShutdownForUpgrade state, after which the node will upgrade even if not all
 # conditions are satisfied.
 shutdown_for_upgrade_timeout = '2 minutes'
 
 # Maximum time a node will wait for an upgrade to commit.
-upgrade_timeout = '30 secs'
+upgrade_timeout = '30 seconds'
 
 # The node detects when it should do a controlled shutdown when it is in a detectably bad state
 # in order to avoid potentially catastrophic uncontrolled crashes. Generally, a node should be
@@ -94,7 +94,7 @@ secret_key_path = '/etc/casper/validator_keys/secret_key.pem'
 
 # The maximum number of blocks by which execution is allowed to lag behind finalization.
 # If it is more than that, consensus will pause, and resume once the executor has caught up.
-max_execution_delay = 3
+max_execution_delay = 6
 
 
 # =======================================
@@ -112,7 +112,7 @@ log_participation_interval = '1 minute'
 
 # The minimal proposal timeout. Validators wait this long for a proposal to receive a quorum of
 # echo messages, before they vote to make the round skippable and move on to the next proposer.
-proposal_timeout = '10 seconds'
+proposal_timeout = '5 seconds'
 
 # The additional proposal delay that is still considered fast enough, in percent. This should
 # take into account variables like empty vs. full blocks, network traffic etc.
@@ -525,7 +525,7 @@ validate_and_store_timeout = '1 minute'
 [block_accumulator]
 
 # Block height difference threshold for starting to execute the blocks.
-attempt_execution_threshold = 3
+attempt_execution_threshold = 6
 
 # Accepted time interval for inactivity in block accumulator.
 dead_air_interval = '3 minutes'
@@ -564,7 +564,7 @@ latch_reset_interval = '5 seconds'
 #
 # A higher value can avoid creating needless validation work on an already-validated proposed
 # block, but comes at the cost of increased memory consumption.
-max_completed_entries = 3
+max_completed_entries = 6
 
 
 # ==================================

resources/mainnet/chainspec.toml

@@ -27,7 +27,7 @@ maximum_net_message_size = 25_165_824
 era_duration = '120 minutes'
 # Minimum number of blocks per era.  An era will take longer than `era_duration` if that is necessary to reach the
 # minimum height.
-minimum_era_height = 20
+minimum_era_height = 100
 # Minimum difference between a block's and its child's timestamp.
 minimum_block_time = '8000 ms'
 # Number of slots available in validator auction.
@@ -90,7 +90,7 @@ finders_fee = [1, 5]
 # The proportion of baseline rewards going to reward finality signatures specifically.
 finality_signature_proportion = [95, 100]
 # Lookback interval indicating which past block we are looking at to reward.
-signature_rewards_max_delay = 3
+signature_rewards_max_delay = 6
 # Allows transfers between accounts in the blockchain network.
 #
 # Setting this to false restricts normal accounts from sending tokens to other accounts, allowing transfers only to administrators.
@@ -188,9 +188,9 @@ max_ttl = '2 hours'
 # The maximum number of approvals permitted in a single block.
 block_max_approval_count = 2600
 # Maximum block size in bytes including transactions contained by the block.  0 means unlimited.
-max_block_size = 5_242_880
+max_block_size = 2_621_400
 # The upper limit of total gas of all transactions in a block.
-block_gas_limit = 1_625_000_000_000
+block_gas_limit = 812_500_000_000
 # The minimum amount in motes for a valid native transfer.
 native_transfer_minimum_motes = 2_500_000_000
 # The maximum value to which `transaction_acceptor.timestamp_leeway` can be set in the config.toml file.
@@ -216,13 +216,13 @@ vm_casper_v2 = false
 # [2] -> Max args length size in bytes for a given transaction in a certain lane
 # [3] -> Transaction gas limit for a given transaction in a certain lane
 # [4] -> The maximum number of transactions the lane can contain
-native_mint_lane = [0, 2048, 1024, 100_000_000, 650]
-native_auction_lane = [1, 3096, 2048, 2_500_000_000, 650]
+native_mint_lane = [0, 2048, 1024, 100_000_000, 325]
+native_auction_lane = [1, 3096, 2048, 2_500_000_000, 325]
 install_upgrade_lane = [2, 750_000, 2048, 1_000_000_000_000, 1]
 wasm_lanes = [
     [3, 750_000, 2048, 1_000_000_000_000, 1],
     [4, 131_072, 1024, 100_000_000_000, 2],
-    [5, 65_536, 512, 5_000_000_000, 80]
+    [5, 65_536, 512, 5_000_000_000, 40]
 ]
 
 [transactions.deploy]

resources/mainnet/config-example.toml

@@ -94,7 +94,7 @@ secret_key_path = '/etc/casper/validator_keys/secret_key.pem'
 
 # The maximum number of blocks by which execution is allowed to lag behind finalization.
 # If it is more than that, consensus will pause, and resume once the executor has caught up.
-max_execution_delay = 3
+max_execution_delay = 6
 
 
 # =======================================
@@ -112,7 +112,7 @@ log_participation_interval = '1 minute'
 
 # The minimal proposal timeout. Validators wait this long for a proposal to receive a quorum of
 # echo messages, before they vote to make the round skippable and move on to the next proposer.
-proposal_timeout = '10 seconds'
+proposal_timeout = '5 seconds'
 
 # The additional proposal delay that is still considered fast enough, in percent. This should
 # take into account variables like empty vs. full blocks, network traffic etc.
@@ -525,7 +525,7 @@ validate_and_store_timeout = '1 minute'
 [block_accumulator]
 
 # Block height difference threshold for starting to execute the blocks.
-attempt_execution_threshold = 3
+attempt_execution_threshold = 6
 
 # Accepted time interval for inactivity in block accumulator.
 dead_air_interval = '3 minutes'
@@ -564,7 +564,7 @@ latch_reset_interval = '5 seconds'
 #
 # A higher value can avoid creating needless validation work on an already-validated proposed
 # block, but comes at the cost of increased memory consumption.
-max_completed_entries = 3
+max_completed_entries = 6
 
 
 # ==================================

resources/production/chainspec.toml

@@ -27,7 +27,7 @@ maximum_net_message_size = 25_165_824
 era_duration = '120 minutes'
 # Minimum number of blocks per era.  An era will take longer than `era_duration` if that is necessary to reach the
 # minimum height.
-minimum_era_height = 20
+minimum_era_height = 100
 # Minimum difference between a block's and its child's timestamp.
 minimum_block_time = '8000 ms'
 # Number of slots available in validator auction.
@@ -90,7 +90,7 @@ finders_fee = [1, 5]
 # The proportion of baseline rewards going to reward finality signatures specifically.
 finality_signature_proportion = [95, 100]
 # Lookback interval indicating which past block we are looking at to reward.
-signature_rewards_max_delay = 3
+signature_rewards_max_delay = 6
 # Allows transfers between accounts in the blockchain network.
 #
 # Setting this to false restricts normal accounts from sending tokens to other accounts, allowing transfers only to administrators.
@@ -188,9 +188,9 @@ max_ttl = '2 hours'
 # The maximum number of approvals permitted in a single block.
 block_max_approval_count = 2600
 # Maximum block size in bytes including transactions contained by the block.  0 means unlimited.
-max_block_size = 5_242_880
+max_block_size = 2_621_400
 # The upper limit of total gas of all transactions in a block.
-block_gas_limit = 1_625_000_000_000
+block_gas_limit = 812_500_000_000
 # The minimum amount in motes for a valid native transfer.
 native_transfer_minimum_motes = 2_500_000_000
 # The maximum value to which `transaction_acceptor.timestamp_leeway` can be set in the config.toml file.
@@ -216,13 +216,13 @@ vm_casper_v2 = false
 # [2] -> Max args length size in bytes for a given transaction in a certain lane
 # [3] -> Transaction gas limit for a given transaction in a certain lane
 # [4] -> The maximum number of transactions the lane can contain
-native_mint_lane = [0, 2048, 1024, 100_000_000, 650]
-native_auction_lane = [1, 3096, 2048, 2_500_000_000, 650]
+native_mint_lane = [0, 2048, 1024, 100_000_000, 325]
+native_auction_lane = [1, 3096, 2048, 2_500_000_000, 325]
 install_upgrade_lane = [2, 750_000, 2048, 1_000_000_000_000, 1]
 wasm_lanes = [
     [3, 750_000, 2048, 1_000_000_000_000, 1],
     [4, 131_072, 1024, 100_000_000_000, 2],
-    [5, 65_536, 512, 5_000_000_000, 80]
+    [5, 65_536, 512, 5_000_000_000, 40]
 ]
 
 [transactions.deploy]

resources/production/config-example.toml

@@ -94,7 +94,7 @@ secret_key_path = '/etc/casper/validator_keys/secret_key.pem'
 
 # The maximum number of blocks by which execution is allowed to lag behind finalization.
 # If it is more than that, consensus will pause, and resume once the executor has caught up.
-max_execution_delay = 3
+max_execution_delay = 6
 
 
 # =======================================
@@ -112,7 +112,7 @@ log_participation_interval = '1 minute'
 
 # The minimal proposal timeout. Validators wait this long for a proposal to receive a quorum of
 # echo messages, before they vote to make the round skippable and move on to the next proposer.
-proposal_timeout = '10 seconds'
+proposal_timeout = '5 seconds'
 
 # The additional proposal delay that is still considered fast enough, in percent. This should
 # take into account variables like empty vs. full blocks, network traffic etc.
@@ -525,7 +525,7 @@ validate_and_store_timeout = '1 minute'
 [block_accumulator]
 
 # Block height difference threshold for starting to execute the blocks.
-attempt_execution_threshold = 3
+attempt_execution_threshold = 6
 
 # Accepted time interval for inactivity in block accumulator.
 dead_air_interval = '3 minutes'
@@ -564,7 +564,7 @@ latch_reset_interval = '5 seconds'
 #
 # A higher value can avoid creating needless validation work on an already-validated proposed
 # block, but comes at the cost of increased memory consumption.
-max_completed_entries = 3
+max_completed_entries = 6
 
 
 # ==================================

resources/testnet/chainspec.toml

@@ -27,7 +27,7 @@ maximum_net_message_size = 25_165_824
 era_duration = '120 minutes'
 # Minimum number of blocks per era.  An era will take longer than `era_duration` if that is necessary to reach the
 # minimum height.
-minimum_era_height = 20
+minimum_era_height = 100
 # Minimum difference between a block's and its child's timestamp.
 minimum_block_time = '8000 ms'
 # Number of slots available in validator auction.
@@ -90,7 +90,7 @@ finders_fee = [1, 5]
 # The proportion of baseline rewards going to reward finality signatures specifically.
 finality_signature_proportion = [95, 100]
 # Lookback interval indicating which past block we are looking at to reward.
-signature_rewards_max_delay = 3
+signature_rewards_max_delay = 6
 # Allows transfers between accounts in the blockchain network.
 #
 # Setting this to false restricts normal accounts from sending tokens to other accounts, allowing transfers only to administrators.
@@ -121,7 +121,7 @@ refund_handling = { type = 'refund', refund_ratio = [75, 100] }
 #   'accumulate': fees are accumulated in a special purse and distributed at the end of each era evenly among all
 #                 administrator accounts
 #   'burn': fees are burned
-fee_handling = { type = 'pay_to_proposer' }
+fee_handling = { type = 'burn' }
 # If a validator would recieve a validator credit, it cannot exceed this percentage of their total stake.
 validator_credit_cap = [1, 5]
 # Defines how pricing is handled.
@@ -188,9 +188,9 @@ max_ttl = '2 hours'
 # The maximum number of approvals permitted in a single block.
 block_max_approval_count = 2600
 # Maximum block size in bytes including transactions contained by the block.  0 means unlimited.
-max_block_size = 5_242_880
+max_block_size = 2_621_400
 # The upper limit of total gas of all transactions in a block.
-block_gas_limit = 1_625_000_000_000
+block_gas_limit = 812_500_000_000
 # The minimum amount in motes for a valid native transfer.
 native_transfer_minimum_motes = 2_500_000_000
 # The maximum value to which `transaction_acceptor.timestamp_leeway` can be set in the config.toml file.
@@ -216,13 +216,13 @@ vm_casper_v2 = false
 # [2] -> Max args length size in bytes for a given transaction in a certain lane
 # [3] -> Transaction gas limit for a given transaction in a certain lane
 # [4] -> The maximum number of transactions the lane can contain
-native_mint_lane = [0, 2048, 1024, 100_000_000, 650]
-native_auction_lane = [1, 3096, 2048, 2_500_000_000, 650]
+native_mint_lane = [0, 2048, 1024, 100_000_000, 325]
+native_auction_lane = [1, 3096, 2048, 2_500_000_000, 325]
 install_upgrade_lane = [2, 750_000, 2048, 1_000_000_000_000, 1]
 wasm_lanes = [
     [3, 750_000, 2048, 1_000_000_000_000, 1],
     [4, 131_072, 1024, 100_000_000_000, 2],
-    [5, 65_536, 512, 5_000_000_000, 80]
+    [5, 65_536, 512, 5_000_000_000, 40]
 ]
 
 [transactions.deploy]
@@ -359,7 +359,7 @@ call_package_version = { cost = 300_000_000, arguments = [0, 0, 0, 0, 0, 0, 0, 1
 
 [wasm.v2]
 # Amount of free memory each contract can use for stack.
-max_memory = 17
+max_memory = 64
 
 [wasm.v2.opcode_costs]
 # Bit operations multiplier.