Merge pull request matter-labs#19 from zkLinkProtocol/ci

update linea sepolia config
SuccinctPaul · Apr 1, 2024 · b03e823 · b03e823
2 parents aecafbb + adb34d5
commit b03e823
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 43 deletions.
diff --git a/contracts b/contracts
diff --git a/etc/env/zkmoon.toml b/etc/env/zkmoon.toml
@@ -1,10 +1,39 @@
-# zkmoon: deploy on arbitrum sepolia testnet
+# zkmoon: deploy on linea sepolia testnet
 [contracts]
-CREATE2_FACTORY_ADDR="0x40fcee4450B3DA99Da62a37aB80385cFAF5328EB"
-L1_MULTICALL3_ADDR="0xa2e77C99f68F21c300A82a733e43c4d8AF6344dC"
+CREATE2_FACTORY_ADDR="0x30eBC88CbA430FEC2D65b11040f872166C33aB33"
+L1_MULTICALL3_ADDR="0x2B8b38524Dcf1a45052CE76cB23BB629590c3712"
+
+[api.web3_json_rpc]
+max_tx_size=1000000
+
+[chain.state_keeper]
+proof_sending_mode="SkipEveryProof"
+# tx number limit
+transaction_slots=1500
+miniblock_commit_deadline_ms=2000
+block_commit_deadline_ms=600000
+max_gas_per_batch=5000000
+# tx gas limit
+max_single_tx_gas=4000000
+close_block_at_gas_percentage=0.95
+reject_tx_at_gas_percentage=0.95
+# tx size limit: default 60000(59kb)
+close_block_at_eth_params_percentage=0.95
+reject_tx_at_eth_params_percentage=0.95
+# zkevm circuit limit
+close_block_at_geometry_percentage=0.95
+reject_tx_at_geometry_percentage=0.95
+# calculate fee
+max_pubdata_per_batch=100000
 
 [eth_sender]
 [eth_sender.sender]
-proof_sending_mode="OnlyRealProofs"
-max_aggregated_tx_gas=100000000
+# Priority fee to be used by GasAdjuster (in wei).
+default_priority_fee_per_gas=100_000_000
+max_aggregated_tx_gas=5000000
+max_eth_tx_data_size=59000
+tx_poll_period=60
+aggregate_tx_poll_period=60
 proof_loading_mode="FriProofFromGcs"
+# Max L2 blocks to execute in one L1 transaction
+max_aggregated_blocks_to_execute=1
diff --git a/etc/env/zktitan.toml b/etc/env/zktitan.toml
+8 −82		l1-contracts/contracts/bridge/L1ERC20Bridge.sol
+0 −11		l1-contracts/contracts/bridge/L1WethBridge.sol
+0 −20		l1-contracts/contracts/bridge/interfaces/IL1Bridge.sol
+0 −8		l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol
+5 −2		l1-contracts/contracts/zksync/facets/Admin.sol
+7 −9		l1-contracts/contracts/zksync/facets/Mailbox.sol
+3 −2		l1-contracts/contracts/zksync/libraries/PriorityQueue.sol
+1 −0		l1-contracts/package.json
+65 −0		l1-contracts/scripts/deploy-create2.ts
+6 −0		l1-contracts/scripts/deploy.ts
+10 −1		l1-contracts/scripts/verify.ts
+4 −75		l2-contracts/contracts/bridge/L2ERC20Bridge.sol
+0 −10		l2-contracts/contracts/bridge/L2WethBridge.sol
+0 −18		l2-contracts/contracts/bridge/interfaces/IL2Bridge.sol
+0 −40		l2-contracts/contracts/bridge/interfaces/IMergeTokenPortal.sol
+1 −2		l2-contracts/package.json
+0 −96		l2-contracts/src/execute-governance-tx.ts
+3 −11		l2-contracts/src/upgradeBridgeImpl.ts
+1 −5		l2-contracts/src/verify-l2-erc20-bridge.ts