From c30093e2f2d5004a84e86158e83c8d87c195600e Mon Sep 17 00:00:00 2001 From: Danil Date: Tue, 30 Jul 2024 13:27:25 +0200 Subject: [PATCH] Fix wait confirmations Signed-off-by: Danil --- .../deployments-zk/hardhat/.chainId | 1 - .../Paymaster.sol/Paymaster.json | 262 ------------------ etc/env/base/eth_sender.toml | 2 +- .../src/commands/ecosystem/init.rs | 5 - 4 files changed, 1 insertion(+), 269 deletions(-) delete mode 100644 core/tests/ts-integration/deployments-zk/hardhat/.chainId delete mode 100644 core/tests/ts-integration/deployments-zk/hardhat/contracts/paymaster-nonce/Paymaster.sol/Paymaster.json diff --git a/core/tests/ts-integration/deployments-zk/hardhat/.chainId b/core/tests/ts-integration/deployments-zk/hardhat/.chainId deleted file mode 100644 index d1d22901aac..00000000000 --- a/core/tests/ts-integration/deployments-zk/hardhat/.chainId +++ /dev/null @@ -1 +0,0 @@ -0x7a69 \ No newline at end of file diff --git a/core/tests/ts-integration/deployments-zk/hardhat/contracts/paymaster-nonce/Paymaster.sol/Paymaster.json b/core/tests/ts-integration/deployments-zk/hardhat/contracts/paymaster-nonce/Paymaster.sol/Paymaster.json deleted file mode 100644 index 53fa0be6f9b..00000000000 --- a/core/tests/ts-integration/deployments-zk/hardhat/contracts/paymaster-nonce/Paymaster.sol/Paymaster.json +++ /dev/null @@ -1,262 +0,0 @@ -{ - "sourceName": "contracts/paymaster-nonce/Paymaster.sol", - "contractName": "Paymaster", - "abi": [ - { - "inputs": [], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "inputs": [ - { - "internalType": "bytes", - "name": "_context", - "type": "bytes" - }, - { - "components": [ - { - "internalType": "uint256", - "name": "txType", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "from", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "to", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "gasLimit", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "gasPerPubdataByteLimit", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxFeePerGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxPriorityFeePerGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "paymaster", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "nonce", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - }, - { - "internalType": "uint256[4]", - "name": "reserved", - "type": "uint256[4]" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - }, - { - "internalType": "bytes32[]", - "name": "factoryDeps", - "type": "bytes32[]" - }, - { - "internalType": "bytes", - "name": "paymasterInput", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "reservedDynamic", - "type": "bytes" - } - ], - "internalType": "struct Transaction", - "name": "_transaction", - "type": "tuple" - }, - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - }, - { - "internalType": "enum ExecutionResult", - "name": "_txResult", - "type": "uint8" - }, - { - "internalType": "uint256", - "name": "_maxRefundedGas", - "type": "uint256" - } - ], - "name": "postTransaction", - "outputs": [], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - }, - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - }, - { - "components": [ - { - "internalType": "uint256", - "name": "txType", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "from", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "to", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "gasLimit", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "gasPerPubdataByteLimit", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxFeePerGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "maxPriorityFeePerGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "paymaster", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "nonce", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "value", - "type": "uint256" - }, - { - "internalType": "uint256[4]", - "name": "reserved", - "type": "uint256[4]" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "signature", - "type": "bytes" - }, - { - "internalType": "bytes32[]", - "name": "factoryDeps", - "type": "bytes32[]" - }, - { - "internalType": "bytes", - "name": "paymasterInput", - "type": "bytes" - }, - { - "internalType": "bytes", - "name": "reservedDynamic", - "type": "bytes" - } - ], - "internalType": "struct Transaction", - "name": "_transaction", - "type": "tuple" - } - ], - "name": "validateAndPayForPaymasterTransaction", - "outputs": [ - { - "internalType": "bytes4", - "name": "magic", - "type": "bytes4" - }, - { - "internalType": "bytes", - "name": "context", - "type": "bytes" - } - ], - "stateMutability": "payable", - "type": "function" - }, - { - "stateMutability": "payable", - "type": "receive" - } - ], - "bytecode": "0x0002000000000002000300000000000200000000030100190000006003300270000000550330019700010000003103550000008004000039000000400040043f0000000102200190000000430000c13d000000040230008c0000004b0000413d000000000201043b000000e002200270000000570420009c0000004f0000613d000000580220009c000000880000c13d000000040230008a000000c00420008c000000880000413d0000000404100370000000000404043b000000590540009c000000880000213d00000023054000390000005a06000041000000000735004b000000000700001900000000070680190000005a05500197000000000805004b00000000060080190000005a0550009c000000000607c019000000000506004b000000880000c13d0000000405400039000000000551034f000000000505043b000000590650009c000000880000213d00000000045400190000002404400039000000000334004b000000880000213d0000002403100370000000000303043b000000590430009c000000880000213d00000000023200490000005a03000041000002600420008c000000000400001900000000040340190000005a02200197000000000502004b000000000300a0190000005a0220009c000000000304c019000000000203004b000000880000c13d0000008401100370000000000101043b000000010110008c000000880000213d0000004d0000013d0000000001000416000000000101004b000000880000c13d00000020010000390000010000100443000001200000044300000056010000410000014f0001042e000000000103004b000000880000c13d00000000010000190000014f0001042e000000040230008a000000600220008c000000880000413d0000004402100370000000000402043b000000590240009c000000880000213d00000000064300490000005a05000041000002640260008c000000000200001900000000020540190000005a07600197000000000807004b000000000800001900000000080520190000005a0770009c000000000802c019000000000208004b000000880000c13d0000022402400039000000000721034f000000000707043b000000230660008a000000000867004b000000000800001900000000080580190000005a066001970000005a09700197000000000a69004b0000000005008019000000000669013f0000005a0660009c000000000508c019000000000505004b000000880000c13d00000000054700190000000404500039000000000441034f000000000404043b000000590640009c000000880000213d000000000343004900000024055000390000005a06000041000000000735004b000000000700001900000000070620190000005a033001970000005a05500197000000000835004b0000000006008019000000000335013f0000005a0330009c000000000607c019000000000306004b0000008a0000613d00000000010000190000015000010430000000030340008c000000980000213d0000006101000041000000800010043f0000002001000039000000840010043f0000003a01000039000000a40010043f0000006601000041000000c40010043f0000006701000041000000e40010043f00000068010000410000015000010430000001200220008a000000000321034f000000000303043b000000000303004b000000a70000c13d0000006101000041000000800010043f0000002001000039000000840010043f0000000f01000039000000a40010043f0000006401000041000000c40010043f00000065010000410000015000010430000000a00320008a000000000331034f000000600220008a000000000121034f000000000101043b000000000203043b000000000302004b000000e50000c13d0000000001000415000000030110008a00010020001000cd00000000010004140000005502000041000000550310009c0000000001028019000000c0011002100000800102000039014e01490000040f00010000000103550000006001100270000000550010019d0000000101000029000000050110027000000001012001950000000001000032000000fc0000c13d000000400100043d0000000102200190000001350000613d000000200210003900000040030000390000000000320435000000630200004100000000002104350000004003100039000000600200043d00000000002304350000006003100039000000000402004b000000d70000613d000000000400001900000000053400190000008006400039000000000606043300000000006504350000002004400039000000000524004b000000d00000413d000000000332001900000000000304350000007f02200039000000200300008a000000000232016f0000005503000041000000550420009c0000000002038019000000550410009c000000000103801900000040011002100000006002200210000000000112019f0000014f0001042e00000000432100a900000000422300d9000000000121004b0000012f0000c13d0000000001000415000000020110008a00010020001000cd0000000001000414000000000203004b000000b30000613d0000005502000041000000550410009c0000000001028019000000c0011002100000005d011001c7000080090200003900008001040000390000000005000019014e01490000040f0000000003000415000000020330008a00010020003000cd000000b90000013d0000005e0310009c0000012b0000813d0000001f03100039000000200400008a000000000343016f0000003f03300039000000000343016f000000400400043d0000000003340019000000000543004b00000000050000190000000105004039000000590630009c0000012b0000213d00000001055001900000012b0000c13d000000400030043f0000001f0310018f0000000004140436000000010500036700000005011002720000011b0000613d000000000600001900000005076002100000000008740019000000000775034f000000000707043b00000000007804350000000106600039000000000716004b000001130000413d000000000603004b000000c10000613d0000000501100210000000000515034f00000000011400190000000303300210000000000401043300000000043401cf000000000434022f000000000505043b0000010003300089000000000535022f00000000033501cf000000000343019f0000000000310435000000c10000013d0000005b0100004100000000001004350000004101000039000001320000013d0000005b0100004100000000001004350000001101000039000000040010043f0000005c01000041000001500001043000000064021000390000005f03000041000000000032043500000044021000390000006003000041000000000032043500000024021000390000002a030000390000000000320435000000610200004100000000002104350000000402100039000000200300003900000000003204350000005502000041000000550310009c0000000001028019000000400110021000000062011001c700000150000104300000014c002104210000000102000039000000000001042d0000000002000019000000000001042d0000014e000004320000014f0001042e000001500001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff000000020000000000000000000000000000004000000100000000000000000000000000000000000000000000000000000000000000000000000000038a24bc00000000000000000000000000000000000000000000000000000000817b17f0000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002400000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000626f6f746c6f61646572000000000000000000000000000000000000000000004661696c656420746f207472616e736665722066756e647320746f207468652008c379a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000084000000000000000000000000038a24bc000000000000000000000000000000000000000000000000000000004e6f6e6365206973207a65726f6f6f00000000000000000000000000000000000000000000000000000000000000000000000064000000800000000000000000546865207374616e64617264207061796d617374657220696e707574206d757374206265206174206c656173742034206279746573206c6f6e6700000000000000000000000000000000000000000000000000840000008000000000000000000000000000000000000000000000000000000000000000000000000000000000ddfcbfb9db176001459915906c7a4f5d3b7fea25b54def876ddf95cc6f9633b0", - "entries": [ - { - "constructorArgs": [], - "salt": "0x0000000000000000000000000000000000000000000000000000000000000000", - "deploymentType": "create", - "factoryDeps": [], - "address": "0x548305A6B9b028529cebFa0e40262cb4cF0F3D4B", - "txHash": "0x4a2a27d61b16bd5efe0def6b3ec542add050afa120ff579d92fca8079476865d" - } - ] -} diff --git a/etc/env/base/eth_sender.toml b/etc/env/base/eth_sender.toml index 31fe626c87f..8ec046c61a3 100644 --- a/etc/env/base/eth_sender.toml +++ b/etc/env/base/eth_sender.toml @@ -9,7 +9,7 @@ # operator_blobs_eth_addr is defined in the `private.toml` # Amount of confirmations required to consider L1 transaction committed. -wait_confirmations = 1 +wait_confirmations = 0 # Amount of blocks we will wait before considering L1 transaction stuck. expected_wait_time_block = 30 # Node polling period in seconds. diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs index 29fa3b9ddcd..7db01418630 100644 --- a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs +++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs @@ -312,11 +312,6 @@ async fn deploy_ecosystem_inner( .with_rpc_url(l1_rpc_url.clone()) .with_broadcast(); - // if config.l1_network == L1Network::Localhost { - // // It's a kludge for reth, just because it doesn't behave properly with large amount of txs - // forge = forge.with_slow(); - // } - forge = fill_forge_private_key(forge, wallets_config.deployer_private_key())?; let spinner = Spinner::new(MSG_DEPLOYING_ECOSYSTEM_CONTRACTS_SPINNER);