@aztec/p2p 0.0.1-commit.96dac018d → 0.0.1-commit.993d240
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +129 -3
- package/dest/bootstrap/bootstrap.d.ts +1 -1
- package/dest/bootstrap/bootstrap.d.ts.map +1 -1
- package/dest/bootstrap/bootstrap.js +9 -1
- package/dest/client/factory.d.ts +7 -7
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +34 -16
- package/dest/client/interface.d.ts +17 -8
- package/dest/client/interface.d.ts.map +1 -1
- package/dest/client/p2p_client.d.ts +15 -11
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +93 -49
- package/dest/config.d.ts +153 -102
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +134 -35
- package/dest/errors/p2p-service.error.d.ts +9 -0
- package/dest/errors/p2p-service.error.d.ts.map +1 -0
- package/dest/errors/p2p-service.error.js +10 -0
- package/dest/errors/reqresp.error.d.ts +1 -20
- package/dest/errors/reqresp.error.d.ts.map +1 -1
- package/dest/errors/reqresp.error.js +0 -21
- package/dest/index.d.ts +1 -2
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +0 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +99 -59
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.js +267 -197
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +181 -65
- package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
- package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/mocks.js +6 -4
- package/dest/mem_pools/index.d.ts +1 -2
- package/dest/mem_pools/index.d.ts.map +1 -1
- package/dest/mem_pools/instrumentation.d.ts +4 -2
- package/dest/mem_pools/instrumentation.d.ts.map +1 -1
- package/dest/mem_pools/instrumentation.js +33 -15
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +2 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +2 -0
- package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +2 -1
- package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/index.js +1 -0
- package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts +16 -0
- package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.d.ts.map +1 -0
- package/dest/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.js +62 -0
- package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +7 -1
- package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +2 -2
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +8 -6
- package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +2 -2
- package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +2 -2
- package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -2
- package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/index.js +1 -1
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +12 -5
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +44 -12
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.js +81 -22
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +26 -44
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +4 -2
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +6 -0
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +2 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +133 -110
- package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +9 -3
- package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
- package/dest/msg_validators/attestation_validator/attestation_validator.js +37 -12
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +7 -3
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +4 -5
- package/dest/msg_validators/clock_tolerance.d.ts +12 -1
- package/dest/msg_validators/clock_tolerance.d.ts.map +1 -1
- package/dest/msg_validators/clock_tolerance.js +61 -3
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +10 -4
- package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/block_proposal_validator.js +10 -2
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +10 -4
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +16 -2
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +21 -8
- package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
- package/dest/msg_validators/proposal_validator/proposal_validator.js +90 -44
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +8 -15
- package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
- package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/allowed_public_setup.js +25 -21
- package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts +17 -0
- package/dest/msg_validators/tx_validator/allowed_setup_helpers.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/allowed_setup_helpers.js +24 -0
- package/dest/msg_validators/tx_validator/archive_cache.js +1 -1
- package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts +15 -0
- package/dest/msg_validators/tx_validator/cached_tx_validator.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/cached_tx_validator.js +19 -0
- package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts +9 -0
- package/dest/msg_validators/tx_validator/contract_instance_validator.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/contract_instance_validator.js +48 -0
- package/dest/msg_validators/tx_validator/data_validator.d.ts +2 -1
- package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/data_validator.js +36 -2
- package/dest/msg_validators/tx_validator/factory.d.ts +27 -7
- package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/factory.js +47 -17
- package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +1 -1
- package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/fee_payer_balance.js +6 -2
- package/dest/msg_validators/tx_validator/gas_validator.d.ts +48 -7
- package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/gas_validator.js +88 -41
- package/dest/msg_validators/tx_validator/index.d.ts +4 -1
- package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/index.js +3 -0
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.js +4 -4
- package/dest/msg_validators/tx_validator/phases_validator.d.ts +22 -2
- package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/phases_validator.js +72 -24
- package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +2 -1
- package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/tx_proof_validator.js +2 -0
- package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts +48 -0
- package/dest/msg_validators/tx_validator/tx_validation_cache.d.ts.map +1 -0
- package/dest/msg_validators/tx_validator/tx_validation_cache.js +69 -0
- package/dest/services/data_store.d.ts +1 -1
- package/dest/services/data_store.d.ts.map +1 -1
- package/dest/services/data_store.js +5 -5
- package/dest/services/discv5/discV5_service.d.ts +2 -1
- package/dest/services/discv5/discV5_service.d.ts.map +1 -1
- package/dest/services/discv5/discV5_service.js +35 -8
- package/dest/services/dummy_service.d.ts +11 -15
- package/dest/services/dummy_service.d.ts.map +1 -1
- package/dest/services/dummy_service.js +12 -16
- package/dest/services/encoding.d.ts +6 -2
- package/dest/services/encoding.d.ts.map +1 -1
- package/dest/services/encoding.js +14 -8
- package/dest/services/gossipsub/topic_score_params.d.ts +13 -2
- package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -1
- package/dest/services/gossipsub/topic_score_params.js +21 -4
- package/dest/services/libp2p/instrumentation.d.ts +3 -1
- package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
- package/dest/services/libp2p/instrumentation.js +14 -0
- package/dest/services/libp2p/libp2p_service.d.ts +39 -50
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +299 -250
- package/dest/services/peer-manager/metrics.d.ts +3 -1
- package/dest/services/peer-manager/metrics.d.ts.map +1 -1
- package/dest/services/peer-manager/metrics.js +6 -0
- package/dest/services/peer-manager/peer_manager.d.ts +6 -2
- package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_manager.js +40 -11
- package/dest/services/peer-manager/peer_scoring.d.ts +7 -2
- package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_scoring.js +32 -10
- package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +11 -8
- package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
- package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +84 -71
- package/dest/services/reqresp/batch-tx-requester/interface.d.ts +10 -6
- package/dest/services/reqresp/batch-tx-requester/interface.d.ts.map +1 -1
- package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts +5 -4
- package/dest/services/reqresp/batch-tx-requester/missing_txs.d.ts.map +1 -1
- package/dest/services/reqresp/batch-tx-requester/missing_txs.js +13 -7
- package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +3 -1
- package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
- package/dest/services/reqresp/batch-tx-requester/peer_collection.js +3 -0
- package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts +5 -14
- package/dest/services/reqresp/batch-tx-requester/tx_validator.d.ts.map +1 -1
- package/dest/services/reqresp/batch-tx-requester/tx_validator.js +6 -20
- package/dest/services/reqresp/config.d.ts +3 -3
- package/dest/services/reqresp/config.d.ts.map +1 -1
- package/dest/services/reqresp/interface.d.ts +16 -18
- package/dest/services/reqresp/interface.d.ts.map +1 -1
- package/dest/services/reqresp/interface.js +10 -20
- package/dest/services/reqresp/metrics.d.ts +1 -1
- package/dest/services/reqresp/metrics.d.ts.map +1 -1
- package/dest/services/reqresp/metrics.js +0 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +1 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +4 -2
- package/dest/services/reqresp/protocols/index.d.ts +1 -2
- package/dest/services/reqresp/protocols/index.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/index.js +0 -1
- package/dest/services/reqresp/protocols/tx.d.ts +1 -1
- package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/tx.js +1 -3
- package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +5 -4
- package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -1
- package/dest/services/reqresp/rate-limiter/rate_limiter.js +10 -8
- package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +1 -1
- package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -1
- package/dest/services/reqresp/rate-limiter/rate_limits.js +0 -10
- package/dest/services/reqresp/reqresp.d.ts +7 -29
- package/dest/services/reqresp/reqresp.d.ts.map +1 -1
- package/dest/services/reqresp/reqresp.js +43 -215
- package/dest/services/service.d.ts +9 -12
- package/dest/services/service.d.ts.map +1 -1
- package/dest/services/tx_collection/config.d.ts +2 -23
- package/dest/services/tx_collection/config.d.ts.map +1 -1
- package/dest/services/tx_collection/config.js +2 -55
- package/dest/services/tx_collection/file_store_tx_collection.d.ts +12 -28
- package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/file_store_tx_collection.js +43 -83
- package/dest/services/tx_collection/file_store_tx_source.d.ts +5 -4
- package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -1
- package/dest/services/tx_collection/file_store_tx_source.js +39 -29
- package/dest/services/tx_collection/index.d.ts +2 -3
- package/dest/services/tx_collection/index.d.ts.map +1 -1
- package/dest/services/tx_collection/index.js +0 -1
- package/dest/services/tx_collection/instrumentation.d.ts +1 -1
- package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
- package/dest/services/tx_collection/instrumentation.js +0 -2
- package/dest/services/tx_collection/request_tracker.d.ts +53 -0
- package/dest/services/tx_collection/request_tracker.d.ts.map +1 -0
- package/dest/services/tx_collection/request_tracker.js +84 -0
- package/dest/services/tx_collection/tx_collection.d.ts +36 -55
- package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/tx_collection.js +275 -119
- package/dest/services/tx_collection/tx_collection_sink.d.ts +1 -1
- package/dest/services/tx_collection/tx_collection_sink.js +2 -2
- package/dest/services/tx_collection/tx_source.d.ts +6 -5
- package/dest/services/tx_collection/tx_source.d.ts.map +1 -1
- package/dest/services/tx_collection/tx_source.js +9 -7
- package/dest/services/tx_file_store/tx_file_store.d.ts +1 -3
- package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
- package/dest/services/tx_file_store/tx_file_store.js +4 -14
- package/dest/services/tx_provider.d.ts +3 -1
- package/dest/services/tx_provider.d.ts.map +1 -1
- package/dest/services/tx_provider.js +3 -0
- package/dest/test-helpers/make-test-p2p-clients.d.ts +5 -6
- package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
- package/dest/test-helpers/make-test-p2p-clients.js +5 -3
- package/dest/test-helpers/mock-pubsub.d.ts +24 -11
- package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
- package/dest/test-helpers/mock-pubsub.js +45 -45
- package/dest/test-helpers/reqresp-nodes.d.ts +5 -7
- package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
- package/dest/test-helpers/reqresp-nodes.js +17 -19
- package/dest/test-helpers/test_tx_provider.d.ts +3 -1
- package/dest/test-helpers/test_tx_provider.d.ts.map +1 -1
- package/dest/test-helpers/test_tx_provider.js +3 -0
- package/dest/test-helpers/testbench-utils.d.ts +12 -14
- package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
- package/dest/test-helpers/testbench-utils.js +42 -15
- package/dest/testbench/p2p_client_testbench_worker.d.ts +3 -5
- package/dest/testbench/p2p_client_testbench_worker.d.ts.map +1 -1
- package/dest/testbench/p2p_client_testbench_worker.js +88 -42
- package/dest/testbench/worker_client_manager.d.ts +12 -6
- package/dest/testbench/worker_client_manager.d.ts.map +1 -1
- package/dest/testbench/worker_client_manager.js +57 -11
- package/dest/util.d.ts +12 -7
- package/dest/util.d.ts.map +1 -1
- package/dest/util.js +35 -14
- package/dest/versioning.d.ts +3 -6
- package/dest/versioning.d.ts.map +1 -1
- package/dest/versioning.js +3 -24
- package/package.json +15 -14
- package/src/bootstrap/bootstrap.ts +9 -1
- package/src/client/factory.ts +65 -21
- package/src/client/interface.ts +18 -20
- package/src/client/p2p_client.ts +108 -82
- package/src/client/test/{tx_proposal_collector/README.md → p2p_client.batch_tx_requester.bench.README.md} +23 -53
- package/src/config.ts +226 -36
- package/src/errors/p2p-service.error.ts +11 -0
- package/src/errors/reqresp.error.ts +0 -25
- package/src/index.ts +0 -1
- package/src/mem_pools/attestation_pool/attestation_pool.ts +318 -242
- package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +204 -68
- package/src/mem_pools/attestation_pool/mocks.ts +13 -8
- package/src/mem_pools/index.ts +0 -3
- package/src/mem_pools/instrumentation.ts +22 -14
- package/src/mem_pools/tx_pool_v2/README.md +9 -1
- package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +2 -1
- package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +3 -0
- package/src/mem_pools/tx_pool_v2/eviction/index.ts +1 -0
- package/src/mem_pools/tx_pool_v2/eviction/insufficient_fee_per_gas_eviction_rule.ts +65 -0
- package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +11 -1
- package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +3 -3
- package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +15 -6
- package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +2 -1
- package/src/mem_pools/tx_pool_v2/index.ts +1 -1
- package/src/mem_pools/tx_pool_v2/interfaces.ts +12 -4
- package/src/mem_pools/tx_pool_v2/tx_metadata.ts +121 -27
- package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +29 -43
- package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +16 -1
- package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +141 -114
- package/src/msg_validators/attestation_validator/README.md +49 -0
- package/src/msg_validators/attestation_validator/attestation_validator.ts +41 -9
- package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +14 -7
- package/src/msg_validators/clock_tolerance.ts +79 -3
- package/src/msg_validators/proposal_validator/README.md +123 -0
- package/src/msg_validators/proposal_validator/block_proposal_validator.ts +24 -4
- package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +35 -7
- package/src/msg_validators/proposal_validator/proposal_validator.ts +114 -47
- package/src/msg_validators/tx_validator/README.md +15 -3
- package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -12
- package/src/msg_validators/tx_validator/allowed_public_setup.ts +22 -27
- package/src/msg_validators/tx_validator/allowed_setup_helpers.ts +31 -0
- package/src/msg_validators/tx_validator/archive_cache.ts +1 -1
- package/src/msg_validators/tx_validator/cached_tx_validator.ts +31 -0
- package/src/msg_validators/tx_validator/contract_instance_validator.ts +56 -0
- package/src/msg_validators/tx_validator/data_validator.ts +44 -1
- package/src/msg_validators/tx_validator/factory.ts +61 -10
- package/src/msg_validators/tx_validator/fee_payer_balance.ts +6 -2
- package/src/msg_validators/tx_validator/gas_validator.ts +121 -39
- package/src/msg_validators/tx_validator/index.ts +3 -0
- package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
- package/src/msg_validators/tx_validator/phases_validator.ts +82 -27
- package/src/msg_validators/tx_validator/tx_proof_validator.ts +2 -0
- package/src/msg_validators/tx_validator/tx_validation_cache.ts +102 -0
- package/src/services/data_store.ts +5 -13
- package/src/services/discv5/discV5_service.ts +38 -5
- package/src/services/dummy_service.ts +14 -39
- package/src/services/encoding.ts +14 -7
- package/src/services/gossipsub/topic_score_params.ts +36 -4
- package/src/services/libp2p/instrumentation.ts +14 -0
- package/src/services/libp2p/libp2p_service.ts +326 -287
- package/src/services/peer-manager/metrics.ts +7 -0
- package/src/services/peer-manager/peer_manager.ts +46 -11
- package/src/services/peer-manager/peer_scoring.ts +27 -5
- package/src/services/reqresp/README.md +215 -0
- package/src/services/reqresp/batch-tx-requester/README.md +46 -7
- package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +83 -77
- package/src/services/reqresp/batch-tx-requester/interface.ts +13 -5
- package/src/services/reqresp/batch-tx-requester/missing_txs.ts +13 -6
- package/src/services/reqresp/batch-tx-requester/peer_collection.ts +5 -0
- package/src/services/reqresp/batch-tx-requester/tx_validator.ts +12 -25
- package/src/services/reqresp/config.ts +2 -2
- package/src/services/reqresp/interface.ts +21 -47
- package/src/services/reqresp/metrics.ts +0 -1
- package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +4 -2
- package/src/services/reqresp/protocols/index.ts +0 -1
- package/src/services/reqresp/protocols/tx.ts +1 -3
- package/src/services/reqresp/rate-limiter/rate_limiter.ts +13 -9
- package/src/services/reqresp/rate-limiter/rate_limits.ts +0 -10
- package/src/services/reqresp/reqresp.ts +48 -261
- package/src/services/service.ts +12 -28
- package/src/services/tx_collection/config.ts +3 -80
- package/src/services/tx_collection/file_store_tx_collection.ts +54 -103
- package/src/services/tx_collection/file_store_tx_source.ts +43 -31
- package/src/services/tx_collection/index.ts +1 -6
- package/src/services/tx_collection/instrumentation.ts +1 -7
- package/src/services/tx_collection/request_tracker.ts +127 -0
- package/src/services/tx_collection/tx_collection.ts +331 -176
- package/src/services/tx_collection/tx_collection_sink.ts +2 -2
- package/src/services/tx_collection/tx_source.ts +8 -7
- package/src/services/tx_file_store/tx_file_store.ts +5 -17
- package/src/services/tx_provider.ts +5 -0
- package/src/test-helpers/make-test-p2p-clients.ts +4 -3
- package/src/test-helpers/mock-pubsub.ts +49 -66
- package/src/test-helpers/reqresp-nodes.ts +15 -28
- package/src/test-helpers/test_tx_provider.ts +5 -0
- package/src/test-helpers/testbench-utils.ts +53 -28
- package/src/testbench/p2p_client_testbench_worker.ts +91 -61
- package/src/testbench/worker_client_manager.ts +72 -25
- package/src/util.ts +33 -18
- package/src/versioning.ts +3 -33
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts +0 -2
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.d.ts.map +0 -1
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +0 -305
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts +0 -73
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.d.ts.map +0 -1
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.js +0 -8
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +0 -125
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +0 -596
- package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +0 -32
- package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +0 -112
- package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +0 -157
- package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +0 -52
- package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +0 -16
- package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +0 -122
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +0 -17
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +0 -84
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +0 -19
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +0 -78
- package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +0 -26
- package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +0 -84
- package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +0 -25
- package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +0 -57
- package/dest/mem_pools/tx_pool/index.d.ts +0 -3
- package/dest/mem_pools/tx_pool/index.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/index.js +0 -2
- package/dest/mem_pools/tx_pool/priority.d.ts +0 -12
- package/dest/mem_pools/tx_pool/priority.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/priority.js +0 -15
- package/dest/mem_pools/tx_pool/tx_pool.d.ts +0 -127
- package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/tx_pool.js +0 -3
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +0 -7
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +0 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +0 -400
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +0 -23
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +0 -1
- package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +0 -212
- package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +0 -64
- package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +0 -1
- package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +0 -151
- package/dest/services/reqresp/protocols/block.d.ts +0 -9
- package/dest/services/reqresp/protocols/block.d.ts.map +0 -1
- package/dest/services/reqresp/protocols/block.js +0 -32
- package/dest/services/tx_collection/fast_tx_collection.d.ts +0 -54
- package/dest/services/tx_collection/fast_tx_collection.d.ts.map +0 -1
- package/dest/services/tx_collection/fast_tx_collection.js +0 -327
- package/dest/services/tx_collection/missing_txs_tracker.d.ts +0 -32
- package/dest/services/tx_collection/missing_txs_tracker.d.ts.map +0 -1
- package/dest/services/tx_collection/missing_txs_tracker.js +0 -27
- package/dest/services/tx_collection/proposal_tx_collector.d.ts +0 -49
- package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +0 -1
- package/dest/services/tx_collection/proposal_tx_collector.js +0 -50
- package/dest/services/tx_collection/slow_tx_collection.d.ts +0 -57
- package/dest/services/tx_collection/slow_tx_collection.d.ts.map +0 -1
- package/dest/services/tx_collection/slow_tx_collection.js +0 -211
- package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +0 -346
- package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker_protocol.ts +0 -43
- package/src/mem_pools/tx_pool/README.md +0 -270
- package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +0 -746
- package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +0 -132
- package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +0 -208
- package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +0 -162
- package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +0 -104
- package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +0 -93
- package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +0 -106
- package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +0 -75
- package/src/mem_pools/tx_pool/index.ts +0 -2
- package/src/mem_pools/tx_pool/priority.ts +0 -20
- package/src/mem_pools/tx_pool/tx_pool.ts +0 -141
- package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +0 -319
- package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +0 -230
- package/src/services/reqresp/connection-sampler/batch_connection_sampler.ts +0 -161
- package/src/services/reqresp/protocols/block.ts +0 -37
- package/src/services/tx_collection/fast_tx_collection.ts +0 -387
- package/src/services/tx_collection/missing_txs_tracker.ts +0 -52
- package/src/services/tx_collection/proposal_tx_collector.ts +0 -113
- package/src/services/tx_collection/slow_tx_collection.ts +0 -266
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { BlockNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { FifoSet } from '@aztec/foundation/fifo-set';
|
|
2
3
|
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
3
4
|
import { computeFeePayerBalanceStorageSlot } from '@aztec/protocol-contracts/fee-juice';
|
|
4
5
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
@@ -6,11 +7,16 @@ import { DatabasePublicStateSource } from '@aztec/stdlib/trees';
|
|
|
6
7
|
import { Tx, TxHash } from '@aztec/stdlib/tx';
|
|
7
8
|
import { TxArchive } from './archive/index.js';
|
|
8
9
|
import { DeletedPool } from './deleted_pool.js';
|
|
9
|
-
import { EvictionManager, FeePayerBalanceEvictionRule, FeePayerBalancePreAddRule, InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, LowPriorityEvictionRule, LowPriorityPreAddRule, NullifierConflictRule, TxPoolRejectionCode } from './eviction/index.js';
|
|
10
|
+
import { EvictionManager, FeePayerBalanceEvictionRule, FeePayerBalancePreAddRule, InsufficientFeePerGasEvictionRule, InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, LowPriorityEvictionRule, LowPriorityPreAddRule, NullifierConflictRule, TxPoolRejectionCode } from './eviction/index.js';
|
|
10
11
|
import { TxPoolV2Instrumentation } from './instrumentation.js';
|
|
11
12
|
import { DEFAULT_TX_POOL_V2_CONFIG } from './interfaces.js';
|
|
12
13
|
import { buildTxMetaData, checkNullifierConflict } from './tx_metadata.js';
|
|
13
14
|
import { TxPoolIndices } from './tx_pool_indices.js';
|
|
15
|
+
/**
|
|
16
|
+
* Maximum number of full transactions to load into memory at once when finalizing a block.
|
|
17
|
+
* Bounds peak memory while archiving and hard-deleting mined txs (~23k txs/epoch at 10 TPS would
|
|
18
|
+
* otherwise OOM the node).
|
|
19
|
+
*/ const FINALIZE_BLOCK_CHUNK_SIZE = 100;
|
|
14
20
|
/**
|
|
15
21
|
* Implementation of TxPoolV2 logic.
|
|
16
22
|
*
|
|
@@ -23,6 +29,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
23
29
|
#l2BlockSource;
|
|
24
30
|
#worldStateSynchronizer;
|
|
25
31
|
#createTxValidator;
|
|
32
|
+
#checkAllowedSetupCalls;
|
|
26
33
|
// === In-Memory Indices ===
|
|
27
34
|
#indices = new TxPoolIndices();
|
|
28
35
|
// === Config & Services ===
|
|
@@ -32,7 +39,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
32
39
|
#evictionManager;
|
|
33
40
|
#dateProvider;
|
|
34
41
|
#instrumentation;
|
|
35
|
-
#evictedTxHashes
|
|
42
|
+
#evictedTxHashes;
|
|
36
43
|
#log;
|
|
37
44
|
#callbacks;
|
|
38
45
|
constructor(store, archiveStore, deps, callbacks, telemetry, config = {}, dateProvider, log){
|
|
@@ -41,10 +48,12 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
41
48
|
this.#l2BlockSource = deps.l2BlockSource;
|
|
42
49
|
this.#worldStateSynchronizer = deps.worldStateSynchronizer;
|
|
43
50
|
this.#createTxValidator = deps.createTxValidator;
|
|
51
|
+
this.#checkAllowedSetupCalls = deps.checkAllowedSetupCalls;
|
|
44
52
|
this.#config = {
|
|
45
53
|
...DEFAULT_TX_POOL_V2_CONFIG,
|
|
46
54
|
...config
|
|
47
55
|
};
|
|
56
|
+
this.#evictedTxHashes = FifoSet.withLimit(this.#config.evictedTxCacheSize);
|
|
48
57
|
this.#archive = new TxArchive(archiveStore, this.#config.archivedTxLimit, log);
|
|
49
58
|
this.#deletedPool = new DeletedPool(store, this.#txsDB, log);
|
|
50
59
|
this.#dateProvider = dateProvider;
|
|
@@ -61,6 +70,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
61
70
|
}));
|
|
62
71
|
// Post-event eviction rules (run after events to check ALL pending txs)
|
|
63
72
|
this.#evictionManager.registerRule(new InvalidTxsAfterMiningRule());
|
|
73
|
+
this.#evictionManager.registerRule(new InsufficientFeePerGasEvictionRule(deps.blockMinFeesProvider));
|
|
64
74
|
this.#evictionManager.registerRule(new InvalidTxsAfterReorgRule(deps.worldStateSynchronizer));
|
|
65
75
|
this.#evictionManager.registerRule(new FeePayerBalanceEvictionRule(deps.worldStateSynchronizer));
|
|
66
76
|
// LowPriorityEvictionRule handles cases where txs become pending via prepareForSlot (unprotect)
|
|
@@ -81,30 +91,63 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
81
91
|
*/ async hydrateFromDatabase() {
|
|
82
92
|
// Step 0: Hydrate deleted pool state
|
|
83
93
|
await this.#deletedPool.hydrateFromDatabase();
|
|
84
|
-
// Step 1:
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
+
// Step 1: Stream txs from DB, building metadata and mined status one at a time.
|
|
95
|
+
const minedMetas = [];
|
|
96
|
+
const pendingMetas = [];
|
|
97
|
+
const deserializationErrors = [];
|
|
98
|
+
for await (const [txHashStr, buffer] of this.#txsDB.entriesAsync()){
|
|
99
|
+
// Skip soft-deleted transactions - they stay in DB but not in indices
|
|
100
|
+
if (this.#deletedPool.isSoftDeleted(txHashStr)) {
|
|
101
|
+
continue;
|
|
102
|
+
}
|
|
103
|
+
let meta;
|
|
104
|
+
let txEffect;
|
|
105
|
+
try {
|
|
106
|
+
const tx = Tx.fromBuffer(buffer);
|
|
107
|
+
// Resolve allowed-setup-calls and the tx effect concurrently
|
|
108
|
+
// getTxEffect failures are non-fatal (we just treat the tx as not-yet-mined), so
|
|
109
|
+
// its rejection is swallowed before the Promise.all so it can't fail-fast the batch.
|
|
110
|
+
const txEffectPromise = this.#l2BlockSource.getTxEffect(tx.getTxHash()).catch((err)=>{
|
|
111
|
+
this.#log.warn(`Failed to check mined status for tx ${txHashStr}`, {
|
|
112
|
+
err
|
|
113
|
+
});
|
|
114
|
+
return undefined;
|
|
115
|
+
});
|
|
116
|
+
const [allowedSetupCalls, fetchedTxEffect] = await Promise.all([
|
|
117
|
+
this.#checkAllowedSetupCalls(tx),
|
|
118
|
+
txEffectPromise
|
|
119
|
+
]);
|
|
120
|
+
meta = await buildTxMetaData(tx, allowedSetupCalls);
|
|
121
|
+
txEffect = fetchedTxEffect;
|
|
122
|
+
} catch (err) {
|
|
123
|
+
this.#log.warn(`Failed to deserialize tx ${txHashStr}, deleting`, {
|
|
124
|
+
err
|
|
125
|
+
});
|
|
126
|
+
deserializationErrors.push(txHashStr);
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
if (txEffect) {
|
|
130
|
+
meta.minedL2BlockId = {
|
|
131
|
+
number: txEffect.l2BlockNumber,
|
|
132
|
+
hash: txEffect.l2BlockHash.toString()
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
if (meta.minedL2BlockId !== undefined) {
|
|
136
|
+
minedMetas.push(meta);
|
|
94
137
|
} else {
|
|
95
|
-
|
|
138
|
+
pendingMetas.push(meta);
|
|
96
139
|
}
|
|
97
140
|
}
|
|
98
|
-
// Step
|
|
99
|
-
const { valid, invalid } = await this.#revalidateMetadata(
|
|
100
|
-
// Step
|
|
101
|
-
for (const meta of
|
|
141
|
+
// Step 2: Validate non-mined transactions
|
|
142
|
+
const { valid, invalid } = await this.#revalidateMetadata(pendingMetas, 'on startup');
|
|
143
|
+
// Step 3: Populate mined indices (these don't need conflict resolution)
|
|
144
|
+
for (const meta of minedMetas){
|
|
102
145
|
this.#indices.addMined(meta);
|
|
103
146
|
}
|
|
104
|
-
// Step
|
|
147
|
+
// Step 4: Rebuild pending pool by running pre-add rules for each tx
|
|
105
148
|
// This resolves nullifier conflicts, fee payer balance issues, and pool size limits
|
|
106
149
|
const { rejected } = await this.#rebuildPendingPool(valid);
|
|
107
|
-
// Step
|
|
150
|
+
// Step 5: Delete invalid and rejected txs from DB only (indices were never populated for these)
|
|
108
151
|
const toDelete = [
|
|
109
152
|
...deserializationErrors,
|
|
110
153
|
...invalid,
|
|
@@ -128,9 +171,32 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
128
171
|
const rejected = [];
|
|
129
172
|
const errors = new Map();
|
|
130
173
|
const acceptedPending = new Set();
|
|
174
|
+
// Phase 1: Pre-compute all throwable I/O outside the transaction.
|
|
175
|
+
// If any pre-computation throws, the entire call fails before mutations happen.
|
|
176
|
+
const precomputed = new Map();
|
|
177
|
+
const validator = await this.#createTxValidator();
|
|
178
|
+
for (const tx of txs){
|
|
179
|
+
const txHash = tx.getTxHash();
|
|
180
|
+
const txHashStr = txHash.toString();
|
|
181
|
+
const meta = await buildTxMetaData(tx);
|
|
182
|
+
const minedBlockId = await this.#getMinedBlockId(txHash);
|
|
183
|
+
// Validate non-mined txs (mined and pre-protected txs bypass validation inside the transaction)
|
|
184
|
+
let isValid = true;
|
|
185
|
+
if (!minedBlockId) {
|
|
186
|
+
isValid = await this.#validateMeta(meta, validator);
|
|
187
|
+
}
|
|
188
|
+
precomputed.set(txHashStr, {
|
|
189
|
+
meta,
|
|
190
|
+
minedBlockId,
|
|
191
|
+
isValid
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
// Phase 2: Apply mutations inside the transaction using only pre-computed results,
|
|
195
|
+
// in-memory reads, and buffered DB writes. Nothing here can throw an unhandled exception.
|
|
131
196
|
const poolAccess = this.#createPreAddPoolAccess();
|
|
132
197
|
const preAddContext = opts.feeComparisonOnly !== undefined ? {
|
|
133
|
-
feeComparisonOnly: opts.feeComparisonOnly
|
|
198
|
+
feeComparisonOnly: opts.feeComparisonOnly,
|
|
199
|
+
priceBumpPercentage: this.#config.priceBumpPercentage
|
|
134
200
|
} : undefined;
|
|
135
201
|
await this.#store.transactionAsync(async ()=>{
|
|
136
202
|
for (const tx of txs){
|
|
@@ -141,28 +207,28 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
141
207
|
ignored.push(txHash);
|
|
142
208
|
continue;
|
|
143
209
|
}
|
|
144
|
-
|
|
145
|
-
const minedBlockId = await this.#getMinedBlockId(txHash);
|
|
210
|
+
const { meta, minedBlockId, isValid } = precomputed.get(txHashStr);
|
|
146
211
|
const preProtectedSlot = this.#indices.getProtectionSlot(txHashStr);
|
|
147
212
|
if (minedBlockId) {
|
|
148
213
|
// Already mined - add directly (protection already set if pre-protected)
|
|
149
214
|
await this.#addTx(tx, {
|
|
150
215
|
mined: minedBlockId
|
|
151
|
-
}, opts);
|
|
216
|
+
}, opts, meta);
|
|
152
217
|
accepted.push(txHash);
|
|
153
218
|
} else if (preProtectedSlot !== undefined) {
|
|
154
219
|
// Pre-protected and not mined - add as protected (bypass validation)
|
|
155
220
|
await this.#addTx(tx, {
|
|
156
221
|
protected: preProtectedSlot
|
|
157
|
-
}, opts);
|
|
222
|
+
}, opts, meta);
|
|
158
223
|
accepted.push(txHash);
|
|
224
|
+
} else if (!isValid) {
|
|
225
|
+
// Failed pre-computed validation
|
|
226
|
+
rejected.push(txHash);
|
|
159
227
|
} else {
|
|
160
|
-
// Regular pending tx -
|
|
161
|
-
const result = await this.#tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
|
|
228
|
+
// Regular pending tx - run pre-add rules using pre-computed metadata
|
|
229
|
+
const result = await this.#tryAddRegularPendingTx(tx, meta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
|
|
162
230
|
if (result.status === 'accepted') {
|
|
163
231
|
acceptedPending.add(txHashStr);
|
|
164
|
-
} else if (result.status === 'rejected') {
|
|
165
|
-
rejected.push(txHash);
|
|
166
232
|
} else {
|
|
167
233
|
ignored.push(txHash);
|
|
168
234
|
}
|
|
@@ -197,18 +263,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
197
263
|
} : {}
|
|
198
264
|
};
|
|
199
265
|
}
|
|
200
|
-
/**
|
|
201
|
-
const
|
|
202
|
-
const txHashStr = txHash.toString();
|
|
203
|
-
// Build metadata and validate using metadata
|
|
204
|
-
const meta = await buildTxMetaData(tx);
|
|
205
|
-
if (!await this.#validateMeta(meta)) {
|
|
206
|
-
return {
|
|
207
|
-
status: 'rejected'
|
|
208
|
-
};
|
|
209
|
-
}
|
|
266
|
+
/** Adds a validated pending tx, running pre-add rules and evicting conflicts. */ async #tryAddRegularPendingTx(tx, precomputedMeta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
|
|
267
|
+
const txHashStr = tx.getTxHash().toString();
|
|
210
268
|
// Run pre-add rules
|
|
211
|
-
const preAddResult = await this.#evictionManager.runPreAddRules(
|
|
269
|
+
const preAddResult = await this.#evictionManager.runPreAddRules(precomputedMeta, poolAccess, preAddContext);
|
|
212
270
|
if (preAddResult.shouldIgnore) {
|
|
213
271
|
this.#log.debug(`Ignoring tx ${txHashStr}: ${preAddResult.reason?.message ?? 'unknown reason'}`);
|
|
214
272
|
if (preAddResult.reason && preAddResult.reason.code !== TxPoolRejectionCode.INTERNAL_ERROR) {
|
|
@@ -254,7 +312,7 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
254
312
|
};
|
|
255
313
|
}
|
|
256
314
|
// Add the transaction
|
|
257
|
-
await this.#addTx(tx, 'pending', opts);
|
|
315
|
+
await this.#addTx(tx, 'pending', opts, precomputedMeta);
|
|
258
316
|
return {
|
|
259
317
|
status: 'accepted'
|
|
260
318
|
};
|
|
@@ -263,33 +321,44 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
263
321
|
const txHashStr = tx.getTxHash().toString();
|
|
264
322
|
// Check if already in pool
|
|
265
323
|
if (this.#indices.has(txHashStr)) {
|
|
324
|
+
this.#log.verbose(`canAddPendingTx: tx ${txHashStr} already in pool`);
|
|
266
325
|
return 'ignored';
|
|
267
326
|
}
|
|
268
327
|
// Build metadata and check pre-add rules
|
|
269
328
|
const meta = await buildTxMetaData(tx);
|
|
270
329
|
const poolAccess = this.#createPreAddPoolAccess();
|
|
271
330
|
const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
|
|
272
|
-
|
|
331
|
+
if (preAddResult.shouldIgnore) {
|
|
332
|
+
this.#log.verbose(`canAddPendingTx: tx ${txHashStr} ignored by pre-add rule`, {
|
|
333
|
+
reason: preAddResult.reason?.message ?? 'no reason provided'
|
|
334
|
+
});
|
|
335
|
+
return 'ignored';
|
|
336
|
+
}
|
|
337
|
+
return 'accepted';
|
|
273
338
|
}
|
|
274
339
|
async addProtectedTxs(txs, block, opts) {
|
|
275
340
|
const slotNumber = block.globalVariables.slotNumber;
|
|
341
|
+
// Precompute setup-call allow-list flags outside the store transaction
|
|
342
|
+
const allowedFlags = await Promise.all(txs.map((tx)=>this.#checkAllowedSetupCalls(tx)));
|
|
276
343
|
await this.#store.transactionAsync(async ()=>{
|
|
277
|
-
for
|
|
344
|
+
for(let i = 0; i < txs.length; i++){
|
|
345
|
+
const tx = txs[i];
|
|
278
346
|
const txHash = tx.getTxHash();
|
|
279
347
|
const txHashStr = txHash.toString();
|
|
280
348
|
const isNew = !this.#indices.has(txHashStr);
|
|
281
349
|
const minedBlockId = await this.#getMinedBlockId(txHash);
|
|
282
350
|
if (isNew) {
|
|
351
|
+
const meta = await buildTxMetaData(tx, allowedFlags[i]);
|
|
283
352
|
// New tx - add as mined or protected (callback emitted by #addTx)
|
|
284
353
|
if (minedBlockId) {
|
|
285
354
|
await this.#addTx(tx, {
|
|
286
355
|
mined: minedBlockId
|
|
287
|
-
}, opts);
|
|
356
|
+
}, opts, meta);
|
|
288
357
|
this.#indices.setProtection(txHashStr, slotNumber);
|
|
289
358
|
} else {
|
|
290
359
|
await this.#addTx(tx, {
|
|
291
360
|
protected: slotNumber
|
|
292
|
-
}, opts);
|
|
361
|
+
}, opts, meta);
|
|
293
362
|
}
|
|
294
363
|
} else {
|
|
295
364
|
// Existing tx - update protection and mined status
|
|
@@ -396,6 +465,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
396
465
|
// Step 5: Run post-event eviction rules (inside transaction for atomicity)
|
|
397
466
|
await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
|
|
398
467
|
});
|
|
468
|
+
if (found.length > 0) {
|
|
469
|
+
this.#callbacks.onTxsMined(found.map((m)=>m.txHash));
|
|
470
|
+
}
|
|
399
471
|
this.#log.info(`Marked ${found.length} txs as mined in block ${blockId.number}`);
|
|
400
472
|
}
|
|
401
473
|
async prepareForSlot(slotNumber) {
|
|
@@ -488,25 +560,28 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
488
560
|
const blockNumber = block.globalVariables.blockNumber;
|
|
489
561
|
// Step 1: Find mined txs at or before finalized block
|
|
490
562
|
const minedTxsToFinalize = this.#indices.findTxsMinedAtOrBefore(blockNumber);
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
563
|
+
// Step 2: Archive in chunks if archiving is enabled. Hydrating an entire epoch's worth of
|
|
564
|
+
// mined txs at once would OOM under load. When archiving is disabled there is no need to hydrate the txs at all.
|
|
565
|
+
if (this.#archive.isEnabled()) {
|
|
566
|
+
for(let i = 0; i < minedTxsToFinalize.length; i += FINALIZE_BLOCK_CHUNK_SIZE){
|
|
567
|
+
const chunk = minedTxsToFinalize.slice(i, i + FINALIZE_BLOCK_CHUNK_SIZE);
|
|
568
|
+
const txsToArchive = [];
|
|
569
|
+
for (const txHashStr of chunk){
|
|
496
570
|
const buffer = await this.#txsDB.getAsync(txHashStr);
|
|
497
571
|
if (buffer) {
|
|
498
572
|
txsToArchive.push(Tx.fromBuffer(buffer));
|
|
499
573
|
}
|
|
500
574
|
}
|
|
575
|
+
if (txsToArchive.length > 0) {
|
|
576
|
+
await this.#archive.archiveTxs(txsToArchive);
|
|
577
|
+
}
|
|
501
578
|
}
|
|
502
|
-
|
|
579
|
+
}
|
|
580
|
+
// Step 3: Delete mined txs from the active pool and finalize soft-deleted txs in one
|
|
581
|
+
// transaction. Only tx hashes are touched here, so memory is bounded and atomicity is preserved.
|
|
582
|
+
await this.#store.transactionAsync(async ()=>{
|
|
503
583
|
await this.#deleteTxsBatch(minedTxsToFinalize);
|
|
504
|
-
// Step 4: Finalize soft-deleted txs
|
|
505
584
|
await this.#deletedPool.finalizeBlock(blockNumber);
|
|
506
|
-
// Step 5: Archive mined txs
|
|
507
|
-
if (txsToArchive.length > 0) {
|
|
508
|
-
await this.#archive.archiveTxs(txsToArchive);
|
|
509
|
-
}
|
|
510
585
|
});
|
|
511
586
|
if (minedTxsToFinalize.length > 0) {
|
|
512
587
|
this.#log.info(`Finalized ${minedTxsToFinalize.length} mined txs from blocks up to ${blockNumber}`, {
|
|
@@ -623,9 +698,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
623
698
|
/**
|
|
624
699
|
* Adds a new transaction to the pool with the specified state.
|
|
625
700
|
* Emits onTxsAdded callback immediately after DB write.
|
|
626
|
-
*/ async #addTx(tx, state, opts = {}) {
|
|
701
|
+
*/ async #addTx(tx, state, opts = {}, precomputedMeta) {
|
|
627
702
|
const txHashStr = tx.getTxHash().toString();
|
|
628
|
-
const meta = await buildTxMetaData(tx);
|
|
703
|
+
const meta = precomputedMeta ?? await buildTxMetaData(tx);
|
|
629
704
|
meta.receivedAt = this.#dateProvider.now();
|
|
630
705
|
await this.#txsDB.set(txHashStr, tx.toBuffer());
|
|
631
706
|
await this.#deletedPool.clearSoftDeleted(txHashStr);
|
|
@@ -678,18 +753,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
678
753
|
txHash: txHashStr,
|
|
679
754
|
reason
|
|
680
755
|
});
|
|
681
|
-
this.#
|
|
756
|
+
this.#evictedTxHashes.add(txHashStr);
|
|
682
757
|
}
|
|
683
758
|
await this.#deleteTxsBatch(txHashes);
|
|
684
759
|
}
|
|
685
|
-
/** Adds a tx hash to the bounded evicted cache, evicting the oldest entry if at capacity. */ #addToEvictedCache(txHashStr) {
|
|
686
|
-
if (this.#evictedTxHashes.size >= this.#config.evictedTxCacheSize) {
|
|
687
|
-
// FIFO eviction: remove the first (oldest) entry
|
|
688
|
-
const oldest = this.#evictedTxHashes.values().next().value;
|
|
689
|
-
this.#evictedTxHashes.delete(oldest);
|
|
690
|
-
}
|
|
691
|
-
this.#evictedTxHashes.add(txHashStr);
|
|
692
|
-
}
|
|
693
760
|
// ============================================================================
|
|
694
761
|
// PRIVATE HELPERS - Validation & Conflict Resolution
|
|
695
762
|
// ============================================================================
|
|
@@ -770,50 +837,6 @@ import { TxPoolIndices } from './tx_pool_indices.js';
|
|
|
770
837
|
hash: txEffect.l2BlockHash.toString()
|
|
771
838
|
};
|
|
772
839
|
}
|
|
773
|
-
/** Loads all transactions from the database, returning loaded txs and deserialization errors */ async #loadAllTxsFromDb() {
|
|
774
|
-
const loaded = [];
|
|
775
|
-
const errors = [];
|
|
776
|
-
for await (const [txHashStr, buffer] of this.#txsDB.entriesAsync()){
|
|
777
|
-
// Skip soft-deleted transactions - they stay in DB but not in indices
|
|
778
|
-
if (this.#deletedPool.isSoftDeleted(txHashStr)) {
|
|
779
|
-
continue;
|
|
780
|
-
}
|
|
781
|
-
try {
|
|
782
|
-
const tx = Tx.fromBuffer(buffer);
|
|
783
|
-
const meta = await buildTxMetaData(tx);
|
|
784
|
-
loaded.push({
|
|
785
|
-
tx,
|
|
786
|
-
meta
|
|
787
|
-
});
|
|
788
|
-
} catch (err) {
|
|
789
|
-
this.#log.warn(`Failed to deserialize tx ${txHashStr}, deleting`, {
|
|
790
|
-
err
|
|
791
|
-
});
|
|
792
|
-
errors.push(txHashStr);
|
|
793
|
-
}
|
|
794
|
-
}
|
|
795
|
-
return {
|
|
796
|
-
loaded,
|
|
797
|
-
errors
|
|
798
|
-
};
|
|
799
|
-
}
|
|
800
|
-
/** Queries block source and marks mined status on transaction metadata */ async #markMinedStatusBatch(metas) {
|
|
801
|
-
for (const meta of metas){
|
|
802
|
-
try {
|
|
803
|
-
const txEffect = await this.#l2BlockSource.getTxEffect(TxHash.fromString(meta.txHash));
|
|
804
|
-
if (txEffect) {
|
|
805
|
-
meta.minedL2BlockId = {
|
|
806
|
-
number: txEffect.l2BlockNumber,
|
|
807
|
-
hash: txEffect.l2BlockHash.toString()
|
|
808
|
-
};
|
|
809
|
-
}
|
|
810
|
-
} catch (err) {
|
|
811
|
-
this.#log.warn(`Failed to check mined status for tx ${meta.txHash}`, {
|
|
812
|
-
err
|
|
813
|
-
});
|
|
814
|
-
}
|
|
815
|
-
}
|
|
816
|
-
}
|
|
817
840
|
/**
|
|
818
841
|
* Rebuilds the pending pool by processing each tx through pre-add rules.
|
|
819
842
|
* Starts with an empty pending pool and adds txs one by one, resolving conflicts.
|
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
import type { EpochCacheInterface } from '@aztec/epoch-cache';
|
|
2
2
|
import { type Logger } from '@aztec/foundation/log';
|
|
3
|
-
import { type CheckpointAttestation, type P2PValidator, type ValidationResult } from '@aztec/stdlib/p2p';
|
|
3
|
+
import { type CheckpointAttestation, type CoordinationSignatureContext, type P2PValidator, type ValidationResult } from '@aztec/stdlib/p2p';
|
|
4
4
|
export declare class CheckpointAttestationValidator implements P2PValidator<CheckpointAttestation> {
|
|
5
5
|
protected epochCache: EpochCacheInterface;
|
|
6
6
|
protected logger: Logger;
|
|
7
|
-
|
|
7
|
+
private readonly pipeliningWindow;
|
|
8
|
+
protected readonly signatureContext: CoordinationSignatureContext;
|
|
9
|
+
constructor(epochCache: EpochCacheInterface, opts: {
|
|
10
|
+
l1PublishingTime?: number;
|
|
11
|
+
p2pPropagationTime?: number;
|
|
12
|
+
signatureContext: CoordinationSignatureContext;
|
|
13
|
+
});
|
|
8
14
|
validate(message: CheckpointAttestation): Promise<ValidationResult>;
|
|
9
15
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyw0QkFBNEIsRUFDakMsS0FBSyxZQUFZLEVBRWpCLEtBQUssZ0JBQWdCLEVBRXRCLE1BQU0sbUJBQW1CLENBQUM7QUFJM0IscUJBQWEsOEJBQStCLFlBQVcsWUFBWSxDQUFDLHFCQUFxQixDQUFDO0lBQ3hGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBbUI7SUFDcEQsU0FBUyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSw0QkFBNEIsQ0FBQztJQUVsRSxZQUNFLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQ0osZ0JBQWdCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDMUIsa0JBQWtCLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDNUIsZ0JBQWdCLEVBQUUsNEJBQTRCLENBQUM7S0FDaEQsRUFTRjtJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBNkV4RTtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAEjB,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EACjC,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EAEtB,MAAM,mBAAmB,CAAC;AAI3B,qBAAa,8BAA+B,YAAW,YAAY,CAAC,qBAAqB,CAAC;IACxF,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B,CAAC;IAElE,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EASF;IAEK,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6ExE;CACF"}
|
|
@@ -1,31 +1,56 @@
|
|
|
1
1
|
import { NoCommitteeError } from '@aztec/ethereum/contracts';
|
|
2
2
|
import { createLogger } from '@aztec/foundation/log';
|
|
3
|
-
import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
|
|
4
|
-
import { isWithinClockTolerance } from '../clock_tolerance.js';
|
|
3
|
+
import { PeerErrorSeverity, hasValidSignatureContext } from '@aztec/stdlib/p2p';
|
|
4
|
+
import { PipeliningWindow, isWithinClockTolerance } from '../clock_tolerance.js';
|
|
5
5
|
export class CheckpointAttestationValidator {
|
|
6
6
|
epochCache;
|
|
7
7
|
logger;
|
|
8
|
-
|
|
8
|
+
pipeliningWindow;
|
|
9
|
+
signatureContext;
|
|
10
|
+
constructor(epochCache, opts){
|
|
9
11
|
this.epochCache = epochCache;
|
|
12
|
+
this.pipeliningWindow = new PipeliningWindow(epochCache, {
|
|
13
|
+
l1PublishingTime: opts.l1PublishingTime,
|
|
14
|
+
p2pPropagationTime: opts.p2pPropagationTime
|
|
15
|
+
});
|
|
16
|
+
this.signatureContext = opts.signatureContext;
|
|
10
17
|
this.logger = createLogger('p2p:checkpoint-attestation-validator');
|
|
11
18
|
}
|
|
12
19
|
async validate(message) {
|
|
13
20
|
const slotNumber = message.payload.header.slotNumber;
|
|
14
21
|
try {
|
|
15
|
-
|
|
16
|
-
if (
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
22
|
+
// Cross-chain replay check: reject attestations that carry a foreign signing domain.
|
|
23
|
+
if (!hasValidSignatureContext(message.payload, this.signatureContext)) {
|
|
24
|
+
this.logger.warn(`Rejecting checkpoint attestation with foreign signature context for slot ${slotNumber}`, {
|
|
25
|
+
chainId: message.payload.signatureContext.chainId,
|
|
26
|
+
rollupAddress: message.payload.signatureContext.rollupAddress.toString(),
|
|
27
|
+
expectedChainId: this.signatureContext.chainId,
|
|
28
|
+
expectedRollupAddress: this.signatureContext.rollupAddress.toString()
|
|
29
|
+
});
|
|
30
|
+
return {
|
|
31
|
+
result: 'reject',
|
|
32
|
+
severity: PeerErrorSeverity.LowToleranceError
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
// Use target slots since proposals target pipeline slots (slot + 1 when pipelining).
|
|
36
|
+
const { targetSlot, nextSlot } = this.epochCache.getTargetAndNextSlot();
|
|
37
|
+
if (slotNumber !== targetSlot && slotNumber !== nextSlot) {
|
|
38
|
+
// When pipelining, accept attestations for the current slot (built in the previous slot)
|
|
39
|
+
// until the target slot reaches its L1 publish cutoff.
|
|
40
|
+
if (this.pipeliningWindow.acceptsAttestation(slotNumber)) {
|
|
41
|
+
// Fall through to remaining validation (signature, committee, etc.)
|
|
42
|
+
} else if (!isWithinClockTolerance(slotNumber, targetSlot, this.epochCache)) {
|
|
43
|
+
this.logger.warn(`Checkpoint attestation slot ${slotNumber} is not current (${targetSlot}) or next (${nextSlot}) slot`);
|
|
20
44
|
return {
|
|
21
45
|
result: 'reject',
|
|
22
46
|
severity: PeerErrorSeverity.HighToleranceError
|
|
23
47
|
};
|
|
48
|
+
} else {
|
|
49
|
+
this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
|
|
50
|
+
return {
|
|
51
|
+
result: 'ignore'
|
|
52
|
+
};
|
|
24
53
|
}
|
|
25
|
-
this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
|
|
26
|
-
return {
|
|
27
|
-
result: 'ignore'
|
|
28
|
-
};
|
|
29
54
|
}
|
|
30
55
|
// Verify the signature is valid
|
|
31
56
|
const attester = message.getSender();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { EpochCacheInterface } from '@aztec/epoch-cache';
|
|
2
|
-
import { type CheckpointAttestation, type ValidationResult } from '@aztec/stdlib/p2p';
|
|
2
|
+
import { type CheckpointAttestation, type CoordinationSignatureContext, type ValidationResult } from '@aztec/stdlib/p2p';
|
|
3
3
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
4
4
|
import type { AttestationPoolApi } from '../../mem_pools/attestation_pool/attestation_pool.js';
|
|
5
5
|
import { CheckpointAttestationValidator } from './attestation_validator.js';
|
|
@@ -14,7 +14,11 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
|
|
|
14
14
|
export declare class FishermanAttestationValidator extends CheckpointAttestationValidator {
|
|
15
15
|
private attestationPool;
|
|
16
16
|
private invalidAttestationCounter;
|
|
17
|
-
constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPoolApi, telemetryClient: TelemetryClient
|
|
17
|
+
constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPoolApi, telemetryClient: TelemetryClient, opts: {
|
|
18
|
+
l1PublishingTime?: number;
|
|
19
|
+
p2pPropagationTime?: number;
|
|
20
|
+
signatureContext: CoordinationSignatureContext;
|
|
21
|
+
});
|
|
18
22
|
validate(message: CheckpointAttestation): Promise<ValidationResult>;
|
|
19
23
|
}
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUsscUJBQXFCLEVBQzFCLEtBQUssNEJBQTRCLEVBRWpDLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxFQUF1QixLQUFLLGVBQWUsRUFBa0MsTUFBTSx5QkFBeUIsQ0FBQztBQUVwSCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHNEQUFzRCxDQUFDO0FBQy9GLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTVFOzs7Ozs7O0dBT0c7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSw4QkFBOEI7SUFLN0UsT0FBTyxDQUFDLGVBQWU7SUFKekIsT0FBTyxDQUFDLHlCQUF5QixDQUFDO0lBRWxDLFlBQ0UsVUFBVSxFQUFFLG1CQUFtQixFQUN2QixlQUFlLEVBQUUsa0JBQWtCLEVBQzNDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLElBQUksRUFBRTtRQUNKLGdCQUFnQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQzFCLGtCQUFrQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQzVCLGdCQUFnQixFQUFFLDRCQUE0QixDQUFDO0tBQ2hELEVBYUY7SUFFYyxRQUFRLENBQUMsT0FBTyxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXFEakY7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,
|
|
1
|
+
{"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EAEjC,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAuB,KAAK,eAAe,EAAkC,MAAM,yBAAyB,CAAC;AAEpH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,8BAA8B;IAK7E,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,kBAAkB,EAC3C,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE;QACJ,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,EAAE,4BAA4B,CAAC;KAChD,EAaF;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAqDjF;CACF"}
|
|
@@ -11,8 +11,8 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
|
|
|
11
11
|
*/ export class FishermanAttestationValidator extends CheckpointAttestationValidator {
|
|
12
12
|
attestationPool;
|
|
13
13
|
invalidAttestationCounter;
|
|
14
|
-
constructor(epochCache, attestationPool, telemetryClient){
|
|
15
|
-
super(epochCache), this.attestationPool = attestationPool;
|
|
14
|
+
constructor(epochCache, attestationPool, telemetryClient, opts){
|
|
15
|
+
super(epochCache, opts), this.attestationPool = attestationPool;
|
|
16
16
|
this.logger = this.logger.createChild('[FISHERMAN]');
|
|
17
17
|
const meter = telemetryClient.getMeter('FishermanAttestationValidator');
|
|
18
18
|
this.invalidAttestationCounter = createUpDownCounterWithDefault(meter, Metrics.VALIDATOR_INVALID_ATTESTATION_RECEIVED_COUNT, {
|
|
@@ -41,8 +41,7 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
|
|
|
41
41
|
result: 'accept'
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
|
-
const
|
|
45
|
-
const proposal = await this.attestationPool.getCheckpointProposal(proposalId);
|
|
44
|
+
const proposal = await this.attestationPool.getCheckpointProposal(message.payload.header.slotNumber);
|
|
46
45
|
if (proposal) {
|
|
47
46
|
// Compare the attestation payload with the proposal payload
|
|
48
47
|
if (!message.payload.equals(proposal)) {
|
|
@@ -67,7 +66,7 @@ import { CheckpointAttestationValidator } from './attestation_validator.js';
|
|
|
67
66
|
}
|
|
68
67
|
} else {
|
|
69
68
|
// We might receive attestations before proposals in some cases
|
|
70
|
-
this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet
|
|
69
|
+
this.logger.debug(`Received attestation for slot ${slotNumberBigInt} but proposal not found yet.`);
|
|
71
70
|
}
|
|
72
71
|
return {
|
|
73
72
|
result: 'accept'
|
|
@@ -18,4 +18,15 @@ export declare const MAXIMUM_GOSSIP_CLOCK_DISPARITY_MS = 500;
|
|
|
18
18
|
* @returns true if the message is for the previous slot AND we're within the clock tolerance window
|
|
19
19
|
*/
|
|
20
20
|
export declare function isWithinClockTolerance(messageSlot: SlotNumber, currentSlot: SlotNumber, epochCache: EpochCacheInterface): boolean;
|
|
21
|
-
|
|
21
|
+
export declare class PipeliningWindow {
|
|
22
|
+
private readonly epochCache;
|
|
23
|
+
private readonly proposalWindowIntoTargetSlot;
|
|
24
|
+
private readonly attestationWindowIntoTargetSlot;
|
|
25
|
+
constructor(epochCache: EpochCacheInterface, opts?: {
|
|
26
|
+
p2pPropagationTime?: number;
|
|
27
|
+
l1PublishingTime?: number;
|
|
28
|
+
});
|
|
29
|
+
acceptsProposal(messageSlot: SlotNumber): boolean;
|
|
30
|
+
acceptsAttestation(messageSlot: SlotNumber): boolean;
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xvY2tfdG9sZXJhbmNlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvY2xvY2tfdG9sZXJhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRzdEOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0saUNBQWlDLE1BQU0sQ0FBQztBQUVyRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLHNCQUFzQixDQUNwQyxXQUFXLEVBQUUsVUFBVSxFQUN2QixXQUFXLEVBQUUsVUFBVSxFQUN2QixVQUFVLEVBQUUsbUJBQW1CLEdBQzlCLE9BQU8sQ0EwQlQ7QUE0Q0QscUJBQWEsZ0JBQWdCO0lBS3pCLE9BQU8sQ0FBQyxRQUFRLENBQUMsVUFBVTtJQUo3QixPQUFPLENBQUMsUUFBUSxDQUFDLDRCQUE0QixDQUFTO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsK0JBQStCLENBQVM7SUFFekQsWUFDbUIsVUFBVSxFQUFFLG1CQUFtQixFQUNoRCxJQUFJLEdBQUU7UUFDSixrQkFBa0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUM1QixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUN0QixFQVlQO0lBRU0sZUFBZSxDQUFDLFdBQVcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUV2RDtJQUVNLGtCQUFrQixDQUFDLFdBQVcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUUxRDtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clock_tolerance.d.ts","sourceRoot":"","sources":["../../src/msg_validators/clock_tolerance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"clock_tolerance.d.ts","sourceRoot":"","sources":["../../src/msg_validators/clock_tolerance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D;;;;;;;GAOG;AACH,eAAO,MAAM,iCAAiC,MAAM,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,UAAU,EACvB,WAAW,EAAE,UAAU,EACvB,UAAU,EAAE,mBAAmB,GAC9B,OAAO,CA0BT;AA4CD,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJ7B,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAS;IACtD,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAS;IAEzD,YACmB,UAAU,EAAE,mBAAmB,EAChD,IAAI,GAAE;QACJ,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;KACtB,EAYP;IAEM,eAAe,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAEvD;IAEM,kBAAkB,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAE1D;CACF"}
|