Skip to content
This repository was archived by the owner on Mar 25, 2024. It is now read-only.

Increase the max number of transactions #90

Open
StanislavBreadless wants to merge 3 commits into
base: sb-short-term-fee-model
Choose a base branch
from
Open

Increase the max number of transactions #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50890c9
increase the max number of transactions
StanislavBreadless Dec 20, 2023
ae8cbce
update hashes
StanislavBreadless Dec 21, 2023
2306296
fix tests
StanislavBreadless Dec 21, 2023
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
6 changes: 3 additions & 3 deletions SystemConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"GUARANTEED_PUBDATA_BYTES": 4000,
"GUARANTEED_PUBDATA_BYTES": 2500,
"MAX_PUBDATA_PER_BATCH": 110000,
"MAX_TRANSACTIONS_IN_BATCH": 1024,
"MAX_TRANSACTIONS_IN_BATCH": 10000,
"BATCH_OVERHEAD_L2_GAS": 1200000,
"BATCH_OVERHEAD_L1_GAS": 1000000,
"L2_TX_INTRINSIC_GAS": 14070,
"L2_TX_INTRINSIC_PUBDATA": 0,
"L1_TX_INTRINSIC_L2_GAS": 167157,
"L1_TX_INTRINSIC_PUBDATA": 88,
"MAX_GAS_PER_TRANSACTION": 80000000,
"BOOTLOADER_MEMORY_FOR_TXS": 8740224,
"BOOTLOADER_MEMORY_FOR_TXS": 9090400,
"REFUND_GAS": 7343,
"KECCAK_ROUND_COST_GAS": 40,
"SHA256_ROUND_COST_GAS": 7,
Expand Down
20 changes: 10 additions & 10 deletions SystemContractsHashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,35 +143,35 @@
"contractName": "bootloader_test",
"bytecodePath": "bootloader/build/artifacts/bootloader_test.yul/bootloader_test.yul.zbin",
"sourceCodePath": "bootloader/build/bootloader_test.yul",
"bytecodeHash": "0x010003871d9dbf8cdc9c25d97d725dca2bbd658c551628fbe77458cf64626b63",
"sourceCodeHash": "0x5b2cb43a2a83ba657187efb7377ff8858ba9a51485c421b3055f511169cd1a65"
"bytecodeHash": "0x01000387fa76559d0df2d0f9f06efda609d11c1c692ebd10827d7002a964b424",
"sourceCodeHash": "0x0e250a6284d47f2b757cb955b3f53b3ac0a2cce79660c444c335981043791b55"
},
{
"contractName": "fee_estimate",
"bytecodePath": "bootloader/build/artifacts/fee_estimate.yul/fee_estimate.yul.zbin",
"sourceCodePath": "bootloader/build/fee_estimate.yul",
"bytecodeHash": "0x0100092d7d402dca4a77c8e5f47c143e5779ee7edc25c2cbe0e1abff183d5833",
"sourceCodeHash": "0xc03a9aabafce234d655e622cff7b9736b61a1d08862b7a0e5afd30cffc222bb1"
"bytecodeHash": "0x0100092b313fdaea6c53ca2011417745de9189e1d2f1be480c9681c02df316eb",
"sourceCodeHash": "0x167654857459f00c816d09124bcf2cd586ef0d08079f3cb567d537e408f7ca1e"
},
{
"contractName": "gas_test",
"bytecodePath": "bootloader/build/artifacts/gas_test.yul/gas_test.yul.zbin",
"sourceCodePath": "bootloader/build/gas_test.yul",
"bytecodeHash": "0x0100090ff9e5ef7642f9793acf34ba31c12bc05960be06d53e20637dd9265312",
"sourceCodeHash": "0x1d3df4312992f5d5f544f673f78651643f8b164c632ca7ff7287d917483b4eb7"
"bytecodeHash": "0x0100090f6d844b7128543475d4305a9eaf3be6f4d5729531576ccf8c73167582",
"sourceCodeHash": "0x41761dc7d8e29b62e88b47555e47151ec5264bc05e1388ac2646e408cd1b9e17"
},
{
"contractName": "playground_batch",
"bytecodePath": "bootloader/build/artifacts/playground_batch.yul/playground_batch.yul.zbin",
"sourceCodePath": "bootloader/build/playground_batch.yul",
"bytecodeHash": "0x01000937833ef6f01f1c15e7c7b28a3ac366474794ea1e1d9baed3a5df3e4149",
"sourceCodeHash": "0x1467ad390de5a71f6a0ecb126e6ad8961d25282e9718d550c5896d189f368715"
"bytecodeHash": "0x0100093542b810474566e3ff6631bb81291f700170dc654d7c7d3248aed80368",
"sourceCodeHash": "0xbddc075e4e2cce310b33e0f9ceb359ea28e7c77fadbeb4e32808f41037067a25"
},
{
"contractName": "proved_batch",
"bytecodePath": "bootloader/build/artifacts/proved_batch.yul/proved_batch.yul.zbin",
"sourceCodePath": "bootloader/build/proved_batch.yul",
"bytecodeHash": "0x0100091db35bd842092fa15c510ceeda10fe2335d4fa227d401bcc3acfe76919",
"sourceCodeHash": "0xaeec797f935e752e6f97de079bea605c6ff03369f9c98adbf9012747d1b5d3e4"
"bytecodeHash": "0x0100091df001e15b8b8f3cc7b1f332f4c682599a041ded8a7c319d667f0e5c29",
"sourceCodeHash": "0xdcdce61a86b4f0ace4c1e8dc90aefbd04e085851491681ce364c97217482f39e"
}
]
12 changes: 3 additions & 9 deletions bootloader/bootloader.yul
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ object "Bootloader" {
/// It is roughly equal to 80kk/MAX_TRANSACTIONS_PER_BATCH, i.e. how many gas would an L1->L2 transaction
/// need to pay to compensate for the batch being closed.
/// @dev It is expected of the operator to set the "fair L2 gas price" appropriately to ensure that it is
/// compensated enough in case the batch might be prematurely sealed because of the memory being filled up.
/// compensated enough in case the batch might be prematurely sealed because of the transaction slots being filled up.
function TX_SLOT_OVERHEAD_GAS() -> ret {
ret := 80000
ret := 10000
}

/// @dev The overhead for each byte of the bootloader memory that the encoding of the transaction.
Expand Down Expand Up @@ -106,12 +106,6 @@ object "Bootloader" {
ret := 17
}

/// @dev The size of the bootloader memory that is to spent by the transaction's
/// encodings.
function BOOTLOADER_MEMORY_FOR_TXS() -> ret {
ret := {{BOOTLOADER_MEMORY_FOR_TXS}}
}

/// @dev Whether the batch is allowed to accept transactions with
/// gasPerPubdataByteLimit = 0. On mainnet, this is forbidden for safety reasons.
function FORBID_ZERO_GAS_PER_PUBDATA() -> ret {
Expand Down Expand Up @@ -410,7 +404,7 @@ object "Bootloader" {
/// for the sake of simplicity we will spend 32 bytes on each
/// of those for now.
function MAX_MEM_SIZE() -> ret {
ret := 0x1000000 // 2^24 bytes
ret := 24000000
}

function L1_TX_INTRINSIC_L2_GAS() -> ret {
Expand Down
26 changes: 13 additions & 13 deletions bootloader/test_infra/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions bootloader/test_infra/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ edition = "2021"

[dependencies]

vm = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-integration" }
zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-integration" }
zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-integration" }
zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-integration" }
zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-integration" }
vlog = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-integration" }
vm = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-with-big-batch" }
zksync_types = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-with-big-batch" }
zksync_contracts = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-with-big-batch" }
zksync_utils = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-with-big-batch" }
zksync_state = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-with-big-batch" }
vlog = { git = "https://github.com/matter-labs/zksync-era.git", branch = "boojum-with-big-batch" }

colored = "2.0"
hex = "0.4"
Expand Down